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
psxinterpreter: tons of new exceptions
[pcsx_rearmed.git]
/
libpcsxcore
/
r3000a.c
diff --git
a/libpcsxcore/r3000a.c
b/libpcsxcore/r3000a.c
index
8b7cfbf
..
5374f86
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] = 0x10
9
00000; // COP0 enabled | BEV = 1 | TS = 1
+ psxRegs.CP0.r[12] = 0x10
6
00000; // COP0 enabled | BEV = 1 | TS = 1
psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
+ if (Config.HLE)
+ psxRegs.CP0.n.Status |= 1u << 30; // COP2 enabled
psxCpu->ApplyConfig();
psxCpu->Reset();
psxCpu->ApplyConfig();
psxCpu->Reset();
@@
-67,8
+70,13
@@
void psxReset() {
psxHwReset();
psxBiosInit();
psxHwReset();
psxBiosInit();
- if (!Config.HLE)
+ BiosLikeGPUSetup(); // a bit of a hack but whatever
+
+ if (!Config.HLE) {
psxExecuteBios();
psxExecuteBios();
+ if (psxRegs.pc == 0x80030000 && !Config.SlowBoot)
+ BiosBootBypass();
+ }
#ifdef EMU_LOG
EMU_LOG("*BIOS END*\n");
#ifdef EMU_LOG
EMU_LOG("*BIOS END*\n");
@@
-85,20
+93,21
@@
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
od
e, u32 bd, psxCP0Regs *cp0) {
-
psxRegs.code = PSXMu32
(psxRegs.pc);
+void psxException(u32 c
aus
e, u32 bd, psxCP0Regs *cp0) {
+
u32 opcode = intFakeFetch
(psxRegs.pc);
- if (
!Config.HLE && ((((psxRegs.code) >> 24) & 0xfe) == 0x4a
)) {
+ if (
unlikely(!Config.HLE && ((((opcode) >> 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
psxCP2Regs *cp2 = (void *)(cp0 + 1);
// "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);
+ psxRegs.code = opcode;
+ psxCP2[opcode & 0x3f](cp2);
}
// Set the Cause
}
// Set the Cause
- cp0->n.Cause = (cp0->n.Cause & 0x300) | c
od
e;
+ cp0->n.Cause = (cp0->n.Cause & 0x300) | c
aus
e;
// Set the EPC & PC
if (bd) {
// Set the EPC & PC
if (bd) {
@@
-237,7
+246,13
@@
void psxJumpTest() {
}
void psxExecuteBios() {
}
void psxExecuteBios() {
- while (psxRegs.pc != 0x80030000)
- psxCpu->ExecuteBlock();
+ int i;
+ 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);
}
}