X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxhw.c;h=b8ca1996ae0f79d2a459c223a5069f506b9218e9;hb=9ed80467762a5024f7ba04e9fb384faceca35c29;hp=e85d8b5c9d01a66b0e9294c015bd1cb298dcd393;hpb=a01b90c372831080aa3f9dedf5251f76f300038c;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index e85d8b5c..b8ca1996 100644
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -22,6 +22,7 @@
 */
 
 #include "psxhw.h"
+#include "psxevents.h"
 #include "mdec.h"
 #include "cdrom.h"
 #include "gpu.h"
@@ -32,18 +33,22 @@
 #define PAD_LOG(...)
 #endif
 
+static u32 (*psxHwReadGpuSRptr)(void) = psxHwReadGpuSR;
+
 void psxHwReset() {
 	memset(psxH, 0, 0x10000);
 
 	mdecInit(); // initialize mdec decoder
 	cdrReset();
 	psxRcntInit();
-	HW_GPU_STATUS = SWAP32(0x14802000);
+	HW_GPU_STATUS = SWAP32(0x10802000);
+	psxHwReadGpuSRptr = Config.hacks.gpu_busy
+		? psxHwReadGpuSRbusyHack : psxHwReadGpuSR;
 }
 
 void psxHwWriteIstat(u32 value)
 {
-	u32 stat = psxHu16(0x1070) & SWAPu16(value);
+	u32 stat = psxHu16(0x1070) & value;
 	psxHu16ref(0x1070) = SWAPu16(stat);
 
 	psxRegs.CP0.n.Cause &= ~0x400;
@@ -55,10 +60,10 @@ void psxHwWriteImask(u32 value)
 {
 	u32 stat = psxHu16(0x1070);
 	psxHu16ref(0x1074) = SWAPu16(value);
-	if (stat & SWAPu16(value)) {
+	if (stat & value) {
 		//if ((psxRegs.CP0.n.SR & 0x401) == 0x401)
 		//	log_unhandled("irq on unmask @%08x\n", psxRegs.pc);
-		new_dyna_set_event(PSXINT_NEWDRC_CHECK, 1);
+		set_event(PSXINT_NEWDRC_CHECK, 1);
 	}
 	psxRegs.CP0.n.Cause &= ~0x400;
 	if (stat & value)
@@ -78,6 +83,45 @@ void psxHwWriteDmaIcr32(u32 value)
 	HW_DMA_ICR = SWAPu32(tmp);
 }
 
+void psxHwWriteGpuSR(u32 value)
+{
+	u32 old_sr = HW_GPU_STATUS, new_sr;
+	GPU_writeStatus(value);
+	gpuSyncPluginSR();
+	new_sr = HW_GPU_STATUS;
+	// "The Next Tetris" seems to rely on the field order after enable
+	if ((old_sr ^ new_sr) & new_sr & SWAP32(PSXGPU_ILACE))
+		frame_counter |= 1;
+}
+
+u32 psxHwReadGpuSR(void)
+{
+	u32 v, c = psxRegs.cycle;
+
+	// meh2, syncing for img bit, might want to avoid it..
+	gpuSyncPluginSR();
+	v = SWAP32(HW_GPU_STATUS);
+	v |= ((s32)(psxRegs.gpuIdleAfter - c) >> 31) & PSXGPU_nBUSY;
+
+	// XXX: because of large timeslices can't use hSyncCount, using rough
+	// approximization instead. Perhaps better use hcounter code here or something.
+	if (hSyncCount < 240 && (v & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
+		v |= PSXGPU_LCF & (c << 20);
+	return v;
+}
+
+// a hack due to poor timing of gpu idle bit
+// to get rid of this, GPU draw times, DMAs, cpu timing has to fall within
+// certain timing window or else games like "ToHeart" softlock
+u32 psxHwReadGpuSRbusyHack(void)
+{
+	u32 v = psxHwReadGpuSR();
+	static u32 hack;
+	if (!(hack++ & 3))
+		v &= ~PSXGPU_nBUSY;
+	return v;
+}
+
 u8 psxHwRead8(u32 add) {
 	unsigned char hard;
 
@@ -120,8 +164,11 @@ u8 psxHwRead8(u32 add) {
 			log_unhandled("unhandled r8  %08x @%08x\n", add, psxRegs.pc);
 			// falthrough
 		default:
-			if (0x1f801c00 <= add && add < 0x1f802000)
-				log_unhandled("spu r8 %02x @%08x\n", add, psxRegs.pc);
+			if (0x1f801c00 <= add && add < 0x1f802000) {
+				u16 val = SPU_readRegister(add & ~1, psxRegs.cycle);
+				hard = (add & 1) ? val >> 8 : val;
+				break;
+			}
 			hard = psxHu8(add); 
 #ifdef PSXHW_LOG
 			PSXHW_LOG("*Unkwnown 8bit read at address %x\n", add);
@@ -175,7 +222,7 @@ u16 psxHwRead16(u32 add) {
 			return 0x80;
 
 		case 0x1f801100:
-			hard = psxRcntRcount(0);
+			hard = psxRcntRcount0();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T0 count read16: %x\n", hard);
 #endif
@@ -193,7 +240,7 @@ u16 psxHwRead16(u32 add) {
 #endif
 			return hard;
 		case 0x1f801110:
-			hard = psxRcntRcount(1);
+			hard = psxRcntRcount1();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T1 count read16: %x\n", hard);
 #endif
@@ -211,7 +258,7 @@ u16 psxHwRead16(u32 add) {
 #endif
 			return hard;
 		case 0x1f801120:
-			hard = psxRcntRcount(2);
+			hard = psxRcntRcount2();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T2 count read16: %x\n", hard);
 #endif
@@ -253,7 +300,7 @@ u16 psxHwRead16(u32 add) {
 			// falthrough
 		default:
 			if (0x1f801c00 <= add && add < 0x1f802000)
-				return SPU_readRegister(add);
+				return SPU_readRegister(add, psxRegs.cycle);
 			hard = psxHu16(add);
 #ifdef PSXHW_LOG
 			PSXHW_LOG("*Unkwnown 16bit read at address %x\n", add);
@@ -299,10 +346,7 @@ u32 psxHwRead32(u32 add) {
 #endif
 			return hard;
 		case 0x1f801814:
-			gpuSyncPluginSR();
-			hard = SWAP32(HW_GPU_STATUS);
-			if (hSyncCount < 240 && (hard & PSXGPU_ILACE_BITS) != PSXGPU_ILACE_BITS)
-				hard |= PSXGPU_LCF & (psxRegs.cycle << 20);
+			hard = psxHwReadGpuSRptr();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("GPU STATUS 32bit read %x\n", hard);
 #endif
@@ -346,7 +390,7 @@ u32 psxHwRead32(u32 add) {
 
 		// time for rootcounters :)
 		case 0x1f801100:
-			hard = psxRcntRcount(0);
+			hard = psxRcntRcount0();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T0 count read32: %x\n", hard);
 #endif
@@ -364,7 +408,7 @@ u32 psxHwRead32(u32 add) {
 #endif
 			return hard;
 		case 0x1f801110:
-			hard = psxRcntRcount(1);
+			hard = psxRcntRcount1();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T1 count read32: %x\n", hard);
 #endif
@@ -382,7 +426,7 @@ u32 psxHwRead32(u32 add) {
 #endif
 			return hard;
 		case 0x1f801120:
-			hard = psxRcntRcount(2);
+			hard = psxRcntRcount2();
 #ifdef PSXHW_LOG
 			PSXHW_LOG("T2 count read32: %x\n", hard);
 #endif
@@ -411,8 +455,8 @@ u32 psxHwRead32(u32 add) {
 			// falthrough
 		default:
 			if (0x1f801c00 <= add && add < 0x1f802000) {
-				hard = SPU_readRegister(add);
-				hard |= SPU_readRegister(add + 2) << 16;
+				hard = SPU_readRegister(add, psxRegs.cycle);
+				hard |= SPU_readRegister(add + 2, psxRegs.cycle) << 16;
 				return hard;
 			}
 			hard = psxHu32(add);
@@ -768,8 +812,7 @@ void psxHwWrite32(u32 add, u32 value) {
 #ifdef PSXHW_LOG
 			PSXHW_LOG("GPU STATUS 32bit write %x\n", value);
 #endif
-			GPU_writeStatus(value);
-			gpuSyncPluginSR();
+			psxHwWriteGpuSR(value);
 			return;
 
 		case 0x1f801820: