X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Femu.c;h=6ac086dec2a6531dcc91a29cf132559379f25a31;hb=16e89bed918ec39b1e43956b903f7986af86a6b2;hp=d2eaca78bc0780c3f083e468287e6e0c4a958209;hpb=2aea862d8ac79031a0f581c7eef6414960a0dafc;p=libpicofe.git

diff --git a/psp/emu.c b/psp/emu.c
index d2eaca7..6ac086d 100644
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -15,7 +15,7 @@
 #include "../common/lprintf.h"
 #include "../../Pico/PicoInt.h"
 
-#define OSD_FPS_X 420
+#define OSD_FPS_X 424
 
 // additional pspaudio imports, credits to crazyc
 int sceAudio_38553111(unsigned short samples, unsigned short freq, char unknown);  // play with conversion?
@@ -35,7 +35,7 @@ int reset_timing = 0; // do we need this?
 
 static void sound_init(void);
 static void sound_deinit(void);
-static void blit2(const char *fps, const char *notice);
+static void blit2(const char *fps, const char *notice, int lagging_behind);
 static void clearArea(int full);
 
 void emu_noticeMsgUpdated(void)
@@ -133,7 +133,7 @@ void emu_setDefaultConfig(void)
 	currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
 	currentConfig.Frameskip = -1; // auto
 	currentConfig.volume = 50;
-	currentConfig.CPUclock = 222;
+	currentConfig.CPUclock = 333;
 	currentConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
 	currentConfig.KeyBinds[ 6] = 1<<1;
 	currentConfig.KeyBinds[ 7] = 1<<2;
@@ -142,11 +142,18 @@ void emu_setDefaultConfig(void)
 	currentConfig.KeyBinds[13] = 1<<5;
 	currentConfig.KeyBinds[15] = 1<<6;
 	currentConfig.KeyBinds[ 3] = 1<<7;
+	currentConfig.KeyBinds[12] = 1<<26; // switch rnd
 	currentConfig.KeyBinds[ 8] = 1<<27; // save state
 	currentConfig.KeyBinds[ 9] = 1<<28; // load state
+	currentConfig.KeyBinds[28] = 1<<0; // num "buttons"
+	currentConfig.KeyBinds[30] = 1<<1;
+	currentConfig.KeyBinds[31] = 1<<2;
+	currentConfig.KeyBinds[29] = 1<<3;
 	currentConfig.PicoCDBuffers = 0;
-	currentConfig.scaling = 1; // bilinear filtering for psp
-	currentConfig.scale = currentConfig.hscale32 = currentConfig.hscale40 = 1.0;
+	currentConfig.scaling = 1;     // bilinear filtering for psp
+	currentConfig.scale = 1.20;    // fullscreen
+	currentConfig.hscale40 = 1.25;
+	currentConfig.hscale32 = 1.56;
 }
 
 
@@ -206,13 +213,15 @@ static void set_scaling_params(void)
 	if (fbimg_yoffs < 0) fbimg_yoffs = 0;
 	fbimg_offs = (fbimg_yoffs*512 + fbimg_xoffs) * 2; // dst is always 16bit
 
+	/*
 	lprintf("set_scaling_params:\n");
 	lprintf("offs: %i, %i\n", fbimg_xoffs, fbimg_yoffs);
 	lprintf("xy0, xy1: %i, %i; %i, %i\n", g_vertices[0].x, g_vertices[0].y, g_vertices[1].x, g_vertices[1].y);
 	lprintf("uv0, uv1: %i, %i; %i, %i\n", g_vertices[0].u, g_vertices[0].v, g_vertices[1].u, g_vertices[1].v);
+	*/
 }
 
