[pcsx_rearmed.git] / libpcsxcore / new_dynarec / patches / trace_intr

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index cefadd21..63a5c1b1 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -5,6 +5,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#undef NDRC_THREAD
 #include <stdio.h>
 
 #include "emu_if.h"
@@ -631,13 +632,18 @@ static void ari64_shutdown()
 	ari64_thread_shutdown();
 	new_dynarec_cleanup();
 	new_dyna_pcsx_mem_shutdown();
+	(void)ari64_execute;
+	(void)ari64_execute_block;
 }
 
+extern void intExecuteT(psxRegisters *regs);
+extern void intExecuteBlockT(psxRegisters *regs, enum blockExecCaller caller);
+
 R3000Acpu psxRec = {
 	ari64_init,
 	ari64_reset,
-	ari64_execute,
-	ari64_execute_block,
+	intExecuteT,
+	intExecuteBlockT,
 	ari64_clear,
 	ari64_notify,
 	ari64_apply_config,
@@ -699,7 +705,7 @@ static u32 memcheck_read(u32 a)
 	return *(u32 *)(psxM + (a & 0x1ffffc));
 }
 
-#if 0
+#if 1
 void do_insn_trace(void)
 {
 	static psxRegisters oldregs;
diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index 98e2c6be..edba031e 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -238,6 +238,8 @@ static void write_biu(u32 value)
 		return;
 	}
 
+extern u32 handler_cycle;
+handler_cycle = psxRegs.cycle;
 	memprintf("write_biu %08x @%08x %u\n", value, psxRegs.pc, psxRegs.cycle);
 	psxRegs.biuReg = value;
 }
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 064c06b6..07e2afb5 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -455,9 +455,12 @@ void psxRcntUpdate()
 
 /******************************************************************************/
 
+extern u32 handler_cycle;
+
 void psxRcntWcount( u32 index, u32 value )
 {
     verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
+handler_cycle = psxRegs.cycle;
 
     _psxRcntWcount( index, value );
     psxRcntSet();
@@ -466,6 +469,7 @@ void psxRcntWcount( u32 index, u32 value )
 void psxRcntWmode( u32 index, u32 value )
 {
     verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
+handler_cycle = psxRegs.cycle;
 
     _psxRcntWmode( index, value );
     _psxRcntWcount( index, 0 );
@@ -477,6 +481,7 @@ void psxRcntWmode( u32 index, u32 value )
 void psxRcntWtarget( u32 index, u32 value )
 {
     verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value );
+handler_cycle = psxRegs.cycle;
 
     rcnts[index].target = value;
 
@@ -490,6 +495,7 @@ u32 psxRcntRcount0()
 {
     u32 index = 0;
     u32 count;
+handler_cycle = psxRegs.cycle;
 
     if ((rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset) ||
         (rcnts[0].mode & 7) == (RcSyncModeEnable | Rc01UnblankReset2))
diff --git a/libpcsxcore/psxevents.c b/libpcsxcore/psxevents.c
index 1e2d01f6..0ee15974 100644
--- a/libpcsxcore/psxevents.c
+++ b/libpcsxcore/psxevents.c
@@ -77,11 +77,13 @@ void irq_test(psxCP0Regs *cp0)
 		}
 	}
 
-	cp0->n.Cause &= ~0x400;
+	u32 c2 = cp0->n.Cause & ~0x400;
 	if (psxHu32(0x1070) & psxHu32(0x1074))
-		cp0->n.Cause |= 0x400;
-	if (((cp0->n.Cause | 1) & cp0->n.SR & 0x401) == 0x401)
+		c2 |= 0x400;
+	if (((c2 | 1) & cp0->n.SR & 0x401) == 0x401) {
+		cp0->n.Cause = c2;
 		psxException(0, 0, cp0);
+	}
 }
 
 void gen_interupt(psxCP0Regs *cp0)
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
index c487b02d..171c447f 100644
--- a/libpcsxcore/psxhw.c
+++ b/libpcsxcore/psxhw.c
@@ -323,6 +323,7 @@ void psxHwWrite8(u32 add, u32 value) {
 			log_unhandled("unhandled w8  %08x %08x @%08x\n",
 				add, value, psxRegs.pc);
 	}
