drc: update according to interpreter (2)

[pcsx_rearmed.git] / libpcsxcore / new_dynarec / linkage_arm64.S

diff --git a/libpcsxcore/new_dynarec/linkage_arm64.S b/libpcsxcore/new_dynarec/linkage_arm64.S
index d073ded..8d11fcf 100644 (file)
--- a/libpcsxcore/new_dynarec/linkage_arm64.S
+++ b/libpcsxcore/new_dynarec/linkage_arm64.S
@@ -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]
@@ -118,48 +119,44 @@ FUNCTION(cc_interrupt):
        .size   cc_interrupt, .-cc_interrupt
 
        .align  2
-FUNCTION(fp_exception):
-       mov     w2, #0x10000000
-0:
-       ldr     w1, [rFP, #LO_reg_cop0+48] /* Status */
-       mov     w3, #0x80000000
-       str     w0, [rFP, #LO_reg_cop0+56] /* EPC */
-       orr     w1, w1, #2
-       add     w2, w2, #0x2c
-       str     w1, [rFP, #LO_reg_cop0+48] /* Status */
-       str     w2, [rFP, #LO_reg_cop0+52] /* Cause */
-       add     w0, w3, #0x80
-       bl      ndrc_get_addr_ht
-       br      x0
-       .size   fp_exception, .-fp_exception
-       .align  2
-FUNCTION(fp_exception_ds):
-       mov     w2, #0x90000000 /* Set high bit if delay slot */
-       b       0b
-       .size   fp_exception_ds, .-fp_exception_ds
-
-       .align  2
+FUNCTION(jump_addrerror_ds): /* R3000E_AdEL / R3000E_AdES in w0 */
+       str     w1, [rFP, #(LO_psxRegs + (34+8)*4)]  /* BadVaddr */
+       mov     w1, #1
+       b       call_psxException
+FUNCTION(jump_addrerror):
+       str     w1, [rFP, #(LO_psxRegs + (34+8)*4)]  /* BadVaddr */
+       mov     w1, #0
+       b       call_psxException
+FUNCTION(jump_overflow_ds):
+       mov     w0, #(12<<2)  /* R3000E_Ov */
+       mov     w1, #1
+       b       call_psxException
+FUNCTION(jump_overflow):
+       mov     w0, #(12<<2)
+       mov     w1, #0
+       b       call_psxException
 FUNCTION(jump_break_ds):
-       mov     w0, #0x24
+       mov     w0, #(9<<2)  /* R3000E_Bp */
        mov     w1, #1
        b       call_psxException
 FUNCTION(jump_break):
-       mov     w0, #0x24
+       mov     w0, #(9<<2)
        mov     w1, #0
        b       call_psxException
 FUNCTION(jump_syscall_ds):
-       mov     w0, #0x20
-       mov     w1, #1
+       mov     w0, #(8<<2)  /* R3000E_Syscall */
+       mov     w1, #2
        b       call_psxException
 FUNCTION(jump_syscall):
-       mov     w0, #0x20
+       mov     w0, #(8<<2)
        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 */
+       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,