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
drc: arm64 wip
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
linkage_arm.S
diff --git
a/libpcsxcore/new_dynarec/linkage_arm.S
b/libpcsxcore/new_dynarec/linkage_arm.S
index
1f232c4
..
fcb4e1a
100644
(file)
--- a/
libpcsxcore/new_dynarec/linkage_arm.S
+++ b/
libpcsxcore/new_dynarec/linkage_arm.S
@@
-59,12
+59,13
@@
DRC_VAR(cycle_count, 4)
DRC_VAR(last_count, 4)
DRC_VAR(pending_exception, 4)
DRC_VAR(stop, 4)
DRC_VAR(last_count, 4)
DRC_VAR(pending_exception, 4)
DRC_VAR(stop, 4)
-DRC_VAR(
invc_ptr
, 4)
+DRC_VAR(
branch_target
, 4)
DRC_VAR(address, 4)
DRC_VAR(address, 4)
+@DRC_VAR(align0, 4) /* unused/alignment */
DRC_VAR(psxRegs, LO_psxRegs_end - LO_psxRegs)
/* psxRegs */
DRC_VAR(psxRegs, LO_psxRegs_end - LO_psxRegs)
/* psxRegs */
-DRC_VAR(reg, 128)
+
@
DRC_VAR(reg, 128)
DRC_VAR(lo, 4)
DRC_VAR(hi, 4)
DRC_VAR(reg_cop0, 128)
DRC_VAR(lo, 4)
DRC_VAR(hi, 4)
DRC_VAR(reg_cop0, 128)
@@
-77,21
+78,18
@@
DRC_VAR(pcaddr, 4)
@DRC_VAR(intCycle, 256)
DRC_VAR(rcnts, 7*4*4)
@DRC_VAR(intCycle, 256)
DRC_VAR(rcnts, 7*4*4)
+DRC_VAR(inv_code_start, 4)
+DRC_VAR(inv_code_end, 4)
DRC_VAR(mem_rtab, 4)
DRC_VAR(mem_wtab, 4)
DRC_VAR(psxH_ptr, 4)
DRC_VAR(zeromem_ptr, 4)
DRC_VAR(mem_rtab, 4)
DRC_VAR(mem_wtab, 4)
DRC_VAR(psxH_ptr, 4)
DRC_VAR(zeromem_ptr, 4)
-DRC_VAR(inv_code_start, 4)
-DRC_VAR(inv_code_end, 4)
-DRC_VAR(branch_target, 4)
+DRC_VAR(invc_ptr, 4)
DRC_VAR(scratch_buf_ptr, 4)
DRC_VAR(scratch_buf_ptr, 4)
-@DRC_VAR(align
0, 12
) /* unused/alignment */
+@DRC_VAR(align
1, 8
) /* unused/alignment */
DRC_VAR(mini_ht, 256)
DRC_VAR(restore_candidate, 512)
DRC_VAR(mini_ht, 256)
DRC_VAR(restore_candidate, 512)
-/* unused */
-DRC_VAR(FCR0, 4)
-DRC_VAR(FCR31, 4)
#ifdef TEXRELS_FORBIDDEN
.data
#ifdef TEXRELS_FORBIDDEN
.data
@@
-396,7
+394,6
@@
FUNCTION(jump_vaddr):
FUNCTION(verify_code_ds):
str r8, [fp, #LO_branch_target]
FUNCTION(verify_code_ds):
str r8, [fp, #LO_branch_target]
-FUNCTION(verify_code_vm):
FUNCTION(verify_code):
/* r1 = source */
/* r2 = target */
FUNCTION(verify_code):
/* r1 = source */
/* r2 = target */
@@
-431,7
+428,7
@@
FUNCTION(verify_code):
bl get_addr
mov pc, r0
.size verify_code, .-verify_code
bl get_addr
mov pc, r0
.size verify_code, .-verify_code
- .size verify_code_
vm, .-verify_code_vm
+ .size verify_code_
ds, .-verify_code_ds
.align 2
FUNCTION(cc_interrupt):
.align 2
FUNCTION(cc_interrupt):
@@
-479,14
+476,6
@@
FUNCTION(cc_interrupt):
b .E1
.size cc_interrupt, .-cc_interrupt
b .E1
.size cc_interrupt, .-cc_interrupt
- .align 2
-FUNCTION(do_interrupt):
- ldr r0, [fp, #LO_pcaddr]
- bl get_addr_ht
- add r10, r10, #2
- mov pc, r0
- .size do_interrupt, .-do_interrupt
-
.align 2
FUNCTION(fp_exception):
mov r2, #0x10000000
.align 2
FUNCTION(fp_exception):
mov r2, #0x10000000
@@
-658,7
+647,7
@@
invalidate_addr_call:
FUNCTION(new_dyna_start):
/* ip is stored to conform EABI alignment */
stmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, lr}
FUNCTION(new_dyna_start):
/* ip is stored to conform EABI alignment */
stmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, lr}
- load_varadr fp, dynarec_local
+ mov fp, r0 /* dynarec_local */
ldr r0, [fp, #LO_pcaddr]
bl get_addr_ht
ldr r1, [fp, #LO_next_interupt]
ldr r0, [fp, #LO_pcaddr]
bl get_addr_ht
ldr r1, [fp, #LO_next_interupt]
@@
-726,10
+715,10
@@
FUNCTION(jump_handler_read32):
blx r3
ldr r0, [fp, #LO_next_interupt]
blx r3
ldr r0, [fp, #LO_next_interupt]
- pop {r2,
r3
}
+ pop {r2,
lr
}
str r0, [fp, #LO_last_count]
sub r0, r2, r0
str r0, [fp, #LO_last_count]
sub r0, r2, r0
- bx
r3
+ bx
lr
.endm
FUNCTION(jump_handler_write8):
.endm
FUNCTION(jump_handler_write8):
@@
-754,10
+743,10
@@
FUNCTION(jump_handler_write_h):
blx r3
ldr r0, [fp, #LO_next_interupt]
blx r3
ldr r0, [fp, #LO_next_interupt]
- pop {r2,
r3
}
+ pop {r2,
lr
}
str r0, [fp, #LO_last_count]
sub r0, r2, r0
str r0, [fp, #LO_last_count]
sub r0, r2, r0
- bx
r3
+ bx
lr
FUNCTION(jump_handle_swl):
/* r0 = address, r1 = data, r2 = cycles */
FUNCTION(jump_handle_swl):
/* r0 = address, r1 = data, r2 = cycles */