mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-14 20:11:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

ffi.c (ffi_prep_closure): Align doubles and 64-bit integers on a 8-byte boundary.

Browse Source 
* src/sparc/ffi.c (ffi_prep_closure): Align doubles and 64-bit integers
	on a 8-byte boundary.
	* src/sparc/v8.S (ffi_closure_v8): Reserve frame space for
	arguments.

From-SVN: r91022
This commit is contained in:
Eric Botcazou 2004-11-22 19:35:16 +01:00 committed by Eric Botcazou
parent 167a1354b3
commit bf02e7fa52
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libffi/ChangeLog
View File

@ -1,3 +1,9 @@
2004-11-22 Eric Botcazou <ebotcazou@libertysurf.fr>
* src/sparc/ffi.c (ffi_prep_closure): Align doubles and 64-bit integers
on a 8-byte boundary.
* src/sparc/v8.S (ffi_closure_v8): Reserve frame space for arguments.
2004-10-27 Richard Earnshaw <rearnsha@arm.com> 2004-10-27 Richard Earnshaw <rearnsha@arm.com>
* src/arm/ffi.c (ffi_prep_cif_machdep): Handle functions that return * src/arm/ffi.c (ffi_prep_cif_machdep): Handle functions that return

15
libffi/src/sparc/ffi.c
View File

@ -470,7 +470,7 @@ ffi_prep_closure (ffi_closure* closure,
int int
ffi_closure_sparc_inner_v8(ffi_closure *closure, ffi_closure_sparc_inner_v8(ffi_closure *closure,
void *rvalue, unsigned long *gpr) void *rvalue, unsigned long *gpr, unsigned long *scratch)
{ {
ffi_cif *cif; ffi_cif *cif;
ffi_type **arg_types; ffi_type **arg_types;
@ -505,6 +505,19 @@ ffi_closure_sparc_inner_v8(ffi_closure *closure,
/* Straight copy of invisible reference. */ /* Straight copy of invisible reference. */
avalue[i] = (void *)gpr[argn++]; avalue[i] = (void *)gpr[argn++];
} }
else if ((arg_types[i]->type == FFI_TYPE_DOUBLE
|| arg_types[i]->type == FFI_TYPE_SINT64
|| arg_types[i]->type == FFI_TYPE_UINT64)
/* gpr is 8-byte aligned. */
&& (argn % 2) != 0)
{
/* Align on a 8-byte boundary. */
scratch[0] = gpr[argn];
scratch[1] = gpr[argn+1];
avalue[i] = scratch;
scratch -= 2;
argn += 2;
}
else else
{ {
/* Always right-justify. */ /* Always right-justify. */

14
libffi/src/sparc/v8.S
View File

@ -115,7 +115,15 @@ ffi_closure_v8:
.register %g2, #scratch .register %g2, #scratch
#endif #endif
.LLFB2: .LLFB2:
save %sp, -STACKFRAME, %sp ! Reserve frame space for all arguments in case
! we need to align them on a 8-byte boundary.
ld [%g2+FFI_TRAMPOLINE_SIZE], %g1
ld [%g1+4], %g1
sll %g1, 3, %g1
add %g1, STACKFRAME, %g1
! %g1 == STACKFRAME + 8*nargs
neg %g1
save %sp, %g1, %sp
.LLCFI1: .LLCFI1:
! Store all of the potential argument registers in va_list format. ! Store all of the potential argument registers in va_list format.
@ -129,8 +137,9 @@ ffi_closure_v8:
! Call ffi_closure_sparc_inner to do the bulk of the work. ! Call ffi_closure_sparc_inner to do the bulk of the work.
mov %g2, %o0 mov %g2, %o0
add %fp, -8, %o1 add %fp, -8, %o1
call ffi_closure_sparc_inner_v8
add %fp, 64, %o2 add %fp, 64, %o2
call ffi_closure_sparc_inner_v8
add %fp, -16, %o3
! Load up the return value in the proper type. ! Load up the return value in the proper type.
! See ffi_prep_cif_machdep for the list of cases. ! See ffi_prep_cif_machdep for the list of cases.
@ -157,6 +166,7 @@ ffi_closure_v8:
be done2 be done2
! FFI_TYPE_SINT64 ! FFI_TYPE_SINT64
! FFI_TYPE_UINT64
ld [%fp-4], %i1 ld [%fp-4], %i1
integer: integer: