X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Flinkage_arm64.S;h=72d13f3d8de741c051ae2ec5bf4ac4afb192172e;hb=45a1e89f9b213953b102c6217c97a2f8828f1a57;hp=33fc048e36a2858e56d4cb90b163c97ad6f31043;hpb=4bdc30ab36281e9f9934efb026e264def03cef46;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/linkage_arm64.S b/libpcsxcore/new_dynarec/linkage_arm64.S
index 33fc048e..72d13f3d 100644
--- a/libpcsxcore/new_dynarec/linkage_arm64.S
+++ b/libpcsxcore/new_dynarec/linkage_arm64.S
@@ -87,7 +87,7 @@ DRC_VAR(mini_ht, 256)
 FUNCTION(dyna_linker):
 	/* r0 = virtual target address */
 	/* r1 = instruction to patch */
-	bl	get_addr_ht
+	bl	ndrc_get_addr_ht
 	br	x0
 	.size	dyna_linker, .-dyna_linker
 
@@ -100,6 +100,7 @@ FUNCTION(cc_interrupt):
 #	str	rCC, [rFP, #LO_reg_cop0+36]	/* Count */
 	mov	x21, lr
 1:
+	add	x0, rFP, #(LO_psxRegs + 34*4)   /* CP0 */
 	bl	gen_interupt
 	mov	lr, x21
 	ldr	rCC, [rFP, #LO_cycle]
@@ -113,7 +114,7 @@ FUNCTION(cc_interrupt):
 	ret
 2:
 	ldr	w0, [rFP, #LO_pcaddr]
-	bl	get_addr_ht
+	bl	ndrc_get_addr_ht
 	br	x0
 	.size	cc_interrupt, .-cc_interrupt
 
@@ -129,7 +130,7 @@ FUNCTION(fp_exception):
 	str	w1, [rFP, #LO_reg_cop0+48] /* Status */
 	str	w2, [rFP, #LO_reg_cop0+52] /* Cause */
 	add	w0, w3, #0x80
-	bl	get_addr_ht
+	bl	ndrc_get_addr_ht
 	br	x0
 	.size	fp_exception, .-fp_exception
 	.align	2
@@ -159,7 +160,8 @@ call_psxException:
 	ldr	w3, [rFP, #LO_last_count]
 	str	w2, [rFP, #LO_pcaddr]
 	add	rCC, w3, rCC
-	str	rCC, [rFP, #LO_cycle]		/* PCSX cycles */
+	str	rCC, [rFP, #LO_cycle]           /* PCSX cycles */
+	add	x2, rFP, #(LO_psxRegs + 34*4)   /* CP0 */
 	bl	psxException
 
 	/* note: psxException might do recursive recompiler call from it's HLE code,
@@ -170,7 +172,7 @@ FUNCTION(jump_to_new_pc):
 	ldr	w0, [rFP, #LO_pcaddr]
 	sub	rCC, rCC, w1
 	str	w1, [rFP, #LO_last_count]
-	bl	get_addr_ht
+	bl	ndrc_get_addr_ht
 	br	x0
 	.size	jump_to_new_pc, .-jump_to_new_pc
 
@@ -189,7 +191,7 @@ FUNCTION(new_dyna_start):
 	ldr	w0,  [rFP, #LO_pcaddr]
 	str	w1,  [rFP, #LO_last_count]
 	sub	rCC, w2, w1
-	bl	get_addr_ht
+	bl	ndrc_get_addr_ht
 	br	x0
 	.size	new_dyna_start, .-new_dyna_start