X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxhw.c;h=f5efa22bd7c704295f006b0846295a789e11bfc6;hb=718b363f51678f354fead84ef98e4c28dcae3689;hp=4811f99babbcbf7e4bf949026f742cd8eca10806;hpb=f8896d181bd26ef6fd18af17f01c77b73ae17a68;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c index 4811f99b..f5efa22b 100644 --- a/libpcsxcore/psxhw.c +++ b/libpcsxcore/psxhw.c @@ -42,7 +42,7 @@ void psxHwReset() { cdrReset(); psxRcntInit(); HW_GPU_STATUS = SWAP32(0x10802000); - psxHwReadGpuSRptr = Config.hacks.gpu_busy_hack + psxHwReadGpuSRptr = Config.hacks.gpu_busy ? psxHwReadGpuSRbusyHack : psxHwReadGpuSR; } @@ -85,8 +85,13 @@ void psxHwWriteDmaIcr32(u32 value) 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) @@ -468,33 +473,15 @@ u32 psxHwRead32(u32 add) { void psxHwWrite8(u32 add, u8 value) { switch (add & 0x1fffffff) { - case 0x1f801040: sioWrite8(value); break; + case 0x1f801040: sioWrite8(value); break; + case 0x1f8010f6: + // nocash documents it as forced w32, but still games use this? + break; case 0x1f801800: cdrWrite0(value); break; case 0x1f801801: cdrWrite1(value); break; case 0x1f801802: cdrWrite2(value); break; case 0x1f801803: cdrWrite3(value); break; - case 0x1f801041: case 0x1f801042: case 0x1f801043: - case 0x1f801044: case 0x1f801045: - case 0x1f801046: case 0x1f801047: - case 0x1f801048: case 0x1f801049: - case 0x1f80104a: case 0x1f80104b: - case 0x1f80104c: case 0x1f80104d: - case 0x1f80104e: case 0x1f80104f: - case 0x1f801050: case 0x1f801051: - case 0x1f801054: case 0x1f801055: - case 0x1f801058: case 0x1f801059: - case 0x1f80105a: case 0x1f80105b: - case 0x1f80105c: case 0x1f80105d: - case 0x1f801100: case 0x1f801101: - case 0x1f801104: case 0x1f801105: - case 0x1f801108: case 0x1f801109: - case 0x1f801110: case 0x1f801111: - case 0x1f801114: case 0x1f801115: - case 0x1f801118: case 0x1f801119: - case 0x1f801120: case 0x1f801121: - case 0x1f801124: case 0x1f801125: - case 0x1f801128: case 0x1f801129: case 0x1f801810: case 0x1f801811: case 0x1f801812: case 0x1f801813: case 0x1f801814: case 0x1f801815: @@ -512,6 +499,8 @@ void psxHwWrite8(u32 add, u8 value) { SPU_writeRegister(add, value, psxRegs.cycle); return; } + else if (0x1f801000 <= add && add < 0x1f801800) + log_unhandled("unhandled w8 %08x @%08x\n", add, psxRegs.pc); psxHu8(add) = value; #ifdef PSXHW_LOG