From: notaz <notasas@gmail.com>
Date: Sun, 23 Oct 2011 14:53:09 +0000 (+0300)
Subject: gte: change gte irq workaround
X-Git-Tag: r11~32
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62656449abd4cc364e2a87608efb12a97ce26a3d;p=pcsx_rearmed.git

gte: change gte irq workaround

This should be closer to what happens on the real thing.
Special thanks to Ryphecha for the idea.
---

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 1e8d0b0e..cccfa602 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -79,13 +79,13 @@ void psxShutdown() {
 }
 
 void psxException(u32 code, u32 bd) {
-	if (!Config.HLE && (((PSXMu32(psxRegs.pc) >> 24) & 0xfe) == 0x4a)) {
+	if (!Config.HLE && ((((psxRegs.code = PSXMu32(psxRegs.pc)) >> 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 step over it with the interpreter
-		extern void execI();
-		execI();
+		// so we execute it here
+		extern void (*psxCP2[64])(void *cp2regs);
+		psxCP2[psxRegs.code & 0x3f](&psxRegs.CP2D);
 	}
 
 	// Set the Cause