X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=7d680b8b97fe09f254dd06240ff2ec841110a4f4;hb=ca69c3e5a0ecf407c02dc85c6f3282ebb1efc5a2;hp=1cecc39f6476f1ee7f7d757a1a23b34cd75cc681;hpb=2f3ca01638b740bc8ca5530dac8f3e2d2e069cb1;p=libpicofe.git
diff --git a/common/emu.c b/common/emu.c
index 1cecc39..7d680b8 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 */
@@ -90,6 +92,36 @@ static void get_ext(const char *file, char *ext)
strlwr_(ext);
}
+static void fname_ext(char *dst, int dstlen, const char *prefix, const char *ext, const char *fname)
+{
+ int prefix_len = 0;
+ const char *p;
+
+ *dst = 0;
+ if (prefix) {
+ int len = plat_get_root_dir(dst, dstlen);
+ strcpy(dst + len, prefix);
+ prefix_len = len + strlen(prefix);
+ }
+
+ p = fname + strlen(fname) - 1;
+ for (; p >= fname && *p != PATH_SEP_C; p--)
+ ;
+ p++;
+ strncpy(dst + prefix_len, p, dstlen - prefix_len - 1);
+
+ dst[dstlen - 8] = 0;
+ if (dst[strlen(dst) - 4] == '.')
+ dst[strlen(dst) - 4] = 0;
+ if (ext)
+ strcat(dst, ext);
+}
+
+static void romfname_ext(char *dst, int dstlen, const char *prefix, const char *ext)
+{
+ fname_ext(dst, dstlen, prefix, ext, rom_fname_loaded);
+}
+
void emu_status_msg(const char *format, ...)
{
va_list vl;
@@ -113,7 +145,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 +164,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;
}
}
@@ -245,8 +277,11 @@ static int emu_cd_check(int *pregion, const char *fname_in)
static int detect_media(const char *fname)
{
static const short sms_offsets[] = { 0x7ff0, 0x3ff0, 0x1ff0 };
+ static const char *sms_exts[] = { "sms", "gg", "sg" };
+ static const char *md_exts[] = { "gen", "bin", "smd" };
+ char buff0[32], buff[32];
+ unsigned short *d16;
pm_file *pmf;
- char buff[32];
char ext[5];
int i;
@@ -264,34 +299,69 @@ static int detect_media(const char *fname)
if (pmf == NULL)
return PM_BAD;
- if (pm_read(buff, 32, pmf) != 32) {
+ if (pm_read(buff0, 32, pmf) != 32) {
pm_close(pmf);
return PM_BAD;
}
- if (strncasecmp("SEGADISCSYSTEM", buff + 0x00, 14) == 0 ||
- strncasecmp("SEGADISCSYSTEM", buff + 0x10, 14) == 0) {
+ if (strncasecmp("SEGADISCSYSTEM", buff0 + 0x00, 14) == 0 ||
+ strncasecmp("SEGADISCSYSTEM", buff0 + 0x10, 14) == 0) {
pm_close(pmf);
return PM_CD;
}
+ /* check for SMD evil */
+ if (pmf->size >= 0x4200 && (pmf->size & 0x3fff) == 0x200) {
+ if (pm_seek(pmf, sms_offsets[0] + 0x200, SEEK_SET) == sms_offsets[0] + 0x200 &&
+ pm_read(buff, 16, pmf) == 16 &&
+ strncmp("TMR SEGA", buff, 8) == 0)
+ goto looks_like_sms;
+
+ /* could parse further but don't bother */
+ goto extension_check;
+ }
+
+ /* MD header? Act as TMSS BIOS here */
+ if (pm_seek(pmf, 0x100, SEEK_SET) == 0x100 && pm_read(buff, 16, pmf) == 16) {
+ if (strncmp(buff, "SEGA", 4) == 0 || strncmp(buff, " SEG", 4) == 0)
+ goto looks_like_md;
+ }
+
for (i = 0; i < array_size(sms_offsets); i++) {
if (pm_seek(pmf, sms_offsets[i], SEEK_SET) != sms_offsets[i])
- goto not_mark3; /* actually it could be but can't be detected */
+ continue;
if (pm_read(buff, 16, pmf) != 16)
- goto not_mark3;
+ continue;
- if (strncasecmp("TMR SEGA", buff, 8) == 0) {
- pm_close(pmf);
- return PM_MARK3;
- }
+ if (strncmp("TMR SEGA", buff, 8) == 0)
+ goto looks_like_sms;
}
-not_mark3:
+extension_check:
+ /* probably some headerless thing. Maybe check the extension after all. */
+ for (i = 0; i < array_size(md_exts); i++)
+ if (strcasecmp(pmf->ext, md_exts[i]) == 0)
+ goto looks_like_md;
+
+ for (i = 0; i < array_size(sms_exts); i++)
+ if (strcasecmp(pmf->ext, sms_exts[i]) == 0)
+ goto looks_like_sms;
+
+ /* If everything else fails, make a guess on the reset vector */
+ d16 = (unsigned short *)(buff0 + 4);
+ if ((((d16[0] << 16) | d16[1]) & 0xffffff) >= pmf->size) {
+ lprintf("bad MD reset vector, assuming SMS\n");
+ goto looks_like_sms;
+ }
+
+looks_like_md:
pm_close(pmf);
- /* the main emu function is to emulate MD, so assume MD */
return PM_MD_CART;
+
+looks_like_sms:
+ pm_close(pmf);
+ return PM_MARK3;
}
static int extract_text(char *dest, const unsigned char *src, int len, int swab)
@@ -325,7 +395,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
return p - dest;
}
-static char *emu_make_rom_id(void)
+static char *emu_make_rom_id(const char *fname)
{
static char id_string[3+0xe*3+0x3*3+0x30*3+3];
int pos, swab = 1;
@@ -334,15 +404,25 @@ static char *emu_make_rom_id(void)
strcpy(id_string, "CD|");
swab = 0;
}
- else strcpy(id_string, "MD|");
+ else if (PicoAHW & PAHW_SMS)
+ strcpy(id_string, "MS|");
+ else strcpy(id_string, "MD|");
pos = 3;
- pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
- id_string[pos] = '|'; pos++;
- pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
- id_string[pos] = '|'; pos++;
- pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
- id_string[pos] = 0;
+ if (!(PicoAHW & PAHW_SMS)) {
+ pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial
+ id_string[pos] = '|'; pos++;
+ pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region
+ id_string[pos] = '|'; pos++;
+ pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name
+ id_string[pos] = 0;
+ if (pos > 5)
+ return id_string;
+ pos = 3;
+ }
+
+ // can't find name in ROM, use filename
+ fname_ext(id_string + 3, sizeof(id_string) - 3, NULL, NULL, fname);
return id_string;
}
@@ -371,6 +451,35 @@ static void shutdown_MCD(void)
PicoAHW &= ~PAHW_MCD;
}
+static void system_announce(void)
+{
+ const char *sys_name, *tv_standard, *extra = "";
+ int fps;
+
+ if (PicoAHW & PAHW_SMS) {
+ sys_name = "Master System";
+#ifdef NO_SMS
+ extra = " [no support]";
+#endif
+ } else if (PicoAHW & PAHW_PICO) {
+ sys_name = "Pico";
+ } else if (PicoAHW & PAHW_MCD) {
+ sys_name = "Mega CD";
+ if ((Pico.m.hardware & 0xc0) == 0x80)
+ sys_name = "Sega CD";
+ } else if (PicoAHW & PAHW_32X) {
+ sys_name = "32X";
+ } else {
+ sys_name = "MegaDrive";
+ if ((Pico.m.hardware & 0xc0) == 0x80)
+ sys_name = "Genesis";
+ }
+ tv_standard = Pico.m.pal ? "PAL" : "NTSC";
+ fps = Pico.m.pal ? 50 : 60;
+
+ emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);
+}
+
// note: this function might mangle rom_fname
// XXX: portions of this code should move to pico/
int emu_reload_rom(char *rom_fname)
@@ -388,35 +497,37 @@ int emu_reload_rom(char *rom_fname)
get_ext(rom_fname, ext);
- // check for movie file
+ // early cleanup
+ PicoPatchUnload();
if (movie_data) {
free(movie_data);
movie_data = 0;
}
+
if (!strcmp(ext, ".gmv"))
{
// 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.");
@@ -449,7 +560,10 @@ int emu_reload_rom(char *rom_fname)
}
shutdown_MCD();
- PicoPatchUnload();
+ PicoCartUnload();
+ rom_loaded = 0;
+
+ PicoAHW = 0;
if (media_type == PM_CD)
{
@@ -460,8 +574,8 @@ int emu_reload_rom(char *rom_fname)
// valid CD image, check for BIOS..
// we need to have config loaded at this point
- ret = emu_read_config(1, 0);
- if (!ret) emu_read_config(0, 0);
+ ret = emu_read_config(rom_fname, 0);
+ if (!ret) emu_read_config(NULL, 0);
cfg_loaded = 1;
if (PicoRegionOverride) {
@@ -492,9 +606,7 @@ int emu_reload_rom(char *rom_fname)
}
menu_romload_prepare(used_rom_name); // also CD load
-
- PicoCartUnload();
- rom_loaded = 0;
+ used_rom_name = NULL; // uses static_buff
ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);
pm_close(rom);
@@ -525,11 +637,12 @@ int emu_reload_rom(char *rom_fname)
if (!(PicoAHW & PAHW_MCD))
memcpy(id_header, rom_data + 0x100, sizeof(id_header));
if (!cfg_loaded) {
- ret = emu_read_config(1, 0);
- if (!ret) emu_read_config(0, 0);
+ ret = emu_read_config(rom_fname, 0);
+ if (!ret) emu_read_config(NULL, 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;
}
@@ -573,21 +686,7 @@ int emu_reload_rom(char *rom_fname)
}
else
{
- const char *sys_name, *tv_standard;
- int fps;
-
- if (PicoAHW & PAHW_SMS) {
- sys_name = "Master System";
- } else {
- sys_name = "MegaDrive";
- if ((Pico.m.hardware&0xc0) == 0x80)
- sys_name = "Genesis";
- }
- tv_standard = Pico.m.pal ? "PAL" : "NTSC";
- fps = Pico.m.pal ? 50 : 60;
-
- emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);
-
+ system_announce();
PicoOpt &= ~POPT_DIS_VDP_FIFO;
}
@@ -626,29 +725,7 @@ int emu_swap_cd(const char *fname)
return 1;
}
-static void romfname_ext(char *dst, const char *prefix, const char *ext)
-{
- char *p;
- int prefix_len = 0;
-
- // make save filename
- p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;
- for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;
- *dst = 0;
- if (prefix) {
- int len = plat_get_root_dir(dst, 512);
- strcpy(dst + len, prefix);
- prefix_len = len + strlen(prefix);
- }
-#ifdef UIQ3
- else p = rom_fname_loaded; // backward compatibility
-#endif
- strncpy(dst + prefix_len, p, 511-prefix_len);
- dst[511-8] = 0;
- if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
- if (ext) strcat(dst, ext);
-}
-
+//
void emu_make_path(char *buff, const char *end, int size)
{
int pos, end_len;
@@ -674,6 +751,28 @@ static void make_config_cfg(char *cfg_buff_512)
cfg_buff_512[511] = 0;
}
+void emu_prep_defconfig(void)
+{
+ memset(&defaultConfig, 0, sizeof(defaultConfig));
+ defaultConfig.EmuOpt = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;
+ defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
+ POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES |
+ POPT_EN_32X|POPT_EN_PWM;
+ defaultConfig.s_PsndRate = 44100;
+ defaultConfig.s_PicoRegion = 0; // auto
+ defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
+ defaultConfig.s_PicoCDBuffers = 0;
+ defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
+ defaultConfig.Frameskip = -1; // auto
+ defaultConfig.volume = 50;
+ defaultConfig.gamma = 100;
+ defaultConfig.scaling = 0;
+ defaultConfig.turbo_rate = 15;
+
+ // platform specific overrides
+ pemu_prep_defconfig();
+}
+
void emu_set_defconfig(void)
{
memcpy(¤tConfig, &defaultConfig, sizeof(currentConfig));
@@ -682,9 +781,11 @@ void emu_set_defconfig(void)
PicoRegionOverride = currentConfig.s_PicoRegion;
PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+ p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
+ p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
}
-int emu_read_config(int game, int no_defaults)
+int emu_read_config(const char *rom_fname, int no_defaults)
{
char cfg[512];
int ret;
@@ -692,16 +793,16 @@ int emu_read_config(int game, int no_defaults)
if (!no_defaults)
emu_set_defconfig();
- if (!game)
+ if (rom_fname == NULL)
{
+ // global config
make_config_cfg(cfg);
ret = config_readsect(cfg, NULL);
}
else
{
- char *sect = emu_make_rom_id();
+ char *sect = emu_make_rom_id(rom_fname);
- // try new .cfg way
if (config_slot != 0)
sprintf(cfg, "game.%i.cfg", config_slot);
else strcpy(cfg, "game.cfg");
@@ -730,7 +831,7 @@ int emu_read_config(int game, int no_defaults)
}
}
- plat_validate_config();
+ pemu_validate_config();
// some sanity checks
#ifdef PSP
@@ -762,7 +863,7 @@ int emu_write_config(int is_game)
if (config_slot != 0)
sprintf(cfg, "game.%i.cfg", config_slot);
else strcpy(cfg, "game.cfg");
- game_sect = emu_make_rom_id();
+ game_sect = emu_make_rom_id(rom_fname_loaded);
lprintf("emu_write_config: sect \"%s\"\n", game_sect);
}
@@ -856,20 +957,21 @@ 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)
{
strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");
- romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff),
+ (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);
if (!load)
return saveFname;
if (try_ropen_file(saveFname))
return saveFname;
- romfname_ext(saveFname, NULL, ext);
+ romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
if (try_ropen_file(saveFname))
return saveFname;
}
@@ -883,15 +985,15 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
strcat(ext, ext_main);
if (!load) {
- romfname_ext(saveFname, "mds" PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
return saveFname;
}
else {
- romfname_ext(saveFname, "mds" PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
if (try_ropen_file(saveFname))
return saveFname;
- romfname_ext(saveFname, NULL, ext);
+ romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
if (try_ropen_file(saveFname))
return saveFname;
@@ -901,7 +1003,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
sprintf(ext, ".%i", slot);
strcat(ext, ext_othr);
- romfname_ext(saveFname, "mds"PATH_SEP, ext);
+ romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);
if (try_ropen_file(saveFname))
return saveFname;
}
@@ -910,7 +1012,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
return NULL;
}
-int emu_check_save_file(int slot)
+int emu_check_save_file(int slot, int *time)
{
return emu_get_save_fname(1, 0, slot) ? 1 : 0;
}
@@ -938,7 +1040,7 @@ int emu_save_load_game(int load, int sram)
int truncate = 1;
if (PicoAHW & PAHW_MCD)
{
- if (PicoOpt&POPT_EN_MCD_RAMCART) {
+ if (PicoOpt & POPT_EN_MCD_RAMCART) {
sram_size = 0x12000;
sram_data = SRam.data;
if (sram_data)
@@ -949,17 +1051,19 @@ int emu_save_load_game(int load, int sram)
truncate = 0; // the .brm may contain RAM cart data after normal brm
}
} else {
- sram_size = SRam.end-SRam.start+1;
- if(Pico.m.sram_reg & 4) sram_size=0x2000;
+ 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);
@@ -1035,6 +1139,15 @@ static void emu_tray_close(void)
emu_status_msg("CD tray closed.");
}
+void emu_32x_startup(void)
+{
+ plat_video_toggle_renderer(0, 0); // HACK
+ system_announce();
+
+ // force mode change event
+ rendstatus_old = -1;
+}
+
void emu_reset_game(void)
{
PicoReset();
@@ -1126,9 +1239,9 @@ static void run_events_ui(unsigned int which)
if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))
{
int do_it = 1;
- if ( emu_check_save_file(state_slot) &&
- (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) ||
- ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )
+ if ( emu_check_save_file(state_slot, NULL) &&
+ (((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||
+ ((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )
{
const char *nm;
char tmp[64];
@@ -1144,16 +1257,16 @@ static void run_events_ui(unsigned int which)
plat_status_msg_busy_first(tmp);
- in_set_blocking(1);
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+ in_set_config_int(0, IN_CFG_BLOCKING, 1);
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
;
- while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )
+ while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )
;
if (keys & PBTN_MBACK)
do_it = 0;
- while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))
+ while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
;
- in_set_blocking(0);
+ in_set_config_int(0, IN_CFG_BLOCKING, 0);
}
if (do_it) {
plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");
@@ -1179,7 +1292,7 @@ static void run_events_ui(unsigned int which)
}
emu_status_msg("SAVE SLOT %i [%s]", state_slot,
- emu_check_save_file(state_slot) ? "USED" : "FREE");
+ emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");
}
if (which & PEV_MENU)
engineState = PGS_Menu;
@@ -1238,17 +1351,53 @@ static void mkdir_path(char *path_with_reserve, int pos, const char *name)
lprintf("failed to create: %s\n", path_with_reserve);
}
+void emu_cmn_forced_frame(int no_scale, int do_emu)
+{
+ int po_old = PicoOpt;
+
+ memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
+
+ PicoOpt &= ~POPT_ALT_RENDERER;
+ PicoOpt |= POPT_ACC_SPRITES;
+ if (!no_scale)
+ PicoOpt |= POPT_EN_SOFTSCALE;
+
+ PicoDrawSetOutFormat(PDF_RGB555, 1);
+ Pico.m.dirtyPal = 1;
+ if (do_emu)
+ PicoFrame();
+ else
+ PicoFrameDrawOnly();
+
+ PicoOpt = po_old;
+}
+
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");
mkdir_path(path, pos, "srm");
mkdir_path(path, pos, "brm");
+ pprof_init();
+
make_config_cfg(path);
config_readlrom(path);
@@ -1275,6 +1424,8 @@ void emu_finish(void)
#endif
}
+ pprof_finish();
+
PicoExit();
}
@@ -1293,7 +1444,7 @@ void emu_loop(void)
{
int pframes_done; /* "period" frames, used for sync */
int frames_done, frames_shown; /* actual frames for fps counter */
- int oldmodes, target_fps, target_frametime;
+ int target_fps, target_frametime;
unsigned int timestamp_base = 0, timestamp_fps;
char *notice_msg = NULL;
char fpsbuff[24];
@@ -1302,8 +1453,16 @@ void emu_loop(void)
fpsbuff[0] = 0;
/* make sure we are in correct mode */
- oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
Pico.m.dirtyPal = 1;
+ rendstatus_old = -1;
+
+ PicoLoopPrepare();
+
+ // prepare CD buffer
+ if (PicoAHW & PAHW_MCD)
+ PicoCDBufferInit();
+
+ pemu_loop_prep();
/* number of ticks per frame */
if (Pico.m.pal) {
@@ -1314,12 +1473,6 @@ void emu_loop(void)
target_frametime = ms_to_ticks(1000) / 60 + 1;
}
- // prepare CD buffer
- if (PicoAHW & PAHW_MCD)
- PicoCDBufferInit();
-
- pemu_loop_prep();
-
timestamp_fps = get_ticks();
reset_timing = 1;
@@ -1332,7 +1485,8 @@ void emu_loop(void)
{
unsigned int timestamp;
int diff, diff_lim;
- int modes;
+
+ pprof_start(main);
timestamp = get_ticks();
if (reset_timing) {
@@ -1359,13 +1513,6 @@ void emu_loop(void)
}
}
- // check for mode changes
- modes = ((Pico.video.reg[12]&1)<<2) | (Pico.video.reg[1]&8);
- if (modes != oldmodes) {
- oldmodes = modes;
- pemu_video_mode_change(!(modes & 4), (modes & 8));
- }
-
// second changed?
if (timestamp - timestamp_fps >= ms_to_ticks(1000))
{
@@ -1379,6 +1526,7 @@ void emu_loop(void)
}
bench_fps += frames_shown;
sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
+ printf("%s\n", fpsbuff);
#else
if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {
sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
@@ -1396,17 +1544,15 @@ void emu_loop(void)
{
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)
pframes_done = 0;
- else {
+ else
pframes_done -= target_fps;
- /* don't allow it to drift during heavy slowdowns */
- if (pframes_done < -5) {
- reset_timing = 1;
- continue;
- }
- if (pframes_done < -2)
- pframes_done = -2;
+ if (pframes_done < -2) {
+ /* don't drag more than 2 frames behind */
+ pframes_done = -2;
+ timestamp_base = timestamp - 2 * target_frametime;
}
- timestamp_base += ms_to_ticks(1000);
+ else
+ timestamp_base += ms_to_ticks(1000);
}
diff = timestamp - timestamp_base;
@@ -1420,7 +1566,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
@@ -1431,22 +1577,23 @@ void emu_loop(void)
else if (diff > diff_lim)
{
/* no time left for this frame - skip */
- if (diff - diff_lim >= ms_to_ticks(200)) {
- /* if too much behind, reset instead */
- reset_timing = 1;
+ /* limit auto frameskip to 8 */
+ if (frames_done / 8 <= frames_shown) {
+ emu_update_input();
+ skip_frame(diff < diff_lim + target_frametime * 16);
+ pframes_done++; frames_done++;
continue;
}
- emu_update_input();
- skip_frame(diff < diff_lim + target_frametime * 2);
- pframes_done++; frames_done++;
- continue;
}
emu_update_input();
PicoFrame();
+ pemu_finalize_frame(fpsbuff, notice_msg);
+
+ // plat_video_flip();
/* 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;
@@ -1461,9 +1608,13 @@ void emu_loop(void)
}
}
- pemu_update_display(fpsbuff, notice_msg);
+ // XXX: for some plats it might be better to flip before vsync
+ // (due to shadow registers in display hw)
+ plat_video_flip();
pframes_done++; frames_done++; frames_shown++;
+
+ pprof_end(main);
}
emu_set_fastforward(0);