* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+.equiv HAVE_ARMV7, 1
+
+.if HAVE_ARMV7
+ .cpu cortex-a8
+ .fpu vfp
+.else
.cpu arm9tdmi
.fpu softvfp
- .eabi_attribute 20, 1
- .eabi_attribute 21, 1
- .eabi_attribute 23, 3
- .eabi_attribute 24, 1
- .eabi_attribute 25, 1
- .eabi_attribute 26, 2
- .eabi_attribute 30, 6
- .eabi_attribute 18, 4
- .file "linkage_arm.s"
+.endif
.global rdram
rdram = 0x80000000
.global dynarec_local
.global memory_map
/* psx */
.global psxRegs
- .global psxHLEt_addr
.bss
.align 4
.size intCycle, 128
psxRegs_end = intCycle + 128
-psxHLEt_addr = psxRegs_end
- .type psxHLEt_addr, %object
- .size psxHLEt_addr, 4
-align0 = psxHLEt_addr + 4 /* just for alignment */
+align0 = psxRegs_end /* just for alignment */
.type align0, %object
- .size align0, 4
-branch_target = align0 + 4
+ .size align0, 8
+branch_target = align0 + 8
.type branch_target, %object
.size branch_target, 4
mini_ht = branch_target + 4
str r0, [fp, #last_count-dynarec_local]
sub r10, r10, r0
tst r2, r2
- bne .E3
+ ldmnefd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, pc}
tst r1, r1
moveq pc, lr
.E2:
ldr r0, [fp, #pcaddr-dynarec_local]
bl get_addr_ht
mov pc, r0
-.E3:
- add r12, fp, #28
- ldmia r12, {r4, r5, r6, r7, r8, r9, sl, fp, pc}
.E4:
/* Move 'dirty' blocks to the 'clean' list */
lsl r5, r2, #3
jump_hlecall:
ldr r2, [fp, #last_count-dynarec_local]
str r0, [fp, #pcaddr-dynarec_local]
- and r1, r1, #7
add r2, r2, r10
- ldr r3, [fp, #psxHLEt_addr-dynarec_local] /* psxHLEt */
str r2, [fp, #cycle-dynarec_local] /* PCSX cycle counter */
adr lr, pcsx_return
- ldr pc, [r3, r1, lsl #2] @ FIXME
+ bx r1
.size jump_hlecall, .-jump_hlecall
new_dyna_leave:
add r12, fp, #28
add r10, r0, r10
str r10, [fp, #cycle-dynarec_local]
- ldmia r12, {r4, r5, r6, r7, r8, r9, sl, fp, pc}
+ ldmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, pc}
.size new_dyna_leave, .-new_dyna_leave
/* these are used to call memhandlers */
.global new_dyna_start
.type new_dyna_start, %function
new_dyna_start:
- ldr r12, .dlptr
- stmia r12, {r4, r5, r6, r7, r8, r9, sl, fp, lr}
- sub fp, r12, #28
+ /* ip is stored to conform EABI alignment */
+ stmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, lr}
+.if HAVE_ARMV7
+ movw fp, #:lower16:dynarec_local
+ movt fp, #:upper16:dynarec_local
+.else
+ ldr fp, .dlptr
+.endif
ldr r0, [fp, #pcaddr-dynarec_local]
- /*bl new_recompile_block*/
bl get_addr_ht
ldr r1, [fp, #next_interupt-dynarec_local]
ldr r10, [fp, #cycle-dynarec_local]
sub r10, r10, r1
mov pc, r0
.dlptr:
- .word dynarec_local+28
+ .word dynarec_local
.size new_dyna_start, .-new_dyna_start
.align 2