-static void do_slowmode_pal(void)
+static void do_pal_update(int allow_sh)
 {
 	unsigned int *spal=(void *)Pico.cram;
 	unsigned int *dpal=(void *)localPal;
@@ -221,11 +230,11 @@ static void do_slowmode_pal(void)
 	for (i = 0x3f/2; i >= 0; i--)
 		dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
 
-	if (Pico.video.reg[0xC]&8) // shadow/hilight?
+	if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
 	{
 		// shadowed pixels
 		for (i = 0x3f/2; i >= 0; i--)
-			dpal[0x20|i] = dpal[0x60|i] = (spal[i]>>1)&0x738e738e;
+			dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e;
 		// hilighted pixels
 		for (i = 0x3f; i >= 0; i--) {
 			int t=localPal[i]&0xe71c;t+=0x4208;
@@ -259,7 +268,7 @@ static void EmuScanPrepare(void)
 
 	dynamic_palette = 0;
 	if (Pico.m.dirtyPal)
-		do_slowmode_pal();
+		do_pal_update(1);
 }
 
 static int EmuScanSlow(unsigned int num, void *sdata)
@@ -271,7 +280,7 @@ static int EmuScanSlow(unsigned int num, void *sdata)
 			do_slowmode_lines(num);
 			dynamic_palette = 1;
 		}
-		do_slowmode_pal();
+		do_pal_update(1);
 	}
 
 	if (dynamic_palette) {
@@ -289,8 +298,6 @@ static void blitscreen_clut(void)
 	int offs = fbimg_offs;
 	offs += (psp_screen == VRAM_FB0) ? VRAMOFFS_FB0 : VRAMOFFS_FB1;
 
-	sceKernelDcacheWritebackAll();
-
 	sceGuSync(0,0); // sync with prev
 	sceGuStart(GU_DIRECT, guCmdList);
 	sceGuDrawBuffer(GU_PSM_5650, (void *)offs, 512); // point to back buffer
@@ -314,14 +321,9 @@ static void blitscreen_clut(void)
 		}
 
 		if ((PicoOpt&0x10) && Pico.m.dirtyPal)
