diff options
| author | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-10 22:46:47 +0000 |
|---|---|---|
| committer | pinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-02-10 22:46:47 +0000 |
| commit | 5e712cf258181b4394bb35392b5fd29401ba5df6 (patch) | |
| tree | 758a37aa8fc976d1c982fb96541aa0f877586f4e /libffi | |
| parent | 5646431231b0e465d2494c0c385e9b4f22f9f8af (diff) | |
2015-02-10 Andrew Pinski <apinski@cavium.com>
* src/aarch64/ffitarget.h (ffi_arg): Use unsigned long long for ILP32.
(FFI_SIZEOF_ARG): Define to 64 for ILP32.
(ffi_sarg): Use signed long long for ILP32.
* src/aarch64/sysv.S (PTR_REG): New macro.
(PTR_SIZE): New macro.
(ffi_closure_SYSV): Load cif, fn and user_data using PTR_REG.
(ffi_go_closure_SYSV): Load cif and fn using PTR_REG.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220598 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 11 | ||||
| -rw-r--r-- | libffi/src/aarch64/ffitarget.h | 6 | ||||
| -rw-r--r-- | libffi/src/aarch64/sysv.S | 18 |
3 files changed, 32 insertions, 3 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 47503d449e6c..a690b7bbf98c 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,14 @@ +2015-02-10 Andrew Pinski <apinski@cavium.com> + + * src/aarch64/ffitarget.h (ffi_arg): Use unsigned long long for ILP32. + (FFI_SIZEOF_ARG): Define to 64 for ILP32. + (ffi_sarg): Use signed long long for ILP32. + + * src/aarch64/sysv.S (PTR_REG): New macro. + (PTR_SIZE): New macro. + (ffi_closure_SYSV): Load cif, fn and user_data using PTR_REG. + (ffi_go_closure_SYSV): Load cif and fn using PTR_REG. + 2015-01-29 Jack Howarth <howarth.at.gcc@gmail.com> PR libffi/64855 diff --git a/libffi/src/aarch64/ffitarget.h b/libffi/src/aarch64/ffitarget.h index fca2811ae214..2862ec7fcccc 100644 --- a/libffi/src/aarch64/ffitarget.h +++ b/libffi/src/aarch64/ffitarget.h @@ -27,8 +27,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #endif #ifndef LIBFFI_ASM +#ifdef __ILP32__ +#define FFI_SIZEOF_ARG 8 +typedef unsigned long long ffi_arg; +typedef signed long long ffi_sarg; +#else typedef unsigned long ffi_arg; typedef signed long ffi_sarg; +#endif typedef enum ffi_abi { diff --git a/libffi/src/aarch64/sysv.S b/libffi/src/aarch64/sysv.S index 46f50b9ef218..c1bf9b98e039 100644 --- a/libffi/src/aarch64/sysv.S +++ b/libffi/src/aarch64/sysv.S @@ -45,6 +45,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ # define BE(X) 0 #endif +#ifdef __ILP32__ +#define PTR_REG(n) w##n +#else +#define PTR_REG(n) x##n +#endif + +#ifdef __ILP32__ +#define PTR_SIZE 4 +#else +#define PTR_SIZE 8 +#endif + .text .align 4 @@ -248,8 +260,8 @@ CNAME(ffi_closure_SYSV): stp x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48] /* Load ffi_closure_inner arguments. */ - ldp x0, x1, [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET] /* load cif, fn */ - ldr x2, [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET+16] /* load user_data */ + ldp PTR_REG(0), PTR_REG(1), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET] /* load cif, fn */ + ldr PTR_REG(2), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET+PTR_SIZE*2] /* load user_data */ .Ldo_closure: add x3, sp, #16 /* load context */ add x4, sp, #ffi_closure_SYSV_FS /* load stack */ @@ -403,7 +415,7 @@ CNAME(ffi_go_closure_SYSV): stp x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48] /* Load ffi_closure_inner arguments. */ - ldp x0, x1, [x18, #8] /* load cif, fn */ + ldp PTR_REG(0), PTR_REG(1), [x18, #PTR_SIZE]/* load cif, fn */ mov x2, x18 /* load user_data */ b .Ldo_closure cfi_endproc |