X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=6a8c940b22726e2a2cfb8df81fb1025a52f5bba4;hb=9db6a54485501b56b0f2f5db4d093c38fe495bda;hp=d92c598e8c825e5fc990d3b2eb78ca0bca8f4ad3;hpb=2446536be520914616403876d7e49621ac6f4b95;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index d92c598..6a8c940 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#ifndef NO_SYNC
+#ifdef __GP2X__
 #include <unistd.h>
 #endif
 
@@ -28,22 +28,28 @@
 #include <pico/pico_int.h>
 #include <pico/patch.h>
 
+#ifndef _WIN32
+#define PATH_SEP      "/"
+#define PATH_SEP_C    '/'
+#else
+#define PATH_SEP      "\\"
+#define PATH_SEP_C    '\\'
+#endif
 
 #define STATUS_MSG_TIMEOUT 2000
 
 void *g_screen_ptr;
 
-#if !SCREEN_SIZE_FIXED
-int g_screen_width  = SCREEN_WIDTH;
-int g_screen_height = SCREEN_HEIGHT;
-#endif
+int g_screen_width  = 320;
+int g_screen_height = 240;
 
-char *PicoConfigFile = "config.cfg";
+const char *PicoConfigFile = "config2.cfg";
 currentConfig_t currentConfig, defaultConfig;
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
 int pico_pen_x = 320/2, pico_pen_y = 240/2;
-int pico_inp_mode = 0;
+int pico_inp_mode;
+int flip_after_sync;
 int engineState = PGS_Menu;
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
@@ -145,13 +151,13 @@ void emu_status_msg(const char *format, ...)
 }
 
 static const char * const biosfiles_us[] = {
-	"us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303", "bios_CD_U"
+	"us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210", "bios_CD_U"
 };
 static const char * const biosfiles_eu[] = {
-	"eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303", "bios_CD_E"
+	"eu_mcd2_9306", "eu_mcd2_9303", "eu_mcd1_9210", "bios_CD_E"
 };
 static const char * const biosfiles_jp[] = {
-	"jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"
+	"jp_mcd2_921222", "jp_mcd1_9112", "jp_mcd1_9111", "bios_CD_J"
 };
 
 static const char *find_bios(int *region, const char *cd_fname)
