merge from libretro fork

[pcsx_rearmed.git] / libpcsxcore / r3000a.c

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index a9b800e..ddf8388 100644 (file)
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -33,7 +33,7 @@ psxRegisters psxRegs;
 #endif
 
 int psxInit() {
-       SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
+       SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);
 
 #ifndef DRC_DISABLE
        if (Config.Cpu == CPU_INTERPRETER) {
@@ -61,6 +61,7 @@ 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->ApplyConfig();
        psxCpu->Reset();
 
        psxHwReset();
@@ -76,22 +77,22 @@ void psxReset() {
 }
 
 void psxShutdown() {
-       psxMemShutdown();
        psxBiosShutdown();
 
        psxCpu->Shutdown();
+
+       psxMemShutdown();
 }
 
 void psxException(u32 code, u32 bd) {
-       psxRegs.code = fetch(psxRegs.pc);
+       psxRegs.code = PSXMu32(psxRegs.pc);
        
        if (!Config.HLE && ((((psxRegs.code) >> 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);
+               psxCP2[psxRegs.code & 0x3f](&psxRegs.CP2);
        }
 
        // Set the Cause
@@ -124,7 +125,7 @@ void psxBranchTest() {
                psxRcntUpdate();
 
        if (psxRegs.interrupt) {
-               if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
+               if ((psxRegs.interrupt & (1 << PSXINT_SIO))) { // sio
                        if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
                                psxRegs.interrupt &= ~(1 << PSXINT_SIO);
                                sioInterrupt();
@@ -139,7 +140,7 @@ void psxBranchTest() {
                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);
-                               cdrPlaySeekReadInterrupt();
+                               cdrPlayReadInterrupt();
                        }
                }
                if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma