misc: make error message remind about common mistake

[pcsx_rearmed.git] / libpcsxcore / r3000a.c

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 8c6289e..f5996ac 100644 (file)
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -48,8 +48,6 @@ int psxInit() {
 }
 
 void psxReset() {
-       psxCpu->Reset();
-
        psxMemReset();
 
        memset(&psxRegs, 0, sizeof(psxRegs));
@@ -59,6 +57,8 @@ void psxReset() {
        psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
        psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
 
+       psxCpu->Reset();
+
        psxHwReset();
        psxBiosInit();
 
@@ -79,8 +79,17 @@ void psxShutdown() {
 }
 
 void psxException(u32 code, u32 bd) {
+       if (!Config.HLE && ((((psxRegs.code = PSXMu32(psxRegs.pc)) >> 24) & 0xfe) == 0x4a)) {
+               // "hokuto no ken" / "Crash Bandicot 2" ...
+               // BIOS does not allow to return to GTE instructions
+               // (just skips it, supposedly because it's scheduled already)
+               // so we execute it here
+               extern void (*psxCP2[64])(void *cp2regs);
+               psxCP2[psxRegs.code & 0x3f](&psxRegs.CP2D);
+       }
+
        // Set the Cause
-       psxRegs.CP0.n.Cause = code;
+       psxRegs.CP0.n.Cause = (psxRegs.CP0.n.Cause & 0x300) | code;
 
        // Set the EPC & PC
        if (bd) {
@@ -102,11 +111,6 @@ void psxException(u32 code, u32 bd) {
        psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
                                                  ((psxRegs.CP0.n.Status & 0xf) << 2);
 
-       if (!Config.HLE && (((PSXMu32(psxRegs.CP0.n.EPC) >> 24) & 0xfe) == 0x4a)) {
-               // "hokuto no ken" / "Crash Bandicot 2" ... fix
-               PSXMu32ref(psxRegs.CP0.n.EPC)&= SWAPu32(~0x02000000);
-       }
-
        if (Config.HLE) psxBiosException();
 }
 
@@ -115,42 +119,72 @@ void psxBranchTest() {
                psxRcntUpdate();
 
        if (psxRegs.interrupt) {
-               if ((psxRegs.interrupt & 0x80) && !Config.Sio) { // sio
-                       if ((psxRegs.cycle - psxRegs.intCycle[7]) >= psxRegs.intCycle[7 + 1]) {
-                               psxRegs.interrupt &= ~0x80;
+               if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_SIO);
                                sioInterrupt();
                        }
                }
-               if (psxRegs.interrupt & 0x04) { // cdr
-                       if ((psxRegs.cycle - psxRegs.intCycle[2]) >= psxRegs.intCycle[2 + 1]) {
-                               psxRegs.interrupt &= ~0x04;
+               if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_CDR);
                                cdrInterrupt();
                        }
                }
-               if (psxRegs.interrupt & 0x040000) { // cdr read
-                       if ((psxRegs.cycle - psxRegs.intCycle[2 + 16]) >= psxRegs.intCycle[2 + 16 + 1]) {
-                               psxRegs.interrupt &= ~0x040000;
+               if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
                                cdrReadInterrupt();
                        }
                }
-               if (psxRegs.interrupt & 0x01000000) { // gpu dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[3 + 24]) >= psxRegs.intCycle[3 + 24 + 1]) {
-                               psxRegs.interrupt &= ~0x01000000;
+               if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
                                gpuInterrupt();
                        }
                }
-               if (psxRegs.interrupt & 0x02000000) { // mdec out dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[5 + 24]) >= psxRegs.intCycle[5 + 24 + 1]) {
-                               psxRegs.interrupt &= ~0x02000000;
+               if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
                                mdec1Interrupt();
                        }
                }
-               if (psxRegs.interrupt & 0x04000000) { // spu dma
-                       if ((psxRegs.cycle - psxRegs.intCycle[1 + 24]) >= psxRegs.intCycle[1 + 24 + 1]) {
-                               psxRegs.interrupt &= ~0x04000000;
+               if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
                                spuInterrupt();
                        }
                }
+               if (psxRegs.interrupt & (1 << PSXINT_MDECINDMA)) { // mdec in
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECINDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECINDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_MDECINDMA);
+                               mdec0Interrupt();
+                       }
+               }
+               if (psxRegs.interrupt & (1 << PSXINT_GPUOTCDMA)) { // gpu otc
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUOTCDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUOTCDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_GPUOTCDMA);
+                               gpuotcInterrupt();
+                       }
+               }
+               if (psxRegs.interrupt & (1 << PSXINT_CDRDMA)) { // cdrom
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDRDMA].sCycle) >= psxRegs.intCycle[PSXINT_CDRDMA].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_CDRDMA);
+                               cdrDmaInterrupt();
+                       }
+               }
+               if (psxRegs.interrupt & (1 << PSXINT_CDRPLAY)) { // cdr play timing
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDRPLAY].sCycle) >= psxRegs.intCycle[PSXINT_CDRPLAY].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_CDRPLAY);
+                               cdrPlayInterrupt();
+                       }
+               }
+               if (psxRegs.interrupt & (1 << PSXINT_CDRLID)) { // cdr lid states
+                       if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDRLID].sCycle) >= psxRegs.intCycle[PSXINT_CDRLID].cycle) {
+                               psxRegs.interrupt &= ~(1 << PSXINT_CDRLID);
+                               cdrLidSeekInterrupt();
+                       }
+               }
        }
 
        if (psxHu32(0x1070) & psxHu32(0x1074)) {