-		{
-			int i, *dpal = (void *)localPal, *spal = (int *)Pico.cram;
-			for (i = 0x3f/2; i >= 0; i--)
-				dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
-			localPal[0xe0] = 0;
-			Pico.m.dirtyPal = 0;
-			need_pal_upload = 1;
-		}
+			do_pal_update(0);
+
+		sceKernelDcacheWritebackAll();
 
 		if (need_pal_upload) {
 			need_pal_upload = 0;
@@ -357,15 +359,13 @@ static void blitscreen_clut(void)
 
 static void cd_leds(void)
 {
-	static int old_reg = 0;
-	unsigned int col_g, col_r, *p;
+	unsigned int reg, col_g, col_r, *p;
 
-	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
-	old_reg = Pico_mcd->s68k_regs[0];
+	reg = Pico_mcd->s68k_regs[0];
 
 	p = (unsigned int *)((short *)psp_screen + 512*2+4+2);
-	col_g = (old_reg & 2) ? 0x06000600 : 0;
-	col_r = (old_reg & 1) ? 0xc000c000 : 0;
+	col_g = (reg & 2) ? 0x06000600 : 0;
+	col_r = (reg & 1) ? 0x00180018 : 0;
 	*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
 	*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
 	*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
@@ -406,11 +406,9 @@ void blit1(void)
 }
 
 
-static void blit2(const char *fps, const char *notice)
+static void blit2(const char *fps, const char *notice, int lagging_behind)
 {
-	int emu_opt = currentConfig.EmuOpt;
-
-	sceGuSync(0,0);
+	int vsync = 0, emu_opt = currentConfig.EmuOpt;
 
 	if (notice || (emu_opt & 2)) {
 		if (notice)      osd_text(4, notice, 0);
@@ -422,7 +420,11 @@ static void blit2(const char *fps, const char *notice)
 	if ((emu_opt & 0x400) && (PicoMCD & 1))
 		cd_leds();
 
-	psp_video_flip(0);
+	if (currentConfig.EmuOpt & 0x2000) { // want vsync
+		if (!(currentConfig.EmuOpt & 0x10000) || !lagging_behind) vsync = 1;
+	}
+
+	psp_video_flip(vsync);
 }
 
 // clears whole screen or just the notice area (in all buffers)
@@ -473,8 +475,8 @@ static void vidResetMode(void)
 
 
 /* sound stuff */
-#define SOUND_BLOCK_SIZE_NTSC (2940*2) // 1024 // 1152
-#define SOUND_BLOCK_SIZE_PAL  (3528*2)
+#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
+#define SOUND_BLOCK_SIZE_PAL  (1764*2)
 #define SOUND_BLOCK_COUNT    4
 
 static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
@@ -489,14 +491,15 @@ static int sound_thread(SceSize args, void *argp)
 {
 	int ret;
 
-	lprintf("sound_thread: started, priority %i\n", sceKernelGetThreadCurrentPriority());
+	lprintf("sthr: started, priority %i\n", sceKernelGetThreadCurrentPriority());
 
 	while (!sound_thread_exit)
 	{
 		if (samples_made - samples_done < samples_block) {
-			// wait for data...
-			//lprintf("sthr: wait... (%i/%i)\n", samples_done, samples_made);
-			ret = sceKernelWaitSema(sound_sem, 1, 0);
+			// wait for data (use at least 2 blocks)
+			//lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+			while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
+				ret = sceKernelWaitSema(sound_sem, 1, 0);
 			//lprintf("sthr: sceKernelWaitSema: %i\n", ret);
 			continue;
 		}
@@ -511,6 +514,14 @@ static int sound_thread(SceSize args, void *argp)
 			snd_playptr = sndBuffer;
 		if (ret)
 			lprintf("sthr: outf: %i; pos %i/%i\n", ret, samples_done, samples_made);
+
+		// shouln't happen, but just in case
+		if (samples_made - samples_done >= samples_block*3) {
+			//lprintf("block skip (%i)\n", samples_made - samples_done);
+			samples_done += samples_block; // skip
+			snd_playptr  += samples_block;
+		}
+
 	}
 
 	lprintf("sthr: exit\n");
@@ -525,6 +536,8 @@ static void sound_init(void)
 	sound_sem = sceKernelCreateSema("sndsem", 0, 0, 1, NULL);
 	if (sound_sem < 0) lprintf("sceKernelCreateSema() failed: %i\n", sound_sem);
 
+	samples_made = samples_done = 0;
+	samples_block = SOUND_BLOCK_SIZE_NTSC; // make sure it goes to sema
 	sound_thread_exit = 0;
 	thid = sceKernelCreateThread("sndthread", sound_thread, 0x12, 0x10000, 0, NULL);
 	if (thid >= 0)
@@ -543,13 +556,12 @@ static void sound_prepare(void)
 	samples_made = samples_done = 0;
 
 	if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
-		sound_rerate(Pico.m.frame_count ? 1 : 0);
+		PsndRerate(Pico.m.frame_count ? 1 : 0);
 	}
 	stereo=(PicoOpt&8)>>3;
 
 	samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
-	if (PsndRate == 22050) samples_block /= 2;
-	else if (PsndRate == 11025) samples_block /= 4;
+	if (PsndRate <= 22050) samples_block /= 2;
 	sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
 
 	lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
@@ -577,7 +589,8 @@ static void sound_prepare(void)
 
 static void sound_end(void)
 {
-	while (samples_made - samples_done >= samples_block || sceAudioOutput2GetRestSample() > 0)
+	samples_made = samples_done = 0;
+	while (sceAudioOutput2GetRestSample() > 0)
 		psp_msleep(100);
 	sceAudio_5C37C0AE();
 }
@@ -586,6 +599,8 @@ static void sound_deinit(void)
 {
 	sound_thread_exit = 1;
 	sceKernelSignalSema(sound_sem, 1);
+	sceKernelDeleteSema(sound_sem);
+	sound_sem = -1;
 }
 
 static void writeSound(int len)
@@ -605,7 +620,7 @@ static void writeSound(int len)
 
 	// signal the snd thread
 	samples_made += len;
-	if (samples_made - samples_done >= samples_block) {
+	if (samples_made - samples_done > samples_block*2) {
 		// lprintf("signal, %i/%i\n", samples_done, samples_made);
 		ret = sceKernelSignalSema(sound_sem, 1);
 		// lprintf("signal ret %i\n", ret);
@@ -657,7 +672,8 @@ static void RunEvents(unsigned int which)
 				 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
 		{
 			int keys;
-			blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)");
+			sceGuSync(0,0);
+			blit2("", (which & 0x1000) ? "LOAD STATE? (X=yes, O=no)" : "OVERWRITE SAVE? (X=yes, O=no)", 0);
 			while( !((keys = psp_pad_read(1)) & (BTN_X|BTN_CIRCLE)) )
 				psp_msleep(50);
 			if (keys & BTN_CIRCLE) do_it = 0;
@@ -684,13 +700,10 @@ static void RunEvents(unsigned int which)
 
 		vidResetMode();
 
-		if (PicoOpt&0x10) {
-			strcpy(noticeMsg, " 8bit fast renderer");
-		} else if (currentConfig.EmuOpt&0x80) {
-			strcpy(noticeMsg, "16bit accurate renderer");
-		} else {
-			strcpy(noticeMsg, " 8bit accurate renderer");
-		}
+		if (PicoOpt&0x10)
+			strcpy(noticeMsg, "fast renderer");
+		else if (currentConfig.EmuOpt&0x80)
+			strcpy(noticeMsg, "accurate renderer");
 
 		noticeMsgTime = sceKernelGetSystemTimeLow();
 	}
@@ -785,16 +798,26 @@ static void find_combos(void)
 	combo_keys = combo_acts = 0;
 	for (act = 0; act < 32; act++)
 	{
-		int keyc = 0;
+		int keyc = 0, keyc2 = 0;
 		if (act == 16 || act == 17) continue; // player2 flag
-		for (u = 0; u < 32; u++)
+		if (act > 17)
 		{
-			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+			for (u = 0; u < 28; u++) // 28 because nub can't produce combos
+				if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
 		}
-		if (keyc > 1)
+		else
+		{
+			for (u = 0; u < 28; u++)
+				if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
+					(currentConfig.KeyBinds[u] & (1 << act))) keyc++;
+			for (u = 0; u < 28; u++)
+				if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
+					(currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
+		}
+		if (keyc > 1 || keyc2 > 1)
 		{
 			// loop again and mark those keys and actions as combo
-			for (u = 0; u < 32; u++)
+			for (u = 0; u < 28; u++)
 			{
 				if (currentConfig.KeyBinds[u] & (1 << act)) {
 					combo_keys |= 1 << u;
@@ -858,6 +881,8 @@ void emu_Loop(void)
 		sound_prepare();
 	}
 
+	sceDisplayWaitVblankStart();
+
 	// loop?
 	while (engineState == PGS_Running)
 	{
@@ -940,12 +965,10 @@ void emu_Loop(void)
 			int tval_diff;
 			tval = sceKernelGetSystemTimeLow();
 			tval_diff = (int)(tval - tval_thissec) << 8;
-			if (tval_diff > lim_time)
+			if (tval_diff > lim_time && (frames_done/16 < frames_shown))
 			{
 				// no time left for this frame - skip
 				if (tval_diff - lim_time >= (300000<<8)) {
-					/* something caused a slowdown for us (disk access? cache flush?)
-					 * try to recover by resetting timing... */
 					reset_timing = 1;
 					continue;
 				}
@@ -962,12 +985,14 @@ void emu_Loop(void)
 
 		PicoFrame();
 
-		blit2(fpsbuff, notice);
+		sceGuSync(0,0);
 
 		// check time
 		tval = sceKernelGetSystemTimeLow();
 		tval_diff = (int)(tval - tval_thissec) << 8;
 
+		blit2(fpsbuff, notice, tval_diff > lim_time);
+
 		if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection
 			reset_timing = 1;
 		else if (PsndOut != NULL || currentConfig.Frameskip < 0)
@@ -998,8 +1023,8 @@ void emu_Loop(void)
 		SRam.changed = 0;
 	}
 
-	// draw a frame for bg..
-	emu_forcedFrame();
+	// clear fps counters and stuff
+	memset32((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
 }