+	if (add < 0x1f802000)
 	psxHu8(add) = value;
 }
 
@@ -396,6 +397,7 @@ void psxHwWrite16(u32 add, u32 value) {
 			log_unhandled("unhandled w16 %08x %08x @%08x\n",
 				add, value, psxRegs.pc);
 	}
+	if (add < 0x1f802000)
 	psxHu16ref(add) = SWAPu16(value);
 }
 
@@ -452,6 +454,7 @@ void psxHwWrite32(u32 add, u32 value) {
 			return;
 		}
 	}
+	if (add < 0x1f802000)
 	psxHu32ref(add) = SWAPu32(value);
 }
 
diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index 68d79321..2e3d14ab 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -243,7 +243,7 @@ static inline void addCycle(psxRegisters *regs)
 {
 	assert(regs->subCycleStep >= 0x10000);
 	regs->subCycle += regs->subCycleStep;
-	regs->cycle += regs->subCycle >> 16;
+	regs->cycle += 2; //regs->subCycle >> 16;
 	regs->subCycle &= 0xffff;
 }
 
@@ -440,7 +440,9 @@ static void doBranch(psxRegisters *regs, u32 tar, enum R3000Abdt taken) {
 		regs->CP0.n.Target = pc_final;
 	regs->branching = 0;
 
+	psxRegs.cycle += 2;
 	psxBranchTest();
+	psxRegs.cycle -= 2;
 }
 
 static void doBranchReg(psxRegisters *regs, u32 tar) {
@@ -973,7 +975,7 @@ void MTC0(psxRegisters *regs_, int reg, u32 val) {
 	}
 }
 
