X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxbios.c;h=ee307e3ce7a94d1483aa4557019a50e9b500a149;hp=98e467a3ff7374a3772a9e9b64196a4974de2533;hb=cf1af0ed3ca53d0d7092e87f1d090eb3b9b5b128;hpb=a15f3544923a9d2ca3baa2dd9ced9f040ce197e8

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 98e467a3..ee307e3c 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -307,6 +307,8 @@ static inline void DeliverEvent(u32 ev, u32 spec) {
 	} else Event[ev][spec].status = EvStALREADY;
 }
 
+static unsigned interrupt_r26=0x8004E8B0;
+
 static inline void SaveRegs() {
 	memcpy(regs, psxRegs.GPR.r, 32*4);
 	regs[32] = psxRegs.GPR.n.lo;
@@ -1968,6 +1970,7 @@ void psxBios_ReturnFromException() { // 17
 	LoadRegs();
 
 	pc0 = psxRegs.CP0.n.EPC;
+	k0 = interrupt_r26;
 	if (psxRegs.CP0.n.Cause & 0x80000000) pc0 += 4;
 
 	psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status & 0xfffffff0) |
@@ -2595,7 +2598,7 @@ void psxBios__card_status() { // 5c
 	PSXBIOS_LOG("psxBios_%s: %x\n", biosB0n[0x5c], a0);
 #endif
 
-	v0 = 1;
+	v0 = card_active_chan;
 	pc0 = ra;
 }
 
@@ -3190,6 +3193,7 @@ void psxBiosException() {
 
 	switch (psxRegs.CP0.n.Cause & 0x3c) {
 		case 0x00: // Interrupt
+			interrupt_r26=psxRegs.CP0.n.EPC;
 #ifdef PSXCPU_LOG
 //			PSXCPU_LOG("interrupt\n");
 #endif
@@ -3303,4 +3307,5 @@ void psxBiosFreeze(int Mode) {
 	bfreezes(FDesc);
 	bfreezel(&card_active_chan);
 	bfreezel(&pad_stopped);
+	bfreezel(&heap_size);
 }