X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=f660e7f11395d19aa4d1c9cf490bd41d0b5ed1b3;hb=2d3c4d02ae7877c8b28c3f8e7578dfc0f98bacd6;hp=2c82f58bff432df98119a13bdc52a9658b865d81;hpb=dd114d7d8e8d30bde79eb72d3ae1afc2f06cebb7;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 2c82f58b..f660e7f1 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -184,7 +184,8 @@ void new_dyna_freeze(void *f, int mode)
 		if (bytes != size)
 			return;
 
-		new_dynarec_load_blocks(addrs, size);
+		if (psxCpu != &psxInt)
+			new_dynarec_load_blocks(addrs, size);
 	}
 
 	//printf("drc: %d block info entries %s\n", size/8, mode ? "saved" : "loaded");
@@ -338,7 +339,7 @@ static int ari64_init()
 	scratch_buf_ptr = scratch_buf;
 
 	SysPrintf("Mapped (RAM/scrp/ROM/LUTs/TC):\n");
-	SysPrintf("%08x/%08x/%08x/%08x/%08x\n",
+	SysPrintf("%p/%p/%p/%p/%p\n",
 		psxM, psxH, psxR, mem_rtab, out);
 
 	return 0;
@@ -362,7 +363,7 @@ static void ari64_execute_until()
 	evprintf("ari64_execute %08x, %u->%u (%d)\n", psxRegs.pc,
 		psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 
-	new_dyna_start();
+	new_dyna_start(dynarec_local);
 
 	evprintf("ari64_execute end %08x, %u->%u (%d)\n", psxRegs.pc,
 		psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
@@ -438,6 +439,8 @@ int pending_exception, stop;
 unsigned int next_interupt;
 int new_dynarec_did_compile;
 int cycle_multiplier;
+int cycle_multiplier_override;
+int new_dynarec_hacks_pergame;
 int new_dynarec_hacks;
 void *psxH_ptr;
 void *zeromem_ptr;
@@ -446,7 +449,7 @@ unsigned char *out;
 void *mem_rtab;
 void *scratch_buf_ptr;
 void new_dynarec_init() {}
-void new_dyna_start() {}
+void new_dyna_start(void *context) {}
 void new_dynarec_cleanup() {}
 void new_dynarec_clear_full() {}
 void invalidate_all_pages() {}
@@ -657,6 +660,8 @@ void do_insn_cmp(void)
 		if (allregs_p[i] != allregs_e[i]) {
 			miss_log_add(i, allregs_p[i], allregs_e[i], psxRegs.pc, psxRegs.cycle);
 			bad++;
+			if (i > 32+2)
+				goto end;
 		}
 	}