@@ -316,6 +322,10 @@ static void system_announce(void)
 #endif
 	} else if (PicoAHW & PAHW_PICO) {
 		sys_name = "Pico";
+	} else if ((PicoAHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {
+		sys_name = "32X + Mega CD";
+		if ((Pico.m.hardware & 0xc0) == 0x80)
+			sys_name = "32X + Sega CD";
 	} else if (PicoAHW & PAHW_MCD) {
 		sys_name = "Mega CD";
 		if ((Pico.m.hardware & 0xc0) == 0x80)
@@ -342,6 +352,8 @@ static void do_region_override(const char *media_fname)
 
 int emu_reload_rom(const char *rom_fname_in)
 {
+	// use setting before rom config is loaded
+	int autoload = g_autostateld_opt;
 	char *rom_fname = NULL;
 	char ext[5];
 	enum media_type_e media_type;
@@ -438,6 +450,10 @@ int emu_reload_rom(const char *rom_fname_in)
 		break;
 	}
 
+	// make quirks visible in UI
+	if (PicoQuirks & PQUIRK_FORCE_6BTN)
+		currentConfig.input_dev0 = PICO_INPUT_PAD_6BTN;
+
 	menu_romload_end();
 	menu_romload_started = 0;
 
@@ -449,9 +465,11 @@ int emu_reload_rom(const char *rom_fname_in)
 	// additional movie stuff
 	if (movie_data)
 	{
-		if (movie_data[0x14] == '6')
-		     PicoOpt |=  POPT_6BTN_PAD; // 6 button pad
-		else PicoOpt &= ~POPT_6BTN_PAD;
+		enum input_device indev = (movie_data[0x14] == '6') ?
+			PICO_INPUT_PAD_6BTN : PICO_INPUT_PAD_3BTN;
+		PicoSetInputDevice(0, indev);
+		PicoSetInputDevice(1, indev);
+
 		PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing
 		if (movie_data[0xF] >= 'A') {
 			if (movie_data[0x16] & 0x80) {
@@ -478,6 +496,30 @@ int emu_reload_rom(const char *rom_fname_in)
 	if (currentConfig.EmuOpt & EOPT_EN_SRAM)
 		emu_save_load_game(1, 1);
 
+	// state autoload?
+	if (autoload) {
+		int time, newest = 0, newest_slot = -1;
+		int slot;
+
+		for (slot = 0; slot < 10; slot++) {
+			if (emu_check_save_file(slot, &time)) {
+				if (time > newest) {
+					newest = time;
+					newest_slot = slot;
+				}
+			}
+		}
+
+		if (newest_slot >= 0) {
+			lprintf("autoload slot %d\n", newest_slot);
+			state_slot = newest_slot;
+			emu_save_load_game(1, 0);
+		}
+		else {
+			lprintf("no save to autoload.\n");
+		}
+	}
+
 	retval = 1;
 out:
 	if (menu_romload_started)
@@ -488,19 +530,20 @@ out:
 
 int emu_swap_cd(const char *fname)
 {
-	cd_img_type cd_type;
+	enum cd_img_type cd_type;
 	int ret = -1;
 
 	cd_type = PicoCdCheck(fname, NULL);
 	if (cd_type != CIT_NOT_CD)
-		ret = Insert_CD(fname, cd_type);
+		ret = cdd_load(fname, cd_type);
 	if (ret != 0) {
 		menu_update_msg("Load failed, invalid CD image?");
 		return 0;
 	}
 
 	strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);
-	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
+	rom_fname_loaded[sizeof(rom_fname_loaded) - 1] = 0;
+
 	return 1;
 }
 
@@ -533,9 +576,10 @@ static void make_config_cfg(char *cfg_buff_512)
 void emu_prep_defconfig(void)
 {
 	memset(&defaultConfig, 0, sizeof(defaultConfig));
-	defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;
+	defaultConfig.EmuOpt    = 0x9d | 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_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
+				  POPT_EN_DRC|POPT_ACC_SPRITES |
 				  POPT_EN_32X|POPT_EN_PWM;
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
@@ -543,10 +587,14 @@ void emu_prep_defconfig(void)
 	defaultConfig.s_PicoCDBuffers = 0;
 	defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
 	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.input_dev0 = PICO_INPUT_PAD_3BTN;
+	defaultConfig.input_dev1 = PICO_INPUT_PAD_3BTN;
 	defaultConfig.volume = 50;
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;
 	defaultConfig.turbo_rate = 15;
+	defaultConfig.msh2_khz = PICO_MSH2_HZ / 1000;
+	defaultConfig.ssh2_khz = PICO_SSH2_HZ / 1000;
 
 	// platform specific overrides
 	pemu_prep_defconfig();
@@ -559,9 +607,6 @@ void emu_set_defconfig(void)
 	PsndRate = currentConfig.s_PsndRate;
 	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(const char *rom_fname, int no_defaults)
@@ -580,33 +625,29 @@ int emu_read_config(const char *rom_fname, int no_defaults)
 	}
 	else
 	{
-		char *sect = emu_make_rom_id(rom_fname);
+		char ext[16];
+		int vol;
 
 		if (config_slot != 0)
-		     sprintf(cfg, "game.%i.cfg", config_slot);
-		else strcpy(cfg,  "game.cfg");
-
-		ret = -1;
-		if (config_havesect(cfg, sect))
-		{
-			// read user's config
-			int vol = currentConfig.volume;
-			emu_set_defconfig();
-			ret = config_readsect(cfg, sect);
-			currentConfig.volume = vol; // make vol global (bah)
-		}
+			snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);
 		else
+			strcpy(ext, ".cfg");
+
+		fname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext, rom_fname);
+
+		// read user's config
+		vol = currentConfig.volume;
+		ret = config_readsect(cfg, NULL);
+		currentConfig.volume = vol; // make vol global (bah)
+
+		if (ret != 0)
 		{
 			// read global config, and apply game_def.cfg on top
 			make_config_cfg(cfg);
 			config_readsect(cfg, NULL);
-			emu_make_path(cfg, "game_def.cfg", sizeof(cfg));
-			ret = config_readsect(cfg, sect);
-		}
 
-		if (ret == 0)
-		{
-			lprintf("loaded cfg from sect \"%s\"\n", sect);
+			emu_make_path(cfg, "game_def.cfg", sizeof(cfg));
+			ret = config_readsect(cfg, emu_make_rom_id(rom_fname));
 		}
 	}
 
@@ -631,7 +672,7 @@ int emu_read_config(const char *rom_fname, int no_defaults)
 
 int emu_write_config(int is_game)
 {
-	char cfg[512], *game_sect = NULL;
+	char cfg[512];
 	int ret, write_lrom = 0;
 
 	if (!is_game)
@@ -639,17 +680,20 @@ int emu_write_config(int is_game)
 		make_config_cfg(cfg);
 		write_lrom = 1;
 	} else {
+		char ext[16];
+
 		if (config_slot != 0)
-		     sprintf(cfg, "game.%i.cfg", config_slot);
-		else strcpy(cfg,  "game.cfg");
-		game_sect = emu_make_rom_id(rom_fname_loaded);
-		lprintf("emu_write_config: sect \"%s\"\n", game_sect);
+			snprintf(ext, sizeof(ext), ".%i.cfg", config_slot);
+		else
+			strcpy(ext, ".cfg");
+
+		romfname_ext(cfg, sizeof(cfg), "cfg"PATH_SEP, ext);
 	}
 
 	lprintf("emu_write_config: %s ", cfg);
-	ret = config_writesect(cfg, game_sect);
+	ret = config_write(cfg);
 	if (write_lrom) config_writelrom(cfg);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 	sync();
 #endif
 	lprintf((ret == 0) ? "(ok)\n" : "(failed)\n");
@@ -694,8 +738,26 @@ mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,
 
 #undef mk_text_out
 
+void emu_osd_text16(int x, int y, const char *text)
+{
+	int len = strlen(text) * 8;
+	int i, h;
+
+	len++;
+	if (x + len > g_screen_width)
+		len = g_screen_width - x;
+
+	for (h = 0; h < 8; h++) {
+		unsigned short *p;
+		p = (unsigned short *)g_screen_ptr
+			+ x + g_screen_width * (y + h);
+		for (i = len; i > 0; i--, p++)
+			*p = (*p >> 2) & 0x39e7;
+	}
+	emu_text_out16(x, y, text);
+}
 
-void update_movie(void)
+static void update_movie(void)
 {
 	int offs = Pico.m.frame_count*3 + 0x40;
 	if (offs+3 > movie_size) {
@@ -722,19 +784,25 @@ void update_movie(void)
 	}
 }
 
-static int try_ropen_file(const char *fname)
+static int try_ropen_file(const char *fname, int *time)
 {
+	struct stat st;
 	FILE *f;
 
 	f = fopen(fname, "rb");
 	if (f) {
+		if (time != NULL) {
+			*time = 0;
+			if (fstat(fileno(f), &st) == 0)
+				*time = (int)st.st_mtime;
+		}
 		fclose(f);
 		return 1;
 	}
 	return 0;
 }
 
-char *emu_get_save_fname(int load, int is_sram, int slot)
+char *emu_get_save_fname(int load, int is_sram, int slot, int *time)
 {
 	char *saveFname = static_buff;
 	char ext[16];
@@ -747,11 +815,11 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 		if (!load)
 			return saveFname;
 
-		if (try_ropen_file(saveFname))
+		if (try_ropen_file(saveFname, time))
 			return saveFname;
 
 		romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
-		if (try_ropen_file(saveFname))
+		if (try_ropen_file(saveFname, time))
 			return saveFname;
 	}
 	else
@@ -769,11 +837,11 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 		}
 		else {
 			romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 
 			romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 
 			// try the other ext
@@ -783,7 +851,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 			strcat(ext, ext_othr);
 
 			romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 		}
 	}
@@ -793,7 +861,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 
 int emu_check_save_file(int slot, int *time)
 {
-	return emu_get_save_fname(1, 0, slot) ? 1 : 0;
+	return emu_get_save_fname(1, 0, slot, time) ? 1 : 0;
 }
 
 int emu_save_load_game(int load, int sram)
@@ -802,7 +870,7 @@ int emu_save_load_game(int load, int sram)
 	char *saveFname;
 
 	// make save filename
-	saveFname = emu_get_save_fname(load, sram, state_slot);
+	saveFname = emu_get_save_fname(load, sram, state_slot, NULL);
 	if (saveFname == NULL) {
 		if (!sram)
 			emu_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");
@@ -859,7 +927,7 @@ int emu_save_load_game(int load, int sram)
 				ret = fwrite(sram_data, 1, sram_size, sramFile);
 				ret = (ret != sram_size) ? -1 : 0;
 				fclose(sramFile);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 				sync();
 #endif
 			}
@@ -870,7 +938,7 @@ int emu_save_load_game(int load, int sram)
 	{
 		ret = PicoState(saveFname, !load);
 		if (!ret) {
-#ifndef NO_SYNC
+#ifdef __GP2X__
 			if (!load) sync();
 #endif
 			emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");
@@ -905,6 +973,9 @@ void emu_set_fastforward(int set_on)
 		currentConfig.EmuOpt = set_EmuOpt;
 		PsndRerate(1);
 		is_on = 0;
+		// mainly to unbreak pcm
+		if (PicoAHW & PAHW_MCD)
+			pcd_state_loaded();
 	}
 }
 
@@ -1023,9 +1094,9 @@ static void run_events_ui(unsigned int which)
 			char tmp[64];
 			int keys, len;
 
-			strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?");
+			strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE? " : "OVERWRITE SAVE? ");
 			len = strlen(tmp);
-			nm = in_get_key_name(-1, -PBTN_MA3);
+			nm = in_get_key_name(-1, -PBTN_MOK);
 			snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm);
 			len = strlen(tmp);
 			nm = in_get_key_name(-1, -PBTN_MBACK);
