diff options
| -rw-r--r-- | src/aarch64/ffi.c | 5 | ||||
| -rw-r--r-- | src/aarch64/internal.h | 2 | ||||
| -rw-r--r-- | src/aarch64/sysv.S | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/aarch64/ffi.c b/src/aarch64/ffi.c index 4f85140..f546ab2 100644 --- a/src/aarch64/ffi.c +++ b/src/aarch64/ffi.c @@ -52,7 +52,6 @@ struct call_context { struct _v v[N_V_ARG_REG]; UINT64 x[N_X_ARG_REG]; - UINT64 x8; }; #if defined (__clang__) && defined (__APPLE__) @@ -766,7 +765,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif, void (*fun)(ffi_cif*,void*,void**,void*), void *user_data, struct call_context *context, - void *stack, void *rvalue) + void *stack, void *rvalue, void *struct_rvalue) { void **avalue = (void**) alloca (cif->nargs * sizeof (void*)); int i, h, nargs, flags; @@ -861,7 +860,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif, flags = cif->flags; if (flags & AARCH64_RET_IN_MEM) - rvalue = (void *)(uintptr_t)context->x8; + rvalue = struct_rvalue; fun (cif, rvalue, avalue, user_data); diff --git a/src/aarch64/internal.h b/src/aarch64/internal.h index a3070db..9c3e077 100644 --- a/src/aarch64/internal.h +++ b/src/aarch64/internal.h @@ -64,4 +64,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #define N_X_ARG_REG 8 #define N_V_ARG_REG 8 -#define CALL_CONTEXT_SIZE (N_V_ARG_REG * 16 + N_X_ARG_REG * 8 + 16) +#define CALL_CONTEXT_SIZE (N_V_ARG_REG * 16 + N_X_ARG_REG * 8) diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S index abd848d..7f00a3f 100644 --- a/src/aarch64/sysv.S +++ b/src/aarch64/sysv.S @@ -241,7 +241,6 @@ CNAME(ffi_closure_SYSV): stp x2, x3, [sp, #16 + 16*N_V_ARG_REG + 16] stp x4, x5, [sp, #16 + 16*N_V_ARG_REG + 32] stp x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48] - str x8, [sp, #16 + 16*N_V_ARG_REG + 64] /* Load ffi_closure_inner arguments. */ ldp x0, x1, [x17, #FFI_TRAMPOLINE_SIZE] /* load cif, fn */ @@ -249,6 +248,7 @@ CNAME(ffi_closure_SYSV): add x3, sp, #16 /* load context */ add x4, sp, #ffi_closure_SYSV_FS /* load stack */ add x5, sp, #16+CALL_CONTEXT_SIZE /* load rvalue */ + mov x6, x8 /* load struct_rval */ bl CNAME(ffi_closure_SYSV_inner) /* Load the return value as directed. */ |