ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix a couple of QNX/ARM issues

Browse Source 
On QNX, we need to use msync to sync the instruction cache.  Also,
even though the compiler doesn't define __SOFTFP__, QNX uses the
softfp ABI on ARM.
This commit is contained in:
Joel Dice 2012-08-03 20:00:27 -06:00
parent 59d7f5a47a
commit ebd7f69c41
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arm.S
View File

@ -57,7 +57,7 @@ LOCAL(loop):
// setup argument registers if necessary // setup argument registers if necessary
tst r6, r6 tst r6, r6
ldmneia r6, {r0-r3} ldmneia r6, {r0-r3}
#if defined(__VFP_FP__) && (! defined(__SOFTFP__)) #if defined(__VFP_FP__) && (! defined(__SOFTFP__)) && (! defined(__QNX__))
// and VFP registers // and VFP registers
vldmia r7, {d0-d7} vldmia r7, {d0-d7}
#endif #endif
@ -65,7 +65,7 @@ LOCAL(loop):
blx r4 // call function blx r4 // call function
add sp, sp, r5 // deallocate stack add sp, sp, r5 // deallocate stack
#if defined(__VFP_FP__) && (! defined(__SOFTFP__)) #if defined(__VFP_FP__) && (! defined(__SOFTFP__)) && (! defined(__QNX__))
cmp r8,#FLOAT_TYPE cmp r8,#FLOAT_TYPE
bne LOCAL(double) bne LOCAL(double)
fmrs r0,s0 fmrs r0,s0

9
src/arm.h
View File

@ -45,6 +45,9 @@
# define LINK_REGISTER(context) \ # define LINK_REGISTER(context) \
THREAD_STATE_LINK(context->uc_mcontext->FIELD(ss)) THREAD_STATE_LINK(context->uc_mcontext->FIELD(ss))
#elif (defined __QNX__) #elif (defined __QNX__)
# include "arm/smpxchg.h"
# include "sys/mman.h"
# define IP_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_PC]) # define IP_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_PC])
# define STACK_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_SP]) # define STACK_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_SP])
# define THREAD_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_IP]) # define THREAD_REGISTER(context) (context->uc_mcontext.cpu.gpr[ARM_REG_IP])
@ -100,6 +103,8 @@ syncInstructionCache(const void* start, unsigned size)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
sys_icache_invalidate(const_cast<void*>(start), size); sys_icache_invalidate(const_cast<void*>(start), size);
#elif (defined __QNX__)
msync(const_cast<void*>(start), size, MS_INVALIDATE_ICACHE);
#else #else
__clear_cache __clear_cache
(const_cast<void*>(start), (const_cast<void*>(start),
@ -117,6 +122,8 @@ atomicCompareAndSwap32(uint32_t* p, uint32_t old, uint32_t new_)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
return OSAtomicCompareAndSwap32(old, new_, reinterpret_cast<int32_t*>(p)); return OSAtomicCompareAndSwap32(old, new_, reinterpret_cast<int32_t*>(p));
#elif (defined __QNX__)
return old == _smp_cmpxchg(p, old, new_);
#else #else
int r = __kernel_cmpxchg(static_cast<int>(old), static_cast<int>(new_), reinterpret_cast<int*>(p)); int r = __kernel_cmpxchg(static_cast<int>(old), static_cast<int>(new_), reinterpret_cast<int*>(p));
return (!r ? true : false); return (!r ? true : false);
@ -156,7 +163,7 @@ dynamicCall(void* function, uintptr_t* arguments, uint8_t* argumentTypes,
for (unsigned ati = 0; ati < argumentCount; ++ ati) { for (unsigned ati = 0; ati < argumentCount; ++ ati) {
switch (argumentTypes[ati]) { switch (argumentTypes[ati]) {
case DOUBLE_TYPE: case DOUBLE_TYPE:
#if (defined(__VFP_FP__) && !defined(__SOFTFP__)) #if (defined(__VFP_FP__) && !defined(__SOFTFP__)) && !defined(__QNX__)
{ {
if (vfpIndex + Alignment <= VfpCount) { if (vfpIndex + Alignment <= VfpCount) {
if (vfpIndex % Alignment) { if (vfpIndex % Alignment) {