@@ -1034,13 +1105,13 @@ static void run_events_ui(unsigned int which)
 			plat_status_msg_busy_first(tmp);
 
 			in_set_config_int(0, IN_CFG_BLOCKING, 1);
-			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))
 				;
-			while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )
+			while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MOK | PBTN_MBACK)))
 				;
 			if (keys & PBTN_MBACK)
 				do_it = 0;
-			while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))
+			while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))
 				;
 			in_set_config_int(0, IN_CFG_BLOCKING, 0);
 		}
@@ -1070,6 +1141,8 @@ static void run_events_ui(unsigned int which)
 		emu_status_msg("SAVE SLOT %i [%s]", state_slot,
 			emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");
 	}
+	if (which & PEV_RESET)
+		emu_reset_game();
 	if (which & PEV_MENU)
 		engineState = PGS_Menu;
 }
@@ -1171,6 +1244,7 @@ void emu_init(void)
 	mkdir_path(path, pos, "mds");
 	mkdir_path(path, pos, "srm");
 	mkdir_path(path, pos, "brm");
+	mkdir_path(path, pos, "cfg");
 
 	pprof_init();
 
@@ -1197,7 +1271,7 @@ void emu_finish(void)
 		char cfg[512];
 		make_config_cfg(cfg);
 		config_writelrom(cfg);
