notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support compiling without pthreads
[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
33fc048
..
bc5f115
100644
(file)
--- 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 */
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
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:
# 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]
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]
ret
2:
ldr w0, [rFP, #LO_pcaddr]
- bl get_addr_ht
+ bl
ndrc_
get_addr_ht
br x0
.size cc_interrupt, .-cc_interrupt
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
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
br x0
.size fp_exception, .-fp_exception
.align 2
@@
-149,7
+150,7
@@
FUNCTION(jump_break):
b call_psxException
FUNCTION(jump_syscall_ds):
mov w0, #0x20
b call_psxException
FUNCTION(jump_syscall_ds):
mov w0, #0x20
- mov w1, #
1
+ mov w1, #
2
b call_psxException
FUNCTION(jump_syscall):
mov w0, #0x20
b call_psxException
FUNCTION(jump_syscall):
mov w0, #0x20
@@
-159,7
+160,8
@@
call_psxException:
ldr w3, [rFP, #LO_last_count]
str w2, [rFP, #LO_pcaddr]
add rCC, w3, rCC
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,
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]
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
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
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
br x0
.size new_dyna_start, .-new_dyna_start