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=3df83e434ef4b4bfc61312e5981452bbc44bf47c;hb=f76eeef94001323d5019a134c54847ece2493ae9;hpb=ae602c19f527fbc1f44cdb744cf824d04b8eceb1

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 3df83e43..bdf0c8f5 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -14,45 +14,61 @@
 #define evprintf(...)
 
 char invalid_code[0x100000];
-u32 event_cycles[6];
+u32 event_cycles[7];
 
-void MTC0_()
+static void schedule_timeslice(void)
 {
-	extern void psxMTC0();
+	u32 i, c = psxRegs.cycle;
+	s32 min, dif;
 
-	memprintf("ari64 MTC0 %08x\n", psxRegs.code);
-	psxMTC0();
-	pending_exception = 1; /* FIXME? */
+	min = psxNextsCounter + psxNextCounter - c;
+	for (i = 0; i < ARRAY_SIZE(event_cycles); i++) {
+		dif = event_cycles[i] - c;
+		//evprintf("  ev %d\n", dif);
+		if (0 < dif && dif < min)
+			min = dif;
+	}
+	next_interupt = c + min;
+
+#if 0
+	static u32 cnt, last_cycle;
+	static u64 sum;
+	if (last_cycle) {
+		cnt++;
+		sum += psxRegs.cycle - last_cycle;
+		if ((cnt & 0xff) == 0)
+			printf("%u\n", (u32)(sum / cnt));
+	}
+	last_cycle = psxRegs.cycle;
+#endif
 }
 
 void gen_interupt()
 {
-	u32 c, min;
-	int i;
-
-	evprintf("ari64_gen_interupt\n");
-	evprintf("  +ge %08x, %d->%d\n", psxRegs.pc, psxRegs.cycle, next_interupt);
+	evprintf("  +ge %08x, %u->%u\n", psxRegs.pc, psxRegs.cycle, next_interupt);
 #ifdef DRC_DBG
 	psxRegs.cycle += 2;
 #endif
 
 	psxBranchTest();
 
-	min = psxNextsCounter + psxNextCounter;
-	for (i = 0; i < ARRAY_SIZE(event_cycles); i++) {
-		c = event_cycles[i];
-		evprintf("  ev %d\n", c - psxRegs.cycle);
-		if (psxRegs.cycle < c && c < min)
-			min = c;
-	}
-	next_interupt = min;
+	schedule_timeslice();
 
-	//next_interupt = psxNextsCounter + psxNextCounter;
-	evprintf("  -ge %08x, %d->%d\n", psxRegs.pc, psxRegs.cycle, next_interupt);
+	evprintf("  -ge %08x, %u->%u (%d)\n", psxRegs.pc, psxRegs.cycle,
+		next_interupt, next_interupt - psxRegs.cycle);
 
 	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");
@@ -65,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);
 }
 
@@ -143,22 +159,42 @@ static int ari64_init()
 
 static void ari64_reset()
 {
-	/* hmh */
 	printf("ari64_reset\n");
+	invalidate_all_pages();
+	pending_exception = 1;
 }
 
 static void ari64_execute()
 {
-	next_interupt = psxNextsCounter + psxNextCounter;
+	schedule_timeslice();
+
+	evprintf("ari64_execute %08x, %u->%u (%d)\n", psxRegs.pc,
+		psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 
-	evprintf("psxNextsCounter %d, psxNextCounter %d\n", psxNextsCounter, psxNextCounter);
-	evprintf("ari64_execute %08x, %d->%d\n", psxRegs.pc, psxRegs.cycle, next_interupt);
 	new_dyna_start();
-	evprintf("ari64_execute end %08x, %d->%d\n", psxRegs.pc, psxRegs.cycle, next_interupt);
+
+	evprintf("ari64_execute end %08x, %u->%u (%d)\n", psxRegs.pc,
+		psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 }
 
-static void ari64_clear(u32 Addr, u32 Size)
+static void ari64_clear(u32 addr, u32 size)
 {
+	u32 start, end;
+
+	evprintf("ari64_clear %08x %04x\n", addr, size);
+
+	/* check for RAM mirrors */
+	if ((addr & ~0xe0000000) < 0x200000) {
+		addr &= ~0xe0000000;
+		addr |=  0x80000000;
+	}
+
+	start = addr >> 12;
+	end = (addr + size) >> 12;
+
+	for (; start <= end; start++)
+		if (!invalid_code[start])
+			invalidate_block(start);
 }
 
 static void ari64_shutdown()
@@ -199,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