-OP(psxMTC0) { MTC0(regs_, _Rd_, _u32(_rRt_)); }
+OP(psxMTC0) { MTC0(regs_, _Rd_, _u32(_rRt_)); psxBranchTest(); }
 
 // no exception
 static inline void psxNULLne(psxRegisters *regs) {
@@ -1182,18 +1184,20 @@ static void intReset() {
 static inline void execI_(u8 **memRLUT, psxRegisters *regs) {
 	u32 pc = regs->pc;
 
-	addCycle(regs);
+	//addCycle(regs);
 	dloadStep(regs);
 
 	regs->pc += 4;
 	regs->code = fetch(regs, memRLUT, pc);
 	psxBSC[regs->code >> 26](regs, regs->code);
+	psxRegs.cycle += 2;
+	fetchNoCache(regs, memRLUT, regs->pc); // bus err check
 }
 
 static inline void execIbp(u8 **memRLUT, psxRegisters *regs) {
 	u32 pc = regs->pc;
 
-	addCycle(regs);
+	//addCycle(regs);
 	dloadStep(regs);
 
 	if (execBreakCheck(regs, pc))
@@ -1202,6 +1206,8 @@ static inline void execIbp(u8 **memRLUT, psxRegisters *regs) {
 	regs->pc += 4;
 	regs->code = fetch(regs, memRLUT, pc);
 	psxBSC[regs->code >> 26](regs, regs->code);
+	psxRegs.cycle += 2;
+	fetchNoCache(regs, memRLUT, regs->pc); // bus err check
 }
 
 static void intExecute(psxRegisters *regs) {
@@ -1234,6 +1240,27 @@ static void intExecuteBlockBp(psxRegisters *regs, enum blockExecCaller caller) {
 		execIbp(memRLUT, regs);
 }
 
+extern void do_insn_trace(void);
+
+void intExecuteT(psxRegisters *regs) {
+	u8 **memRLUT = psxMemRLUT;
+
+	while (!regs->stop) {
+		do_insn_trace();
+		execIbp(memRLUT, regs);
+	}
+}
+
+void intExecuteBlockT(psxRegisters *regs, enum blockExecCaller caller) {
+	u8 **memRLUT = psxMemRLUT;
+
+	regs->branchSeen = 0;
+	while (!regs->branchSeen) {
+		do_insn_trace();
+		execIbp(memRLUT, regs);
+	}
+}
+
 static void intClear(u32 Addr, u32 Size) {
 }
 
@@ -1263,7 +1290,7 @@ static void setupCop(u32 sr)
 	else
 		psxBSC[17] = psxCOPd;
 	if (sr & (1u << 30))
-		psxBSC[18] = Config.DisableStalls ? psxCOP2 : psxCOP2_stall;
+		psxBSC[18] = psxCOP2;
 	else
 		psxBSC[18] = psxCOPd;
 	if (sr & (1u << 31))
@@ -1282,7 +1309,7 @@ void intApplyConfig() {
 	assert(psxSPC[26] == psxDIV   || psxSPC[26] == psxDIV_stall);
 	assert(psxSPC[27] == psxDIVU  || psxSPC[27] == psxDIVU_stall);
 
-	if (Config.DisableStalls) {
+	if (1) {
 		psxBSC[18] = psxCOP2;
 		psxBSC[50] = gteLWC2;
 		psxBSC[58] = gteSWC2;
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 13301992..2ccdea74 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -316,10 +316,13 @@ void psxMemOnIsolate(int enable)
 			: R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
 }
 
+extern u32 last_io_addr;
+
 u8 psxMemRead8(u32 mem) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -345,6 +348,7 @@ u16 psxMemRead16(u32 mem) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -370,6 +374,7 @@ u32 psxMemRead32(u32 mem) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -397,6 +402,7 @@ void psxMemWrite8(u32 mem, u32 value) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -424,6 +430,7 @@ void psxMemWrite16(u32 mem, u32 value) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -451,6 +458,7 @@ void psxMemWrite32(u32 mem, u32 value) {
 	char *p;
 	u32 t;
 
+	last_io_addr = mem;
 //	if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
@@ -469,6 +477,8 @@ void psxMemWrite32(u32 mem, u32 value) {
 #endif
 		} else {
 			if (mem == 0xfffe0130) {
+extern u32 handler_cycle;
+handler_cycle = psxRegs.cycle;
 				psxRegs.biuReg = value;
 				return;
 			}
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index cfd1ab09..724167e0 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -141,6 +141,8 @@ void psxException(u32 cause, enum R3000Abdt bdt, psxCP0Regs *cp0) {
 }
 
 void psxBranchTest() {
+ extern u32 irq_test_cycle;
+ irq_test_cycle = psxRegs.cycle;
 	if ((psxRegs.cycle - psxRegs.psxNextsCounter) >= psxRegs.psxNextCounter)
 		psxRcntUpdate();
Commit	Line	Data
a151a8d8	1	diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
254b3eec	2	index cefadd21..63a5c1b1 100644
a151a8d8	3	--- a/libpcsxcore/new_dynarec/emu_if.c
a151a8d8	4	+++ b/libpcsxcore/new_dynarec/emu_if.c
4f674a2f	5	@@ -5,6 +5,7 @@
	6	* See the COPYING file in the top-level directory.
	7	*/
	8
	9	+#undef NDRC_THREAD
	10	#include <stdio.h>
	11
	12	#include "emu_if.h"
254b3eec	13	@@ -631,13 +632,18 @@ static void ari64_shutdown()
4f674a2f	14	ari64_thread_shutdown();
a151a8d8	15	new_dynarec_cleanup();
	16	new_dyna_pcsx_mem_shutdown();
	17	+ (void)ari64_execute;
a5cd72d0	18	+ (void)ari64_execute_block;
a151a8d8	19	}
a151a8d8	20
254b3eec	21	+extern void intExecuteT(psxRegisters *regs);
254b3eec	22	+extern void intExecuteBlockT(psxRegisters *regs, enum blockExecCaller caller);
a151a8d8	23	+
	24	R3000Acpu psxRec = {
	25	ari64_init,
	26	ari64_reset,
	27	- ari64_execute,
a5cd72d0	28	- ari64_execute_block,
a151a8d8	29	+ intExecuteT,
	30	+ intExecuteBlockT,
	31	ari64_clear,
a151a8d8	32	ari64_notify,
37387d8b	33	ari64_apply_config,
254b3eec	34	@@ -699,7 +705,7 @@ static u32 memcheck_read(u32 a)
a151a8d8	35	return (u32 )(psxM + (a & 0x1ffffc));
	36	}
	37
	38	-#if 0
	39	+#if 1
	40	void do_insn_trace(void)
	41	{
	42	static psxRegisters oldregs;
2330734f	43	diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
254b3eec	44	index 98e2c6be..edba031e 100644
2330734f	45	--- a/libpcsxcore/new_dynarec/pcsxmem.c
2330734f	46	+++ b/libpcsxcore/new_dynarec/pcsxmem.c
254b3eec	47	@@ -238,6 +238,8 @@ static void write_biu(u32 value)
2330734f	48	return;
a5cd72d0	49	}
2330734f	50
	51	+extern u32 handler_cycle;
	52	+handler_cycle = psxRegs.cycle;
a5cd72d0	53	memprintf("write_biu %08x @%08x %u\n", value, psxRegs.pc, psxRegs.cycle);
	54	psxRegs.biuReg = value;
	55	}
2330734f	56	diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
254b3eec	57	index 064c06b6..07e2afb5 100644
2330734f	58	--- a/libpcsxcore/psxcounters.c
2330734f	59	+++ b/libpcsxcore/psxcounters.c
254b3eec	60	@@ -455,9 +455,12 @@ void psxRcntUpdate()
2330734f	61
	62	/******************************************************************************/
	63
	64	+extern u32 handler_cycle;
	65	+
	66	void psxRcntWcount( u32 index, u32 value )
	67	{
	68	verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
	69	+handler_cycle = psxRegs.cycle;
	70
	71	_psxRcntWcount( index, value );
	72	psxRcntSet();
254b3eec	73	@@ -466,6 +469,7 @@ void psxRcntWcount( u32 index, u32 value )
2330734f	74	void psxRcntWmode( u32 index, u32 value )
	75	{
	76	verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
	77	+handler_cycle = psxRegs.cycle;
	78
	79	_psxRcntWmode( index, value );
	80	_psxRcntWcount( index, 0 );
254b3eec	81	@@ -477,6 +481,7 @@ void psxRcntWmode( u32 index, u32 value )
2330734f	82	void psxRcntWtarget( u32 index, u32 value )
	83	{
	84	verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value );
	85	+handler_cycle = psxRegs.cycle;
	86
	87	rcnts[index].target = value;
	88
254b3eec	89	@@ -490,6 +495,7 @@ u32 psxRcntRcount0()
2330734f	90	{
4f674a2f	91	u32 index = 0;
2330734f	92	u32 count;
	93	+handler_cycle = psxRegs.cycle;
	94
4f674a2f	95	if ((rcnts[0].mode & 7) == (RcSyncModeEnable \| Rc01UnblankReset) \|\|
	96	(rcnts[0].mode & 7) == (RcSyncModeEnable \| Rc01UnblankReset2))
	97	diff --git a/libpcsxcore/psxevents.c b/libpcsxcore/psxevents.c
254b3eec	98	index 1e2d01f6..0ee15974 100644
4f674a2f	99	--- a/libpcsxcore/psxevents.c
4f674a2f	100	+++ b/libpcsxcore/psxevents.c
254b3eec	101	@@ -77,11 +77,13 @@ void irq_test(psxCP0Regs *cp0)
4f674a2f	102	}
4f674a2f	103	}
2330734f	104
4f674a2f	105	- cp0->n.Cause &= ~0x400;
	106	+ u32 c2 = cp0->n.Cause & ~0x400;
	107	if (psxHu32(0x1070) & psxHu32(0x1074))
	108	- cp0->n.Cause \|= 0x400;
254b3eec	109	- if (((cp0->n.Cause \| 1) & cp0->n.SR & 0x401) == 0x401)
4f674a2f	110	+ c2 \|= 0x400;
	111	+ if (((c2 \| 1) & cp0->n.SR & 0x401) == 0x401) {
	112	+ cp0->n.Cause = c2;
	113	psxException(0, 0, cp0);
254b3eec	114	+ }
	115	}
	116
	117	void gen_interupt(psxCP0Regs *cp0)
a151a8d8	118	diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c
254b3eec	119	index c487b02d..171c447f 100644
a151a8d8	120	--- a/libpcsxcore/psxhw.c
a151a8d8	121	+++ b/libpcsxcore/psxhw.c
254b3eec	122	@@ -323,6 +323,7 @@ void psxHwWrite8(u32 add, u32 value) {
4f674a2f	123	log_unhandled("unhandled w8 %08x %08x @%08x\n",
	124	add, value, psxRegs.pc);
	125	}
	126	+ if (add < 0x1f802000)
	127	psxHu8(add) = value;
	128	}
a151a8d8	129
254b3eec	130	@@ -396,6 +397,7 @@ void psxHwWrite16(u32 add, u32 value) {
4f674a2f	131	log_unhandled("unhandled w16 %08x %08x @%08x\n",
4f674a2f	132	add, value, psxRegs.pc);
a151a8d8	133	}
4f674a2f	134	+ if (add < 0x1f802000)
	135	psxHu16ref(add) = SWAPu16(value);
	136	}
a151a8d8	137
254b3eec	138	@@ -452,6 +454,7 @@ void psxHwWrite32(u32 add, u32 value) {
a151a8d8	139	return;
4f674a2f	140	}
	141	}
	142	+ if (add < 0x1f802000)
	143	psxHu32ref(add) = SWAPu32(value);
	144	}
a151a8d8	145
a151a8d8	146	diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
254b3eec	147	index 68d79321..2e3d14ab 100644
a151a8d8	148	--- a/libpcsxcore/psxinterpreter.c
a151a8d8	149	+++ b/libpcsxcore/psxinterpreter.c
254b3eec	150	@@ -243,7 +243,7 @@ static inline void addCycle(psxRegisters *regs)
a5cd72d0	151	{
	152	assert(regs->subCycleStep >= 0x10000);
	153	regs->subCycle += regs->subCycleStep;
	154	- regs->cycle += regs->subCycle >> 16;
	155	+ regs->cycle += 2; //regs->subCycle >> 16;
	156	regs->subCycle &= 0xffff;
	157	}
a151a8d8	158
254b3eec	159	@@ -440,7 +440,9 @@ static void doBranch(psxRegisters *regs, u32 tar, enum R3000Abdt taken) {
a5cd72d0	160	regs->CP0.n.Target = pc_final;
a5cd72d0	161	regs->branching = 0;
a151a8d8	162
a5cd72d0	163	+ psxRegs.cycle += 2;
2330734f	164	psxBranchTest();
a5cd72d0	165	+ psxRegs.cycle -= 2;
a151a8d8	166	}
a151a8d8	167
a5cd72d0	168	static void doBranchReg(psxRegisters *regs, u32 tar) {
254b3eec	169	@@ -973,7 +975,7 @@ void MTC0(psxRegisters *regs_, int reg, u32 val) {
a5cd72d0	170	}
a151a8d8	171	}
a151a8d8	172
a5cd72d0	173	-OP(psxMTC0) { MTC0(regs_, _Rd_, _u32(_rRt_)); }
	174	+OP(psxMTC0) { MTC0(regs_, _Rd_, _u32(_rRt_)); psxBranchTest(); }
	175
	176	// no exception
	177	static inline void psxNULLne(psxRegisters *regs) {
254b3eec	178	@@ -1182,18 +1184,20 @@ static void intReset() {
a5cd72d0	179	static inline void execI_(u8 *memRLUT, psxRegisters regs) {
	180	u32 pc = regs->pc;
	181
	182	- addCycle(regs);
	183	+ //addCycle(regs);
	184	dloadStep(regs);
	185
	186	regs->pc += 4;
	187	regs->code = fetch(regs, memRLUT, pc);
	188	psxBSC[regs->code >> 26](regs, regs->code);
	189	+ psxRegs.cycle += 2;
de6dbc52	190	+ fetchNoCache(regs, memRLUT, regs->pc); // bus err check
55a695d9	191	}
a151a8d8	192
a5cd72d0	193	static inline void execIbp(u8 *memRLUT, psxRegisters regs) {
	194	u32 pc = regs->pc;
	195
	196	- addCycle(regs);
	197	+ //addCycle(regs);
	198	dloadStep(regs);
	199
	200	if (execBreakCheck(regs, pc))
254b3eec	201	@@ -1202,6 +1206,8 @@ static inline void execIbp(u8 *memRLUT, psxRegisters regs) {
a5cd72d0	202	regs->pc += 4;
	203	regs->code = fetch(regs, memRLUT, pc);
	204	psxBSC[regs->code >> 26](regs, regs->code);
	205	+ psxRegs.cycle += 2;
de6dbc52	206	+ fetchNoCache(regs, memRLUT, regs->pc); // bus err check
a5cd72d0	207	}
55a695d9	208
254b3eec	209	static void intExecute(psxRegisters *regs) {
	210	@@ -1234,6 +1240,27 @@ static void intExecuteBlockBp(psxRegisters *regs, enum blockExecCaller caller) {
	211	execIbp(memRLUT, regs);
a151a8d8	212	}
	213
	214	+extern void do_insn_trace(void);
	215	+
254b3eec	216	+void intExecuteT(psxRegisters *regs) {
a5cd72d0	217	+ u8 **memRLUT = psxMemRLUT;
a5cd72d0	218	+
254b3eec	219	+ while (!regs->stop) {
a151a8d8	220	+ do_insn_trace();
254b3eec	221	+ execIbp(memRLUT, regs);
a151a8d8	222	+ }
	223	+}
	224	+
254b3eec	225	+void intExecuteBlockT(psxRegisters *regs, enum blockExecCaller caller) {
a5cd72d0	226	+ u8 **memRLUT = psxMemRLUT;
a5cd72d0	227	+
254b3eec	228	+ regs->branchSeen = 0;
254b3eec	229	+ while (!regs->branchSeen) {
a151a8d8	230	+ do_insn_trace();
254b3eec	231	+ execIbp(memRLUT, regs);
a151a8d8	232	+ }
	233	+}
	234	+
	235	static void intClear(u32 Addr, u32 Size) {
	236	}
	237
254b3eec	238	@@ -1263,7 +1290,7 @@ static void setupCop(u32 sr)
90f98e7c	239	else
	240	psxBSC[17] = psxCOPd;
	241	if (sr & (1u << 30))
	242	- psxBSC[18] = Config.DisableStalls ? psxCOP2 : psxCOP2_stall;
	243	+ psxBSC[18] = psxCOP2;
	244	else
	245	psxBSC[18] = psxCOPd;
	246	if (sr & (1u << 31))
254b3eec	247	@@ -1282,7 +1309,7 @@ void intApplyConfig() {
2330734f	248	assert(psxSPC[26] == psxDIV \|\| psxSPC[26] == psxDIV_stall);
	249	assert(psxSPC[27] == psxDIVU \|\| psxSPC[27] == psxDIVU_stall);
	250
	251	- if (Config.DisableStalls) {
	252	+ if (1) {
	253	psxBSC[18] = psxCOP2;
	254	psxBSC[50] = gteLWC2;
	255	psxBSC[58] = gteSWC2;
a151a8d8	256	diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
254b3eec	257	index 13301992..2ccdea74 100644
a151a8d8	258	--- a/libpcsxcore/psxmem.c
a151a8d8	259	+++ b/libpcsxcore/psxmem.c
254b3eec	260	@@ -316,10 +316,13 @@ void psxMemOnIsolate(int enable)
a5cd72d0	261	: R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
a151a8d8	262	}
a151a8d8	263
2330734f	264	+extern u32 last_io_addr;
a5cd72d0	265	+
a151a8d8	266	u8 psxMemRead8(u32 mem) {
	267	char *p;
	268	u32 t;
	269
	270	+ last_io_addr = mem;
	271	t = mem >> 16;
	272	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
	273	if ((mem & 0xffff) < 0x400)
254b3eec	274	@@ -345,6 +348,7 @@ u16 psxMemRead16(u32 mem) {
a151a8d8	275	char *p;
	276	u32 t;
	277
	278	+ last_io_addr = mem;
	279	t = mem >> 16;
	280	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
	281	if ((mem & 0xffff) < 0x400)
254b3eec	282	@@ -370,6 +374,7 @@ u32 psxMemRead32(u32 mem) {
a151a8d8	283	char *p;
	284	u32 t;
	285
	286	+ last_io_addr = mem;
	287	t = mem >> 16;
	288	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
	289	if ((mem & 0xffff) < 0x400)
254b3eec	290	@@ -397,6 +402,7 @@ void psxMemWrite8(u32 mem, u32 value) {
a151a8d8	291	char *p;
	292	u32 t;
	293
	294	+ last_io_addr = mem;
	295	t = mem >> 16;
	296	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
	297	if ((mem & 0xffff) < 0x400)
254b3eec	298	@@ -424,6 +430,7 @@ void psxMemWrite16(u32 mem, u32 value) {
a151a8d8	299	char *p;
	300	u32 t;
	301
	302	+ last_io_addr = mem;
	303	t = mem >> 16;
	304	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
	305	if ((mem & 0xffff) < 0x400)
254b3eec	306	@@ -451,6 +458,7 @@ void psxMemWrite32(u32 mem, u32 value) {
a151a8d8	307	char *p;
	308	u32 t;
	309
	310	+ last_io_addr = mem;
	311	// if ((mem&0x1fffff) == 0x71E18 \|\| value == 0x48088800) SysPrintf("t2fix!!\n");
	312	t = mem >> 16;
	313	if (t == 0x1f80 \|\| t == 0x9f80 \|\| t == 0xbf80) {
254b3eec	314	@@ -469,6 +477,8 @@ void psxMemWrite32(u32 mem, u32 value) {
a5cd72d0	315	#endif
	316	} else {
	317	if (mem == 0xfffe0130) {
2330734f	318	+extern u32 handler_cycle;
2330734f	319	+handler_cycle = psxRegs.cycle;
a5cd72d0	320	psxRegs.biuReg = value;
	321	return;
	322	}
2330734f	323	diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
254b3eec	324	index cfd1ab09..724167e0 100644
2330734f	325	--- a/libpcsxcore/r3000a.c
2330734f	326	+++ b/libpcsxcore/r3000a.c
254b3eec	327	@@ -141,6 +141,8 @@ void psxException(u32 cause, enum R3000Abdt bdt, psxCP0Regs *cp0) {
2330734f	328	}
	329
	330	void psxBranchTest() {
	331	+ extern u32 irq_test_cycle;
	332	+ irq_test_cycle = psxRegs.cycle;
92dc6b2f	333	if ((psxRegs.cycle - psxRegs.psxNextsCounter) >= psxRegs.psxNextCounter)
2330734f	334	psxRcntUpdate();
2330734f	335