X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=d2ff36a02d3664effb3211e035dd5b8b227716a7;hp=4f0ca758cedbd793b39b6ad5a98be210fa69aad2;hb=fca1aef29ed173264919b7a0b35f92dbe0d4e521;hpb=528ad661dd07067cbcd6c1beebad63fc36795759

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 4f0ca758..d2ff36a0 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -60,6 +60,7 @@ static irq_func * const irq_funcs[] = {
 	[PSXINT_MDECOUTDMA] = mdec1Interrupt,
 	[PSXINT_SPUDMA]	= spuInterrupt,
 	[PSXINT_MDECINDMA] = mdec0Interrupt,
+	[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
 };
 
 /* local dupe of psxBranchTest, using event_cycles */
@@ -108,19 +109,20 @@ void gen_interupt()
 		next_interupt, next_interupt - psxRegs.cycle);
 }
 
-void MTC0_()
-{
-	extern void psxMTC0();
+// from interpreter
+extern void MTC0(int reg, u32 val);
 
-	evprintf("ari64 MTC0 %08x %08x %u\n", psxRegs.code, psxRegs.pc, psxRegs.cycle);
-	psxMTC0();
-	gen_interupt(); /* FIXME: checking pending irqs should be enough */
+void pcsx_mtc0(u32 reg)
+{
+	evprintf("MTC0 %d #%x @%08x %u\n", reg, readmem_word, psxRegs.pc, psxRegs.cycle);
+	MTC0(reg, readmem_word);
+	gen_interupt();
 }
 
-void check_interupt()
+void pcsx_mtc0_ds(u32 reg)
 {
-	/* FIXME (also asm) */
-	printf("ari64_check_interupt\n");
+	evprintf("MTC0 %d #%x @%08x %u\n", reg, readmem_word, psxRegs.pc, psxRegs.cycle);
+	MTC0(reg, readmem_word);
 }
 
 void new_dyna_save(void)
@@ -223,7 +225,7 @@ extern void intExecuteBlockT();
 R3000Acpu psxRec = {
 	ari64_init,
 	ari64_reset,
-#if 1
+#if defined(__arm__)
 	ari64_execute,
 	ari64_execute,
 #else
@@ -271,6 +273,21 @@ static void dump_mem(const char *fname, void *mem, size_t size)
 	fclose(f1);
 }
 
+static u32 memcheck_read(u32 a)
+{
+	if ((a >> 16) == 0x1f80)
+		// scratchpad/IO
+		return *(u32 *)(psxH + (a & 0xfffc));
+
+	if ((a >> 16) == 0x1f00)
+		// parallel
+		return *(u32 *)(psxP + (a & 0xfffc));
+
+//	if ((a & ~0xe0600000) < 0x200000)
+	// RAM
+	return *(u32 *)(psxM + (a & 0x1ffffc));
+}
+
 void do_insn_trace(void)
 {
 	static psxRegisters oldregs;
@@ -278,7 +295,7 @@ void do_insn_trace(void)
 	static u32 old_io_data = 0xbad0c0de;
 	u32 *allregs_p = (void *)&psxRegs;
 	u32 *allregs_o = (void *)&oldregs;
-	u32 *io_data;
+	u32 io_data;
 	int i;
 	u8 byte;
 
@@ -300,12 +317,12 @@ void do_insn_trace(void)
 		fwrite(&last_io_addr, 1, 4, f);
 		old_io_addr = last_io_addr;
 	}
-	io_data = (void *)(psxM + (last_io_addr&0x1ffffc));
-	if (old_io_data != *io_data) {
+	io_data = memcheck_read(last_io_addr);
+	if (old_io_data != io_data) {
 		byte = 0xfe;
 		fwrite(&byte, 1, 1, f);
-		fwrite(io_data, 1, 4, f);
-		old_io_data = *io_data;
+		fwrite(&io_data, 1, 4, f);
+		old_io_data = io_data;
 	}
 	byte = 0xff;
 	fwrite(&byte, 1, 1, f);
@@ -405,16 +422,13 @@ void do_insn_cmp(void)
 	}
 
 	psxRegs.code = rregs.code; // don't care
-psxRegs.cycle = rregs.cycle;
-psxRegs.CP0.r[9] = rregs.CP0.r[9]; // Count
+	psxRegs.cycle = rregs.cycle;
+	psxRegs.CP0.r[9] = rregs.CP0.r[9]; // Count
 
 //if (psxRegs.cycle == 166172) breakme();
-//if (psxRegs.cycle > 11296376) printf("pc=%08x %u  %08x\n", psxRegs.pc, psxRegs.cycle, psxRegs.interrupt);
-
-	mem_addr &= 0x1ffffc;
 
 	if (memcmp(&psxRegs, &rregs, offsetof(psxRegisters, intCycle)) == 0 &&
-			mem_val == *(u32 *)(psxM + mem_addr)
+			mem_val == memcheck_read(mem_addr)
 	   ) {
 		failcount = 0;
 		goto ok;
@@ -427,8 +441,8 @@ psxRegs.CP0.r[9] = rregs.CP0.r[9]; // Count
 		}
 	}
 
-	if (mem_val != *(u32 *)(psxM + mem_addr)) {
-		printf("bad mem @%08x: %08x %08x\n", mem_addr, *(u32 *)(psxM + mem_addr), mem_val);
+	if (mem_val != memcheck_read(mem_addr)) {
+		printf("bad mem @%08x: %08x %08x\n", mem_addr, memcheck_read(mem_addr), mem_val);
 		goto end;
 	}