ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix missing armv4 blx and bkpt compile errors.

Browse Source 
Signed-off-by: Xerxes Rånby <xerxes@zafena.se>
This commit is contained in:
Xerxes Rånby 2012-09-25 15:54:32 +02:00
parent 3693201911
commit 23ea8f7d76
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/arm.S
View File

@ -62,7 +62,12 @@ LOCAL(loop):
vldmia r7, {d0-d7} vldmia r7, {d0-d7}
#endif #endif
#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
mov lr, pc
bx r4
#else
blx r4 // call function blx r4 // call function
#endif
add sp, sp, r5 // deallocate stack add sp, sp, r5 // deallocate stack
#if defined(__VFP_FP__) && (! defined(__SOFTFP__)) && (! defined(__QNX__)) #if defined(__VFP_FP__) && (! defined(__SOFTFP__)) && (! defined(__QNX__))
@ -108,7 +113,12 @@ GLOBAL(vmRun):
mov r12, r0 mov r12, r0
ldr r0, [r2, #CHECKPOINT_THREAD] ldr r0, [r2, #CHECKPOINT_THREAD]
#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
mov lr, pc
bx r12
#else
blx r12 blx r12
#endif
.globl GLOBAL(vmRun_returnAddress) .globl GLOBAL(vmRun_returnAddress)
.align 2 .align 2

9
src/compile-arm.S
View File

@ -75,7 +75,12 @@ LOCAL(vmInvoke_argumentTest):
mov r8, r0 mov r8, r0
// load and call function address // load and call function address
#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
mov lr, pc
bx r1
#else
blx r1 blx r1
#endif
.globl GLOBAL(vmInvoke_returnAddress) .globl GLOBAL(vmInvoke_returnAddress)
.align 2 .align 2
@ -228,5 +233,9 @@ LOCAL(vmJumpAndInvoke_getAddress_word):
#else // not AVIAN_CONTINUATIONS #else // not AVIAN_CONTINUATIONS
// vmJumpAndInvoke should only be called when continuations are // vmJumpAndInvoke should only be called when continuations are
// enabled // enabled
#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
// TODO: armv4 do not have bkpt
#else
bkpt bkpt
#endif
#endif // not AVIAN_CONTINUATIONS #endif // not AVIAN_CONTINUATIONS