X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Femu_if.c;h=cb95cb1c54e4ec394793287df40856b193e37e86;hb=6d760c926db017bea75bdd95cfa8acc3cc060ab8;hp=00af7f7aa9374a2e416c59096b2da12579d7136f;hpb=15d0ba027cfbe88c69b539cc0c9ac6769e577c78;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 00af7f7a..cb95cb1c 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -25,6 +25,7 @@
 #define evprintf(...)
 
 char invalid_code[0x100000];
+static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
 u32 event_cycles[PSXINT_COUNT];
 
 static void schedule_timeslice(void)
@@ -210,13 +211,13 @@ const uint64_t gte_reg_reads[64] = {
 	[GTE_OP]    = GCBITS3(0,2,4)       | GDBITS3(9,10,11),
 	[GTE_DPCS]  = GCBITS3(21,22,23)    | GDBITS4(6,8,21,22),
 	[GTE_INTPL] = GCBITS3(21,22,23)    | GDBITS7(6,8,9,10,11,21,22),
-	[GTE_MVMVA] = 0x00ffffff00000000ll | GDBITS6(0,1,2,3,4,5), // XXX: maybe decode further?
-	[GTE_NCDS]  = 0x00ffff0000000000ll | GDBITS5(0,1,6,21,22),
-	[GTE_CDP]   = 0x00fff00000000000ll | GDBITS7(6,8,9,10,11,21,22),
+	[GTE_MVMVA] = 0x00ffffff00000000ll | GDBITS9(0,1,2,3,4,5,9,10,11), // XXX: maybe decode further?
+	[GTE_NCDS]  = 0x00ffff0000000000ll | GDBITS6(0,1,6,8,21,22),
+	[GTE_CDP]   = 0x00ffe00000000000ll | GDBITS7(6,8,9,10,11,21,22),
 	[GTE_NCDT]  = 0x00ffff0000000000ll | GDBITS8(0,1,2,3,4,5,6,8),
-	[GTE_NCCS]  = 0x00ffff0000000000ll | GDBITS6(0,1,6,8,21,22),
+	[GTE_NCCS]  = 0x001fff0000000000ll | GDBITS5(0,1,6,21,22),
 	[GTE_CC]    = 0x001fe00000000000ll | GDBITS6(6,9,10,11,21,22),
-	[GTE_NCS]   = 0x001fff0000000000ll | GDBITS4(0,1,21,22),
+	[GTE_NCS]   = 0x001fff0000000000ll | GDBITS5(0,1,6,21,22),
 	[GTE_NCT]   = 0x001fff0000000000ll | GDBITS7(0,1,2,3,4,5,6),
 	[GTE_SQR]   =                        GDBITS3(9,10,11),
 	[GTE_DCPL]  = GCBITS3(21,22,23)    | GDBITS7(6,8,9,10,11,21,22),
@@ -259,6 +260,7 @@ static int ari64_init()
 {
 	extern void (*psxCP2[64])();
 	extern void psxNULL();
+	extern u_char *out;
 	size_t i;
 
 	new_dynarec_init();
@@ -268,9 +270,9 @@ static int ari64_init()
 		if (psxCP2[i] != psxNULL)
 			gte_handlers[i] = psxCP2[i];
 
-#if !defined(DRC_DBG)
-#ifdef __arm__
+#if defined(__arm__) && !defined(DRC_DBG)
 	gte_handlers[0x06] = gteNCLIP_arm;
+#ifdef HAVE_ARMV5
 	gte_handlers_nf[0x01] = gteRTPS_nf_arm;
 	gte_handlers_nf[0x30] = gteRTPT_nf_arm;
 #endif
@@ -286,6 +288,11 @@ static int ari64_init()
 #endif
 	psxH_ptr = psxH;
 	zeromem_ptr = zero_mem;
+	scratch_buf_ptr = scratch_buf;
+
+	SysPrintf("Mapped (RAM/scrp/ROM/LUTs/TC):\n");
+	SysPrintf("%08x/%08x/%08x/%08x/%08x\n",
+		psxM, psxH, psxR, mem_rtab, out);
 
 	return 0;
 }
@@ -344,6 +351,7 @@ static void ari64_clear(u32 addr, u32 size)
 static void ari64_shutdown()
 {
 	new_dynarec_cleanup();
+	new_dyna_pcsx_mem_shutdown();
 }
 
 extern void intExecute();
@@ -358,7 +366,7 @@ extern void intExecuteBlockT();
 R3000Acpu psxRec = {
 	ari64_init,
 	ari64_reset,
-#if defined(__arm__)
+#ifndef DRC_DISABLE
 	ari64_execute,
 	ari64_execute_until,
 #else
@@ -375,7 +383,7 @@ void do_insn_trace() {}
 void do_insn_cmp() {}
 #endif
 
-#if defined(__x86_64__) || defined(__i386__)
+#ifdef DRC_DISABLE
 unsigned int address;
 int pending_exception, stop;
 unsigned int next_interupt;
@@ -385,7 +393,10 @@ int new_dynarec_hacks;
 void *psxH_ptr;
 void *zeromem_ptr;
 u8 zero_mem[0x1000];
-void new_dynarec_init() {}
+u_char *out;
+void *mem_rtab;
+void *scratch_buf_ptr;
+void new_dynarec_init() { (void)ari64_execute; }
 void new_dyna_start() {}
 void new_dynarec_cleanup() {}
 void new_dynarec_clear_full() {}
@@ -394,6 +405,7 @@ void invalidate_block(unsigned int block) {}
 void new_dyna_pcsx_mem_init(void) {}
 void new_dyna_pcsx_mem_reset(void) {}
 void new_dyna_pcsx_mem_load_state(void) {}
+void new_dyna_pcsx_mem_shutdown(void) {}
 #endif
 
 #ifdef DRC_DBG