diff options
| author | Anthony Green <green@moxielogic.com> | 2011-11-12 07:20:24 -0500 |
|---|---|---|
| committer | Anthony Green <green@moxielogic.com> | 2011-11-12 07:20:24 -0500 |
| commit | 3d56106b07735abef6ae9f032e94f560a0ed2f30 (patch) | |
| tree | a4022135ba459d1e5582eef63f066790f2c97c96 /src | |
| parent | 8c01954c50bf8ef2e00a3db166060a1b8f83a20d (diff) | |
| download | libffi-3d56106b07735abef6ae9f032e94f560a0ed2f30.tar.gz | |
Rebase
Diffstat (limited to 'src')
| -rw-r--r-- | src/arm/ffi.c | 6 | ||||
| -rw-r--r-- | src/arm/sysv.S | 5 | ||||
| -rw-r--r-- | src/powerpc/darwin_closure.S | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/arm/ffi.c b/src/arm/ffi.c index b2e7667..0fb6754 100644 --- a/src/arm/ffi.c +++ b/src/arm/ffi.c @@ -340,6 +340,8 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, /* How to make a trampoline. */ +extern unsigned int ffi_arm_trampoline[3]; + #if FFI_EXEC_TRAMPOLINE_TABLE #include <mach/mach.h> @@ -559,9 +561,7 @@ ffi_closure_free (void *ptr) unsigned int __fun = (unsigned int)(FUN); \ unsigned int __ctx = (unsigned int)(CTX); \ unsigned char *insns = (unsigned char *)(CTX); \ - *(unsigned int*) &__tramp[0] = 0xe92d000f; /* stmfd sp!, {r0-r3} */ \ - *(unsigned int*) &__tramp[4] = 0xe59f0000; /* ldr r0, [pc] */ \ - *(unsigned int*) &__tramp[8] = 0xe59ff000; /* ldr pc, [pc] */ \ + memcpy (__tramp, ffi_arm_trampoline, sizeof ffi_arm_trampoline); \ *(unsigned int*) &__tramp[12] = __ctx; \ *(unsigned int*) &__tramp[16] = __fun; \ __clear_cache((&__tramp[0]), (&__tramp[19])); /* Clear data mapping. */ \ diff --git a/src/arm/sysv.S b/src/arm/sysv.S index 14a7f03..60e2ae3 100644 --- a/src/arm/sysv.S +++ b/src/arm/sysv.S @@ -492,6 +492,11 @@ ARM_FUNC_START ffi_closure_VFP UNWIND .fnend .size CNAME(ffi_closure_VFP),.ffi_closure_VFP_end-CNAME(ffi_closure_VFP) +ENTRY(ffi_arm_trampoline) + stmfd sp!, {r0-r3} + ldr r0, [pc] + ldr pc, [pc] + #if defined __ELF__ && defined __linux__ .section .note.GNU-stack,"",%progbits #endif diff --git a/src/powerpc/darwin_closure.S b/src/powerpc/darwin_closure.S index db20cf6..3f6790f 100644 --- a/src/powerpc/darwin_closure.S +++ b/src/powerpc/darwin_closure.S @@ -534,7 +534,7 @@ L_ffi_closure_helper_DARWIN$stub: .lazy_symbol_pointer L_ffi_closure_helper_DARWIN$lazy_ptr: .indirect_symbol _ffi_closure_helper_DARWIN - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper #if defined(__ppc64__) .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32 @@ -553,7 +553,8 @@ L_darwin64_struct_ret_by_value_p$stub: .lazy_symbol_pointer L_darwin64_struct_ret_by_value_p$lazy_ptr: .indirect_symbol _darwin64_struct_ret_by_value_p - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper + .section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32 .align 5 L_darwin64_pass_struct_floats$stub: @@ -570,6 +571,6 @@ L_darwin64_pass_struct_floats$stub: .lazy_symbol_pointer L_darwin64_pass_struct_floats$lazy_ptr: .indirect_symbol _darwin64_pass_struct_floats - .long dyld_stub_binding_helper + .g_long dyld_stub_binding_helper # endif #endif |