X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Flinkage_arm64.S;h=39e95a834fd4eebe068dc71b49e98cc05e9ef5e9;hb=cdc2da64d4c55a97c4507b6c9389bf4dca04695b;hp=5e9626f5e95f44f712b914a07df693a5361ce39e;hpb=48ce252818e5a9751b0ef5067b2b6136b41698a1;p=pcsx_rearmed.git

diff --git a/libpcsxcore/new_dynarec/linkage_arm64.S b/libpcsxcore/new_dynarec/linkage_arm64.S
index 5e9626f5..39e95a83 100644
--- a/libpcsxcore/new_dynarec/linkage_arm64.S
+++ b/libpcsxcore/new_dynarec/linkage_arm64.S
@@ -52,7 +52,7 @@ DRC_VAR(pending_exception, 4)
 DRC_VAR(stop, 4)
 DRC_VAR(branch_target, 4)
 DRC_VAR(address, 4)
-#DRC_VAR(align0, 16) /* unused/alignment */
+DRC_VAR(hack_addr, 4)
 DRC_VAR(psxRegs, LO_psxRegs_end - LO_psxRegs)
 
 /* psxRegs */
@@ -182,19 +182,28 @@ FUNCTION(fp_exception_ds):
 	.size	fp_exception_ds, .-fp_exception_ds
 
 	.align	2
+FUNCTION(jump_break_ds):
+	mov	w0, #0x24
+	mov	w1, #1
+	b	call_psxException
+FUNCTION(jump_break):
+	mov	w0, #0x24
+	mov	w1, #0
+	b	call_psxException
+FUNCTION(jump_syscall_ds):
+	mov	w0, #0x20
+	mov	w1, #1
+	b	call_psxException
 FUNCTION(jump_syscall):
-	ldr	w1, [rFP, #LO_reg_cop0+48] /* Status */
-	mov	w3, #0x80000000
-	str	w0, [rFP, #LO_reg_cop0+56] /* EPC */
-	orr	w1, w1, #2
-	mov	w2, #0x20
-	str	w1, [rFP, #LO_reg_cop0+48] /* Status */
-	str	w2, [rFP, #LO_reg_cop0+52] /* Cause */
-	add	w0, w3, #0x80
-	bl	get_addr_ht
-	br	x0
-	.size	jump_syscall, .-jump_syscall
-	.align	2
+	mov	w0, #0x20
+	mov	w1, #0
+
+call_psxException:
+	ldr	w3, [rFP, #LO_last_count]
+	str	w2, [rFP, #LO_pcaddr]
+	add	rCC, w3, rCC
+	str	rCC, [rFP, #LO_cycle]		/* PCSX cycles */
+	bl	psxException
 
 	/* note: psxException might do recursive recompiler call from it's HLE code,
 	 * so be ready for this */