notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psxbios: completely rework exception handling
[pcsx_rearmed.git]
/
libpcsxcore
/
r3000a.c
diff --git
a/libpcsxcore/r3000a.c
b/libpcsxcore/r3000a.c
index
fbccdea
..
b5fe3bd
100644
(file)
--- a/
libpcsxcore/r3000a.c
+++ b/
libpcsxcore/r3000a.c
@@
-26,6
+26,7
@@
#include "mdec.h"
#include "gte.h"
#include "psxinterpreter.h"
#include "mdec.h"
#include "gte.h"
#include "psxinterpreter.h"
+#include "../include/compiler_features.h"
R3000Acpu *psxCpu = NULL;
#ifdef DRC_DISABLE
R3000Acpu *psxCpu = NULL;
#ifdef DRC_DISABLE
@@
-58,8
+59,10
@@
void psxReset() {
psxRegs.pc = 0xbfc00000; // Start in bootstrap
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();
psxCpu->ApplyConfig();
psxCpu->Reset();
@@
-90,40
+93,32
@@
void psxShutdown() {
}
// cp0 is passed separately for lightrec to be less messy
}
// cp0 is passed separately for lightrec to be less messy
-void psxException(u32 c
ode, u32 bd
, psxCP0Regs *cp0) {
-
psxRegs.code = PSXMu32
(psxRegs.pc);
+void psxException(u32 c
ause, 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
// "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
}
// Set the Cause
- cp0->n.Cause = (
cp0->n.Cause & 0x300) | cod
e;
+ cp0->n.Cause = (
bdt << 30) | (cp0->n.Cause & 0x300) | caus
e;
// Set the EPC & PC
// 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.S
tatus
& 0x400000)
+ if (cp0->n.S
R
& 0x400000)
psxRegs.pc = 0xbfc00180;
else
psxRegs.pc = 0x80000080;
psxRegs.pc = 0xbfc00180;
else
psxRegs.pc = 0x80000080;
- // Set the Status
- cp0->n.Status = (cp0->n.Status & ~0x3f) | ((cp0->n.Status & 0x0f) << 2);
-
- if (Config.HLE) psxBiosException();
+ // Set the SR
+ cp0->n.SR = (cp0->n.SR & ~0x3f) | ((cp0->n.SR & 0x0f) << 2);
}
void psxBranchTest() {
}
void psxBranchTest() {
@@
-200,7
+195,7
@@
void psxBranchTest() {
}
if (psxHu32(0x1070) & psxHu32(0x1074)) {
}
if (psxHu32(0x1070) & psxHu32(0x1074)) {
- if ((psxRegs.CP0.n.S
tatus
& 0x401) == 0x401) {
+ if ((psxRegs.CP0.n.S
R
& 0x401) == 0x401) {
#ifdef PSXCPU_LOG
PSXCPU_LOG("Interrupt: %x %x\n", psxHu32(0x1070), psxHu32(0x1074));
#endif
#ifdef PSXCPU_LOG
PSXCPU_LOG("Interrupt: %x %x\n", psxHu32(0x1070), psxHu32(0x1074));
#endif