samsonium/libffi
1
0
Fork 0
mirror of https://github.com/partic2/libffi synced 2026-11-09 17:47:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix closure case where 8-byte value is partially passed in register. Fixes cls_many_mixed_float_double test case.

Browse Source
This commit is contained in:
Anthony Green
2018-03-16 17:53:33 -04:00
parent 0f0ba9e0ec
commit 6a801d042a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/moxie/ffi.c
+5 -3
View File
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------------
ffi.c - Copyright (C) 2012, 2013 Anthony Green
ffi.c - Copyright (C) 2012, 2013, 2018 Anthony Green
Moxie Foreign Function Interface
@@ -159,7 +159,7 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
unsigned arg4, unsigned arg5, unsigned arg6)
{
/* This function is called by a trampoline. The trampoline stows a
pointer to the ffi_closure object in $r7. We must save this
pointer to the ffi_closure object in $r12. We must save this
pointer in a place that will persist while we do our work. */
register ffi_closure *creg __asm__ ("$r12");
ffi_closure *closure = creg;
@@ -225,6 +225,8 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
start looking at the those passed on the stack. */
if (ptr == &register_args[6])
ptr = stack_args;
else if (ptr == &register_args[7])
ptr = stack_args + 4;
}
/* Invoke the closure. */
@@ -257,7 +259,7 @@ ffi_prep_closure_loc (ffi_closure* closure,
fn = (unsigned long) ffi_closure_eabi;
tramp[0] = 0x01e0; /* ldi.l $r7, .... */
tramp[0] = 0x01e0; /* ldi.l $r12, .... */
tramp[1] = cls >> 16;
tramp[2] = cls & 0xffff;
tramp[3] = 0x1a00; /* jmpa .... */