X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=e916b3f27a9bd0e95033c7ebb2b3bd0bc90c7cc3;hb=61d87c7eddb013b1ca1275ffc2c2e3a51d5136a7;hp=cc450d8245187d014c0f282491db57206427ca0a;hpb=81bfc1c5dc85f118ba037c671b0d04ec8f458711;p=libpicofe.git
diff --git a/common/emu.c b/common/emu.c
index cc450d8..e916b3f 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -41,9 +41,11 @@ int pico_pen_x = 320/2, pico_pen_y = 240/2;
int pico_inp_mode = 0;
int engineState = PGS_Menu;
+/* tmp buff to reduce stack usage for plats with small stack */
+static char static_buff[512];
/* TODO: len checking */
-char rom_fname_reload[512] = { 0, };
-char rom_fname_loaded[512] = { 0, };
+char rom_fname_reload[512];
+char rom_fname_loaded[512];
int rom_loaded = 0;
int reset_timing = 0;
static unsigned int notice_msg_time; /* when started showing */
@@ -113,7 +115,6 @@ static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
static int find_bios(int region, char **bios_file)
{
- static char bios_path[1024];
int i, count;
const char * const *files;
FILE *f = NULL;
@@ -133,26 +134,27 @@ static int find_bios(int region, char **bios_file)
for (i = 0; i < count; i++)
{
- emu_make_path(bios_path, files[i], sizeof(bios_path) - 4);
- strcat(bios_path, ".bin");
- f = fopen(bios_path, "rb");
+ emu_make_path(static_buff, files[i], sizeof(static_buff) - 4);
+ strcat(static_buff, ".bin");
+ f = fopen(static_buff, "rb");
if (f) break;
- bios_path[strlen(bios_path) - 4] = 0;
- strcat(bios_path, ".zip");
- f = fopen(bios_path, "rb");
+ static_buff[strlen(static_buff) - 4] = 0;
+ strcat(static_buff, ".zip");
+ f = fopen(static_buff, "rb");
if (f) break;
}
if (f) {
- lprintf("using bios: %s\n", bios_path);
+ lprintf("using bios: %s\n", static_buff);
fclose(f);
- if (bios_file) *bios_file = bios_path;
+ if (bios_file)
+ *bios_file = static_buff;
return 1;
} else {
- sprintf(bios_path, "no %s BIOS files found, read docs",
+ sprintf(static_buff, "no %s BIOS files found, read docs",
region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
- me_update_msg(bios_path);
+ me_update_msg(static_buff);
return 0;
}
}
@@ -462,25 +464,25 @@ int emu_reload_rom(char *rom_fname)
// check for both gmv and rom
int dummy;
FILE *movie_file = fopen(rom_fname, "rb");
- if(!movie_file) {
+ if (!movie_file) {
me_update_msg("Failed to open movie.");
return 0;
}
fseek(movie_file, 0, SEEK_END);
movie_size = ftell(movie_file);
fseek(movie_file, 0, SEEK_SET);
- if(movie_size < 64+3) {
+ if (movie_size < 64+3) {
me_update_msg("Invalid GMV file.");
fclose(movie_file);
return 0;
}
movie_data = malloc(movie_size);
- if(movie_data == NULL) {
+ if (movie_data == NULL) {
me_update_msg("low memory.");
fclose(movie_file);
return 0;
}
- fread(movie_data, 1, movie_size, movie_file);
+ dummy = fread(movie_data, 1, movie_size, movie_file);
fclose(movie_file);
if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {
me_update_msg("Invalid GMV file.");
@@ -560,6 +562,7 @@ int emu_reload_rom(char *rom_fname)
}
menu_romload_prepare(used_rom_name); // also CD load
+ used_rom_name = NULL; // uses static_buff
ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
pm_close(rom);
@@ -594,7 +597,8 @@ int emu_reload_rom(char *rom_fname)
if (!ret) emu_read_config(0, 0);
}
- if (PicoCartInsert(rom_data, rom_size)) {
+ emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));
+ if (PicoCartInsert(rom_data, rom_size, static_buff)) {
me_update_msg("Failed to load ROM.");
goto fail;
}
@@ -700,6 +704,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
if (ext) strcat(dst, ext);
}
+//
void emu_make_path(char *buff, const char *end, int size)
{
int pos, end_len;
@@ -907,7 +912,7 @@ static int try_ropen_file(const char *fname)
char *emu_get_save_fname(int load, int is_sram, int slot)
{
- static char saveFname[512];
+ char *saveFname = static_buff;
char ext[16];
if (is_sram)
@@ -1003,13 +1008,16 @@ int emu_save_load_game(int load, int sram)
sram_size = SRam.size;
sram_data = SRam.data;
}
- if (!sram_data) return 0; // SRam forcefully disabled for this game
+ if (sram_data == NULL)
+ return 0; // SRam forcefully disabled for this game
if (load)
{
sramFile = fopen(saveFname, "rb");
- if(!sramFile) return -1;
- fread(sram_data, 1, sram_size, sramFile);
+ if (!sramFile)
+ return -1;
+ ret = fread(sram_data, 1, sram_size, sramFile);
+ ret = ret > 0 ? 0 : -1;
fclose(sramFile);
if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART))
memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);
@@ -1299,6 +1307,19 @@ void emu_init(void)
char path[512];
int pos;
+#if 0
+ // FIXME: handle through menu, etc
+ FILE *f;
+ f = fopen("32X_M_BIOS.BIN", "rb");
+ p32x_bios_m = malloc(2048);
+ fread(p32x_bios_m, 1, 2048, f);
+ fclose(f);
+ f = fopen("32X_S_BIOS.BIN", "rb");
+ p32x_bios_s = malloc(1024);
+ fread(p32x_bios_s, 1, 1024, f);
+ fclose(f);
+#endif
+
/* make dirs for saves */
pos = plat_get_root_dir(path, sizeof(path) - 4);
mkdir_path(path, pos, "mds");
@@ -1373,6 +1394,7 @@ void emu_loop(void)
// prepare CD buffer
if (PicoAHW & PAHW_MCD)
PicoCDBufferInit();
+ PicoLoopPrepare();
pemu_loop_prep();
@@ -1468,7 +1490,7 @@ void emu_loop(void)
pframes_done++; frames_done++;
diff_lim += target_frametime;
- if (!(currentConfig.EmuOpt & EOPT_NO_FRMLIMIT)) {
+ if (!(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) {
timestamp = get_ticks();
diff = timestamp - timestamp_base;
if (!reset_timing && diff < diff_lim) // we are too fast
@@ -1494,7 +1516,7 @@ void emu_loop(void)
PicoFrame();
/* frame limiter */
- if (!reset_timing && !(currentConfig.EmuOpt & EOPT_NO_FRMLIMIT))
+ if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))
{
timestamp = get_ticks();
diff = timestamp - timestamp_base;