X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=1e836941176c40db7842fbee2a94b41722f71971;hb=9cfdd2d2e94daaeb85ab7f1675312dec80659ec3;hp=4fcb792264879473bcb8a785397840148dcc54aa;hpb=4182d35d5d7b51882e47c7865bdfdff8c0b2b8fc;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 4fcb792..1e83694 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;
 	}
 }
@@ -409,6 +411,32 @@ static void shutdown_MCD(void)
 	PicoAHW &= ~PAHW_MCD;
 }
 
+static void system_announce(void)
+{
+	const char *sys_name, *tv_standard;
+	int fps;
+
+	if (PicoAHW & PAHW_SMS) {
+		sys_name = "Master System";
+	} 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", tv_standard, sys_name, fps);
+}
+
 // note: this function might mangle rom_fname
 // XXX: portions of this code should move to pico/
 int emu_reload_rom(char *rom_fname)
@@ -436,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.");
@@ -488,6 +516,9 @@ int emu_reload_rom(char *rom_fname)
 
 	shutdown_MCD();
 	PicoPatchUnload();
+	PicoCartUnload();
+	rom_loaded = 0;
+
 	PicoAHW = 0;
 
 	if (media_type == PM_CD)
@@ -531,9 +562,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);
@@ -568,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;
 	}
@@ -612,21 +642,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;
 	}
 
@@ -688,6 +704,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 	if (ext) strcat(dst, ext);
 }
 
+// <base dir><end>
 void emu_make_path(char *buff, const char *end, int size)
 {
 	int pos, end_len;
@@ -713,6 +730,27 @@ 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_CONFIRM_SAVE|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.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(&currentConfig, &defaultConfig, sizeof(currentConfig));
@@ -769,7 +807,7 @@ int emu_read_config(int game, int no_defaults)
 		}
 	}
 
-	plat_validate_config();
+	pemu_validate_config();
 
 	// some sanity checks
 #ifdef PSP
@@ -895,7 +933,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)
@@ -977,7 +1015,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)
@@ -988,18 +1026,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_status & SRS_EEPROM)
-				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);
@@ -1075,6 +1114,12 @@ static void emu_tray_close(void)
 	emu_status_msg("CD tray closed.");
 }
 
+void emu_32x_startup(void)
+{
+	plat_video_toggle_renderer(0, 0);
+	system_announce();
+}
+
 void emu_reset_game(void)
 {
 	PicoReset();
@@ -1283,12 +1328,27 @@ 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);
 
@@ -1315,6 +1375,8 @@ void emu_finish(void)
 #endif
 	}
 
+	pprof_finish();
+
 	PicoExit();
 }
 
@@ -1357,6 +1419,7 @@ void emu_loop(void)
 	// prepare CD buffer
 	if (PicoAHW & PAHW_MCD)
 		PicoCDBufferInit();
+	PicoLoopPrepare();
 
 	pemu_loop_prep();
 
@@ -1373,6 +1436,8 @@ void emu_loop(void)
 		unsigned int timestamp;
 		int diff, diff_lim;
 
+		pprof_start(main);
+
 		timestamp = get_ticks();
 		if (reset_timing) {
 			reset_timing = 0;
@@ -1411,6 +1476,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);
@@ -1428,17 +1494,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;
@@ -1452,7 +1516,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
@@ -1463,22 +1527,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;
@@ -1493,9 +1558,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);