ffitarget.h (ffi_arg): Use unsigned long long for ILP32.

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.

From-SVN: r220598

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 47503d449e6c9f8b165378f7177ddf3742537e26..a690b7bbf98c58f6e919bc9d934b1032d5d090d6 100644 (file)
--- 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 fca2811ae214fc89a2ec48fdd99e96425ec774f9..2862ec7fcccc6878a6b1d731c28166aef51295fe 100644 (file)
--- 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 46f50b9ef21818c7b5eda59964ff7a27746322ff..c1bf9b98e0393f055ec3aa73614b46049585311a 100644 (file)
--- a/libffi/src/aarch64/sysv.S
+++ b/libffi/src/aarch64/sysv.S
@@ -43,6 +43,18 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 # define BE(X) X
 #else
 # 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
@@ -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