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=bdf0c8f53691bb4d60c52de130b2ce7764da218b;hp=9b20e5ca95404cdcf40a6827e39bcc5bc876eb26;hb=f76eeef94001323d5019a134c54847ece2493ae9;hpb=4b421010647aba998fe2ebfc7d6f226623d47954

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 9b20e5ca..bdf0c8f5 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -14,16 +14,7 @@
 #define evprintf(...)
 
 char invalid_code[0x100000];
-u32 event_cycles[6];
-
-void MTC0_()
-{
-	extern void psxMTC0();
-
-	memprintf("ari64 MTC0 %08x\n", psxRegs.code);
-	psxMTC0();
-	pending_exception = 1; /* FIXME? */
-}
+u32 event_cycles[7];
 
 static void schedule_timeslice(void)
 {
@@ -54,7 +45,6 @@ static void schedule_timeslice(void)
 
 void gen_interupt()
 {
-	//evprintf("ari64_gen_interupt\n");
 	evprintf("  +ge %08x, %u->%u\n", psxRegs.pc, psxRegs.cycle, next_interupt);
 #ifdef DRC_DBG
 	psxRegs.cycle += 2;
@@ -70,6 +60,15 @@ void gen_interupt()
 	pending_exception = 1; /* FIXME */
 }
 
+void MTC0_()
+{
+	extern void psxMTC0();
+
+	evprintf("ari64 MTC0 %08x %08x %u\n", psxRegs.code, psxRegs.pc, psxRegs.cycle);
+	psxMTC0();
+	gen_interupt(); /* FIXME: checking pending irqs should be enough */
+}
+
 void check_interupt()
 {
 	printf("ari64_check_interupt\n");
@@ -82,37 +81,37 @@ void read_nomem_new()
 
 static void read_mem8()
 {
-	memprintf("ari64_read_mem8  %08x, PC~=%08x\n", address, psxRegs.pc);
+	memprintf("ari64_read_mem8  %08x @%08x %u\n", address, psxRegs.pc, psxRegs.cycle);
 	readmem_word = psxMemRead8(address) & 0xff;
 }
 
 static void read_mem16()
 {
-	memprintf("ari64_read_mem16 %08x, PC~=%08x\n", address, psxRegs.pc);
+	memprintf("ari64_read_mem16 %08x @%08x %u\n", address, psxRegs.pc, psxRegs.cycle);
 	readmem_word = psxMemRead16(address) & 0xffff;
 }
 
 static void read_mem32()
 {
-	memprintf("ari64_read_mem32 %08x, PC~=%08x\n", address, psxRegs.pc);
+	memprintf("ari64_read_mem32 %08x @%08x %u\n", address, psxRegs.pc, psxRegs.cycle);
 	readmem_word = psxMemRead32(address);
 }
 
 static void write_mem8()
 {
-	memprintf("ari64_write_mem8  %08x,       %02x, PC~=%08x\n", address, byte, psxRegs.pc);
+	memprintf("ari64_write_mem8  %08x,       %02x @%08x %u\n", address, byte, psxRegs.pc, psxRegs.cycle);
 	psxMemWrite8(address, byte);
 }
 
 static void write_mem16()
 {
-	memprintf("ari64_write_mem16 %08x,     %04x, PC~=%08x\n", address, hword, psxRegs.pc);
+	memprintf("ari64_write_mem16 %08x,     %04x @%08x %u\n", address, hword, psxRegs.pc, psxRegs.cycle);
 	psxMemWrite16(address, hword);
 }
 
 static void write_mem32()
 {
-	memprintf("ari64_write_mem32 %08x, %08x, PC~=%08x\n", address, word, psxRegs.pc);
+	memprintf("ari64_write_mem32 %08x, %08x @%08x %u\n", address, word, psxRegs.pc, psxRegs.cycle);
 	psxMemWrite32(address, word);
 }
 
@@ -185,9 +184,9 @@ static void ari64_clear(u32 addr, u32 size)
 	evprintf("ari64_clear %08x %04x\n", addr, size);
 
 	/* check for RAM mirrors */
-	if ((start & ~0xe0000000) < 0x200000) {
-		start &= ~0xe0000000;
-		start |=  0x80000000;
+	if ((addr & ~0xe0000000) < 0x200000) {
+		addr &= ~0xe0000000;
+		addr |=  0x80000000;
 	}
 
 	start = addr >> 12;
@@ -236,11 +235,13 @@ void do_insn_cmp() {}
 unsigned int address, readmem_word, word;
 unsigned short hword;
 unsigned char byte;
-int pending_exception;
+int pending_exception, stop;
 unsigned int next_interupt;
 void new_dynarec_init() {}
 void new_dyna_start() {}
 void new_dynarec_cleanup() {}
+void invalidate_all_pages() {}
+void invalidate_block(unsigned int block) {}
 #endif
 
 #ifdef DRC_DBG