#include "cdrom.h"
#include "mdec.h"
#include "gte.h"
+#include "psxinterpreter.h"
R3000Acpu *psxCpu = NULL;
#ifdef DRC_DISABLE
#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) {
psxCpu = &psxInt;
} else psxCpu = &psxRec;
#else
+ Config.Cpu = CPU_INTERPRETER;
psxCpu = &psxInt;
#endif
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();
}
void psxShutdown() {
- psxMemShutdown();
psxBiosShutdown();
psxCpu->Shutdown();
+
+ psxMemShutdown();
}
void psxException(u32 code, u32 bd) {
- #ifdef ICACHE_EMULATION
- /* Dynarecs may use this codepath and crash as a result.
- * This should only be used for the interpreter. - Gameblabla
- * */
- if (Config.icache_emulation && Config.Cpu == CPU_INTERPRETER)
- {
- psxRegs.code = SWAPu32(*Read_ICache(psxRegs.pc));
- }
- else
- #endif
- {
- psxRegs.code = PSXMu32(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
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();
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();
+ cdrPlayReadInterrupt();
}
}
if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
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);