-#ifndef NO_SYNC
+#ifdef __GP2X__
 		sync();
 #endif
 	}
@@ -1266,79 +1340,73 @@ static void emu_loop_prep(void)
 	pemu_loop_prep();
 }
 
-static void skip_frame(int do_audio)
-{
-	PicoSkipFrame = do_audio ? 1 : 2;
-	PicoFrame();
-	PicoSkipFrame = 0;
-}
-
 /* our tick here is 1 us right now */
 #define ms_to_ticks(x) (unsigned int)(x * 1000)
 #define get_ticks() plat_get_ticks_us()
 
 void emu_loop(void)
 {
-	int pframes_done;		/* "period" frames, used for sync */
 	int frames_done, frames_shown;	/* actual frames for fps counter */
-	int target_fps, target_frametime;
-	unsigned int timestamp_base = 0, timestamp_fps;
+	int target_frametime_x3;
+	unsigned int timestamp_x3 = 0;
+	unsigned int timestamp_aim_x3 = 0;
+	unsigned int timestamp_fps_x3 = 0;
 	char *notice_msg = NULL;
 	char fpsbuff[24];
-	int i;
+	int fskip_cnt = 0;
 
 	fpsbuff[0] = 0;
 
 	PicoLoopPrepare();
 
-	// prepare CD buffer
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferInit();
-
 	plat_video_loop_prepare();
 	emu_loop_prep();
 	pemu_sound_start();
 
 	/* number of ticks per frame */
-	if (Pico.m.pal) {
-		target_fps = 50;
-		target_frametime = ms_to_ticks(1000) / 50;
-	} else {
-		target_fps = 60;
-		target_frametime = ms_to_ticks(1000) / 60 + 1;
-	}
+	if (Pico.m.pal)
+		target_frametime_x3 = 3 * ms_to_ticks(1000) / 50;
+	else
+		target_frametime_x3 = 3 * ms_to_ticks(1000) / 60;
 
-	timestamp_fps = get_ticks();
 	reset_timing = 1;
-
-	frames_done = frames_shown = pframes_done = 0;
-
-	plat_video_wait_vsync();
+	frames_done = frames_shown = 0;
 
 	/* loop with resync every 1 sec. */
 	while (engineState == PGS_Running)
 	{
-		unsigned int timestamp;
-		int diff, diff_lim;
+		int skip = 0;
+		int diff;
 
 		pprof_start(main);
 
-		timestamp = get_ticks();
 		if (reset_timing) {
 			reset_timing = 0;
-			timestamp_base = timestamp;
-			pframes_done = 0;
+			plat_video_wait_vsync();
+			timestamp_aim_x3 = get_ticks() * 3;
+			timestamp_fps_x3 = timestamp_aim_x3;
+			fskip_cnt = 0;
 		}
+		else if (currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) {
+			timestamp_aim_x3 = get_ticks() * 3;
+		}
+
+		timestamp_x3 = get_ticks() * 3;
 
 		// show notice_msg message?
 		if (notice_msg_time != 0)
 		{
 			static int noticeMsgSum;
-			if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(STATUS_MSG_TIMEOUT)) {
+			if (timestamp_x3 - ms_to_ticks(notice_msg_time) * 3
+			     > ms_to_ticks(STATUS_MSG_TIMEOUT) * 3)
+			{
 				notice_msg_time = 0;
 				plat_status_msg_clear();
+				plat_video_flip();
+				plat_status_msg_clear(); /* Do it again in case of double buffering */
 				notice_msg = NULL;
-			} else {
+			}
+			else {
 				int sum = noticeMsg[0] + noticeMsg[1] + noticeMsg[2];
 				if (sum != noticeMsgSum) {
 					plat_status_msg_clear();
@@ -1349,7 +1417,7 @@ void emu_loop(void)
 		}
 
 		// second changed?
-		if (timestamp - timestamp_fps >= ms_to_ticks(1000))
+		if (timestamp_x3 - timestamp_fps_x3 >= ms_to_ticks(1000) * 3)
 		{
 #ifdef BENCHMARK
 			static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
@@ -1363,91 +1431,82 @@ void emu_loop(void)
 			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);
-				if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
-			}
+			if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
+				snprintf(fpsbuff, 8, "%02i/%02i  ", frames_shown, frames_done);
 #endif
 			frames_shown = frames_done = 0;
-			timestamp_fps += ms_to_ticks(1000);
+			timestamp_fps_x3 += ms_to_ticks(1000) * 3;
 		}
 #ifdef PFRAMES
 		sprintf(fpsbuff, "%i", Pico.m.frame_count);
 #endif
 
-		if (timestamp - timestamp_base >= ms_to_ticks(1000))
-		{
-			if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)
-				pframes_done = 0;
-			else
-				pframes_done -= target_fps;
-			if (pframes_done < -2) {
-				/* don't drag more than 2 frames behind */
-				pframes_done = -2;
-				timestamp_base = timestamp - 2 * target_frametime;
-			}
-			else
-				timestamp_base += ms_to_ticks(1000);
-		}
+		diff = timestamp_aim_x3 - timestamp_x3;
 
-		diff = timestamp - timestamp_base;
-		diff_lim = (pframes_done + 1) * target_frametime;
-
-		if (currentConfig.Frameskip >= 0) // frameskip enabled
+		if (currentConfig.Frameskip >= 0) // frameskip enabled (or 0)
 		{
-			for (i = 0; i < currentConfig.Frameskip; i++) {
-				emu_update_input();
-				skip_frame(1);
-				pframes_done++; frames_done++;
-				diff_lim += target_frametime;
-
-				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
-						plat_wait_till_us(timestamp_base + diff_lim);
-				}
+			if (fskip_cnt < currentConfig.Frameskip) {
+				fskip_cnt++;
+				skip = 1;
+			}
+			else {
+				fskip_cnt = 0;
 			}
 		}
-		else if (diff > diff_lim)
+		else if (diff < -target_frametime_x3)
 		{
 			/* no time left for this frame - skip */
 			/* 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;
-			}
+			if (frames_done / 8 <= frames_shown)
+				skip = 1;
+		}
+
+		// don't go in debt too much
+		while (diff < -target_frametime_x3 * 3) {
+			timestamp_aim_x3 += target_frametime_x3;
+			diff = timestamp_aim_x3 - timestamp_x3;
 		}
 
 		emu_update_input();
-		PicoFrame();
-		pemu_finalize_frame(fpsbuff, notice_msg);
+		if (skip) {
+			int do_audio = diff > -target_frametime_x3 * 2;
+			PicoSkipFrame = do_audio ? 1 : 2;
+			PicoFrame();
+			PicoSkipFrame = 0;
+		}
+		else {
+			PicoFrame();
+			pemu_finalize_frame(fpsbuff, notice_msg);
+			frames_shown++;
+		}
+		frames_done++;
+		timestamp_aim_x3 += target_frametime_x3;
 
-		// plat_video_flip();
+		if (!skip && !flip_after_sync)
+			plat_video_flip();
 
 		/* frame limiter */
-		if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))
+		if (!skip && !reset_timing
+		    && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))
 		{
-			timestamp = get_ticks();
-			diff = timestamp - timestamp_base;
+			unsigned int timestamp = get_ticks();
+			diff = timestamp_aim_x3 - timestamp * 3;
 
 			// sleep or vsync if we are still too fast
-			if (diff < diff_lim)
-			{
+			if (diff > target_frametime_x3 && (currentConfig.EmuOpt & EOPT_VSYNC)) {
 				// we are too fast
-				plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);
-				if (currentConfig.EmuOpt & EOPT_VSYNC)
-					plat_video_wait_vsync();
+				plat_video_wait_vsync();
+				timestamp = get_ticks();
+				diff = timestamp * 3 - timestamp_aim_x3;
+			}
+			if (diff > target_frametime_x3) {
+				// still too fast
+				plat_wait_till_us(timestamp + (diff - target_frametime_x3) / 3);
 			}
 		}
 
-		// 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++;
+		if (!skip && flip_after_sync)
+			plat_video_flip();
 
 		pprof_end(main);
 	}
@@ -1463,10 +1522,4 @@ void emu_loop(void)
 
 	pemu_loop_end();
 	emu_sound_stop();
-
-	// pemu_loop_end() might want to do 1 frame for bg image,
-	// so free CD buffer here
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferFree();
 }
-