#include "mdec.h"
#include "gte.h"
#include "psxinterpreter.h"
+#include "../include/compiler_features.h"
R3000Acpu *psxCpu = NULL;
#ifdef DRC_DISABLE
psxRegs.pc = 0xbfc00000; // Start in bootstrap
- psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
- psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
+ psxRegs.CP0.n.SR = 0x10600000; // COP0 enabled | BEV = 1 | TS = 1
+ psxRegs.CP0.n.PRid = 0x00000002; // PRevID = Revision ID, same as R3000A
+ if (Config.HLE)
+ psxRegs.CP0.n.SR |= 1u << 30; // COP2 enabled
psxCpu->ApplyConfig();
psxCpu->Reset();
BiosLikeGPUSetup(); // a bit of a hack but whatever
- BiosBooted = FALSE;
if (!Config.HLE) {
psxExecuteBios();
if (psxRegs.pc == 0x80030000 && !Config.SlowBoot)
}
// cp0 is passed separately for lightrec to be less messy
-void psxException(u32 code, u32 bd, psxCP0Regs *cp0) {
- psxRegs.code = PSXMu32(psxRegs.pc);
+void psxException(u32 cause, enum R3000Abdt bdt, psxCP0Regs *cp0) {
+ u32 opcode = intFakeFetch(psxRegs.pc);
- if (!Config.HLE && ((((psxRegs.code) >> 24) & 0xfe) == 0x4a)) {
+ if (unlikely(!Config.HLE && (opcode >> 25) == 0x25)) {
// "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
- psxCP2Regs *cp2 = (void *)(cp0 + 1);
- psxCP2[psxRegs.code & 0x3f](cp2);
+ psxCP2Regs *cp2 = (psxCP2Regs *)(cp0 + 1);
+ psxRegs.code = opcode;
+ psxCP2[opcode & 0x3f](cp2);
}
// Set the Cause
- cp0->n.Cause = (cp0->n.Cause & 0x300) | code;
+ cp0->n.Cause = (bdt << 30) | (cp0->n.Cause & 0x300) | cause;
// Set the EPC & PC
- if (bd) {
-#ifdef PSXCPU_LOG
- PSXCPU_LOG("bd set!!!\n");
-#endif
- cp0->n.Cause |= 0x80000000;
- cp0->n.EPC = (psxRegs.pc - 4);
- } else
- cp0->n.EPC = (psxRegs.pc);
+ cp0->n.EPC = bdt ? psxRegs.pc - 4 : psxRegs.pc;
- if (cp0->n.Status & 0x400000)
+ if (cp0->n.SR & 0x400000)
psxRegs.pc = 0xbfc00180;
else
psxRegs.pc = 0x80000080;
- // Set the Status
- cp0->n.Status = (cp0->n.Status & ~0x3f) | ((cp0->n.Status & 0x0f) << 2);
+ // Set the SR
+ cp0->n.SR = (cp0->n.SR & ~0x3f) | ((cp0->n.SR & 0x0f) << 2);
if (Config.HLE) psxBiosException();
}
}
if (psxHu32(0x1070) & psxHu32(0x1074)) {
- if ((psxRegs.CP0.n.Status & 0x401) == 0x401) {
+ if ((psxRegs.CP0.n.SR & 0x401) == 0x401) {
#ifdef PSXCPU_LOG
PSXCPU_LOG("Interrupt: %x %x\n", psxHu32(0x1070), psxHu32(0x1074));
#endif
void psxExecuteBios() {
int i;
- for (i = 0; psxRegs.pc != 0x80030000 && i < 5000000; i++)
- psxCpu->ExecuteBlock();
- if (psxRegs.pc == 0x80030000)
- BiosBooted = TRUE;
- else
- SysPrintf("BIOS boot timeout - custom BIOS?\n");
+ for (i = 0; i < 5000000; i++) {
+ psxCpu->ExecuteBlock(EXEC_CALLER_BOOT);
+ if ((psxRegs.pc & 0xff800000) == 0x80000000)
+ break;
+ }
+ if (psxRegs.pc != 0x80030000)
+ SysPrintf("non-standard BIOS detected (%d, %08x)\n", i, psxRegs.pc);
}