X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=7591093f54dd5e70d5d06445ce17f12276e048f8;hb=3280e6168d3645c849778c0dad68719c2f69c667;hp=f170be7e1d63fbb0bd8ddb741fea7401845c03c8;hpb=32631e6a5d44d1e6aa5d53d5777a039b2d3d4300;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index f170be7e..7591093f 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -10,6 +10,7 @@
 #include "emu_if.h"
 #include "pcsxmem.h"
 #include "../psxhle.h"
+#include "../psxinterpreter.h"
 #include "../r3000a.h"
 #include "../cdrom.h"
 #include "../psxdma.h"
@@ -66,22 +67,18 @@ static irq_func * const irq_funcs[] = {
 /* local dupe of psxBranchTest, using event_cycles */
 static void irq_test(void)
 {
-	u32 irqs = psxRegs.interrupt;
 	u32 cycle = psxRegs.cycle;
 	u32 irq, irq_bits;
 
-	// irq_funcs() may queue more irqs
-	psxRegs.interrupt = 0;
-
-	for (irq = 0, irq_bits = irqs; irq_bits != 0; irq++, irq_bits >>= 1) {
+	for (irq = 0, irq_bits = psxRegs.interrupt; irq_bits != 0; irq++, irq_bits >>= 1) {
 		if (!(irq_bits & 1))
 			continue;
 		if ((s32)(cycle - event_cycles[irq]) >= 0) {
-			irqs &= ~(1 << irq);
+			// note: irq_funcs() also modify psxRegs.interrupt
+			psxRegs.interrupt &= ~(1u << irq);
 			irq_funcs[irq]();
 		}
 	}
-	psxRegs.interrupt |= irqs;
 
 	if ((psxHu32(0x1070) & psxHu32(0x1074)) && (Status & 0x401) == 0x401) {
 		psxException(0x400, 0);
@@ -299,7 +296,6 @@ static int ari64_init()
 	static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
 	extern void (*psxCP2[64])();
 	extern void psxNULL();
-	extern unsigned char *out;
 	size_t i;
 
 	new_dynarec_init();
@@ -329,10 +325,6 @@ static int ari64_init()
 	zeromem_ptr = zero_mem;
 	scratch_buf_ptr = scratch_buf;
 
-	SysPrintf("Mapped (RAM/scrp/ROM/LUTs/TC):\n");
-	SysPrintf("%p/%p/%p/%p/%p\n",
-		psxM, psxH, psxR, mem_rtab, out);
-
 	return 0;
 }
 
@@ -340,7 +332,7 @@ static void ari64_reset()
 {
 	printf("ari64_reset\n");
 	new_dyna_pcsx_mem_reset();
-	invalidate_all_pages();
+	new_dynarec_invalidate_all_pages();
 	new_dyna_restore();
 	pending_exception = 1;
 }
@@ -370,24 +362,13 @@ static void ari64_execute()
 
 static void ari64_clear(u32 addr, u32 size)
 {
-	u32 start, end, main_ram;
-
 	size *= 4; /* PCSX uses DMA units (words) */
 
 	evprintf("ari64_clear %08x %04x\n", addr, size);
 
-	/* check for RAM mirrors */
-	main_ram = (addr & 0xffe00000) == 0x80000000;
-
-	start = addr >> 12;
-	end = (addr + size) >> 12;
-
-	for (; start <= end; start++)
-		if (!main_ram || !invalid_code[start])
-			invalidate_block(start);
+	new_dynarec_invalidate_range(addr, addr + size);
 }
 
-#ifdef ICACHE_EMULATION
 static void ari64_notify(int note, void *data) {
 	/*
 	Should be fixed when ARM dynarec has proper icache emulation.
@@ -403,10 +384,11 @@ static void ari64_notify(int note, void *data) {
 	}
 	*/
 }
-#endif
 
 static void ari64_apply_config()
 {
+	intApplyConfig();
+
 	if (Config.DisableStalls)
 		new_dynarec_hacks |= NDHACK_NO_STALLS;
 	else
@@ -431,9 +413,7 @@ R3000Acpu psxRec = {
 	ari64_execute,
 	ari64_execute_until,
 	ari64_clear,
-#ifdef ICACHE_EMULATION
 	ari64_notify,
-#endif
 	ari64_apply_config,
 	ari64_shutdown
 };
@@ -453,15 +433,14 @@ int new_dynarec_hacks;
 void *psxH_ptr;
 void *zeromem_ptr;
 u8 zero_mem[0x1000];
-unsigned char *out;
 void *mem_rtab;
 void *scratch_buf_ptr;
 void new_dynarec_init() {}
 void new_dyna_start(void *context) {}
 void new_dynarec_cleanup() {}
 void new_dynarec_clear_full() {}
-void invalidate_all_pages() {}
-void invalidate_block(unsigned int block) {}
+void new_dynarec_invalidate_all_pages() {}
+void new_dynarec_invalidate_range(unsigned int start, unsigned int end) { return 0; }
 void new_dyna_pcsx_mem_init(void) {}
 void new_dyna_pcsx_mem_reset(void) {}
 void new_dyna_pcsx_mem_load_state(void) {}
@@ -474,9 +453,11 @@ void new_dynarec_load_blocks(const void *save, int size) {}
 
 #include <stddef.h>
 static FILE *f;
-extern u32 last_io_addr;
+u32 irq_test_cycle;
+u32 handler_cycle;
+u32 last_io_addr;
 
-static void dump_mem(const char *fname, void *mem, size_t size)
+void dump_mem(const char *fname, void *mem, size_t size)
 {
 	FILE *f1 = fopen(fname, "wb");
 	if (f1 == NULL)
@@ -504,8 +485,6 @@ static u32 memcheck_read(u32 a)
 void do_insn_trace(void)
 {
 	static psxRegisters oldregs;
-	static u32 old_io_addr = (u32)-1;
-	static u32 old_io_data = 0xbad0c0de;
 	static u32 event_cycles_o[PSXINT_COUNT];
 	u32 *allregs_p = (void *)&psxRegs;
 	u32 *allregs_o = (void *)&oldregs;
@@ -529,27 +508,27 @@ void do_insn_trace(void)
 	// log event changes
 	for (i = 0; i < PSXINT_COUNT; i++) {
 		if (event_cycles[i] != event_cycles_o[i]) {
-			byte = 0xfc;
+			byte = 0xf8;
 			fwrite(&byte, 1, 1, f);
 			fwrite(&i, 1, 1, f);
 			fwrite(&event_cycles[i], 1, 4, f);
 			event_cycles_o[i] = event_cycles[i];
 		}
 	}
-	// log last io
-	if (old_io_addr != last_io_addr) {
-		byte = 0xfd;
-		fwrite(&byte, 1, 1, f);
-		fwrite(&last_io_addr, 1, 4, f);
-		old_io_addr = last_io_addr;
+	#define SAVE_IF_CHANGED(code_, name_) { \
+		static u32 old_##name_ = 0xbad0c0de; \
+		if (old_##name_ != name_) { \
+			byte = code_; \
+			fwrite(&byte, 1, 1, f); \
+			fwrite(&name_, 1, 4, f); \
+			old_##name_ = name_; \
+		} \
 	}
+	SAVE_IF_CHANGED(0xfb, irq_test_cycle);
+	SAVE_IF_CHANGED(0xfc, handler_cycle);
+	SAVE_IF_CHANGED(0xfd, last_io_addr);
 	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;
-	}
+	SAVE_IF_CHANGED(0xfe, io_data);
 	byte = 0xff;
 	fwrite(&byte, 1, 1, f);
 
@@ -611,12 +590,15 @@ void breakme() {}
 
 void do_insn_cmp(void)
 {
+	extern int last_count;
 	static psxRegisters rregs;
 	static u32 mem_addr, mem_val;
+	static u32 irq_test_cycle_intr;
+	static u32 handler_cycle_intr;
 	u32 *allregs_p = (void *)&psxRegs;
 	u32 *allregs_e = (void *)&rregs;
 	static u32 ppc, failcount;
-	int i, ret, bad = 0, which_event = -1;
+	int i, ret, bad = 0, fatal = 0, which_event = -1;
 	u32 ev_cycles = 0;
 	u8 code;
 
@@ -631,11 +613,17 @@ void do_insn_cmp(void)
 		if (code == 0xff)
 			break;
 		switch (code) {
-		case 0xfc:
+		case 0xf8:
 			which_event = 0;
 			fread(&which_event, 1, 1, f);
 			fread(&ev_cycles, 1, 4, f);
 			continue;
+		case 0xfb:
+			fread(&irq_test_cycle_intr, 1, 4, f);
+			continue;
+		case 0xfc:
+			fread(&handler_cycle_intr, 1, 4, f);
+			continue;
 		case 0xfd:
 			fread(&mem_addr, 1, 4, f);
 			continue;
@@ -643,23 +631,43 @@ void do_insn_cmp(void)
 			fread(&mem_val, 1, 4, f);
 			continue;
 		}
+		assert(code < offsetof(psxRegisters, intCycle) / 4);
 		fread(&allregs_e[code], 1, 4, f);
 	}
 
 	if (ret <= 0) {
 		printf("EOF?\n");
-		goto end;
+		exit(1);
 	}
 
 	psxRegs.code = rregs.code; // don't care
-	psxRegs.cycle = rregs.cycle;
+	psxRegs.cycle += last_count;
+	//psxRegs.cycle = rregs.cycle; // needs reload in _cmp
 	psxRegs.CP0.r[9] = rregs.CP0.r[9]; // Count
 
 	//if (psxRegs.cycle == 166172) breakme();
 
-	if (memcmp(&psxRegs, &rregs, offsetof(psxRegisters, intCycle)) == 0 &&
-			mem_val == memcheck_read(mem_addr)
-	   ) {
+	if (which_event >= 0 && event_cycles[which_event] != ev_cycles) {
+		printf("bad ev_cycles #%d: %08x %08x\n", which_event, event_cycles[which_event], ev_cycles);
+		fatal = 1;
+	}
+
+	if (irq_test_cycle > irq_test_cycle_intr) {
+		printf("bad irq_test_cycle: %u %u\n", irq_test_cycle, irq_test_cycle_intr);
+		fatal = 1;
+	}
+
+	if (handler_cycle != handler_cycle_intr) {
+		printf("bad handler_cycle: %u %u\n", handler_cycle, handler_cycle_intr);
+		fatal = 1;
+	}
+
+	if (mem_val != memcheck_read(mem_addr)) {
+		printf("bad mem @%08x: %08x %08x\n", mem_addr, memcheck_read(mem_addr), mem_val);
+		fatal = 1;
+	}
+
+	if (!fatal && !memcmp(&psxRegs, &rregs, offsetof(psxRegisters, intCycle))) {
 		failcount = 0;
 		goto ok;
 	}
@@ -669,21 +677,11 @@ void do_insn_cmp(void)
 			miss_log_add(i, allregs_p[i], allregs_e[i], psxRegs.pc, psxRegs.cycle);
 			bad++;
 			if (i > 32+2)
-				goto end;
+				fatal = 1;
 		}
 	}
 
-	if (mem_val != memcheck_read(mem_addr)) {
-		printf("bad mem @%08x: %08x %08x\n", mem_addr, memcheck_read(mem_addr), mem_val);
-		goto end;
-	}
-
-	if (which_event >= 0 && event_cycles[which_event] != ev_cycles) {
-		printf("bad ev_cycles #%d: %08x %08x\n", which_event, event_cycles[which_event], ev_cycles);
-		goto end;
-	}
-
-	if (psxRegs.pc == rregs.pc && bad < 6 && failcount < 32) {
+	if (!fatal && psxRegs.pc == rregs.pc && bad < 6 && failcount < 32) {
 		static int last_mcycle;
 		if (last_mcycle != psxRegs.cycle >> 20) {
 			printf("%u\n", psxRegs.cycle);
@@ -693,7 +691,6 @@ void do_insn_cmp(void)
 		goto ok;
 	}
 
-end:
 	for (i = 0; i < miss_log_len; i++, miss_log_i = (miss_log_i + 1) & miss_log_mask)
 		printf("bad %5s: %08x %08x, pc=%08x, cycle %u\n",
 			regnames[miss_log[miss_log_i].reg], miss_log[miss_log_i].val,
@@ -702,12 +699,12 @@ end:
 	for (i = 0; i < 8; i++)
 		printf("r%d=%08x r%2d=%08x r%2d=%08x r%2d=%08x\n", i, allregs_p[i],
 			i+8, allregs_p[i+8], i+16, allregs_p[i+16], i+24, allregs_p[i+24]);
-	printf("PC: %08x/%08x, cycle %u\n", psxRegs.pc, ppc, psxRegs.cycle);
-	dump_mem("/mnt/ntz/dev/pnd/tmp/psxram.dump", psxM, 0x200000);
-	dump_mem("/mnt/ntz/dev/pnd/tmp/psxregs.dump", psxH, 0x10000);
+	printf("PC: %08x/%08x, cycle %u, next %u\n", psxRegs.pc, ppc, psxRegs.cycle, next_interupt);
+	//dump_mem("/tmp/psxram.dump", psxM, 0x200000);
+	//dump_mem("/mnt/ntz/dev/pnd/tmp/psxregs.dump", psxH, 0x10000);
 	exit(1);
 ok:
-	psxRegs.cycle = rregs.cycle + 2; // sync timing
+	//psxRegs.cycle = rregs.cycle + 2; // sync timing
 	ppc = psxRegs.pc;
 }