This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
powerpc64-linux libffi update
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: gcc-patches at gcc dot gnu dot org
- Cc: David Edelsohn <dje at watson dot ibm dot com>
- Date: Sat, 02 Aug 2003 00:27:16 +0930
- Subject: powerpc64-linux libffi update
Updates libffi for the current powerpc64-linux gcc structure passing
conventions. Since we now don't pass anything in the parm save area,
as per the ABI, the hack in linux64.S can go too.
libffi/ChangeLog
* src/powerpc/ffi.c (ffi_prep_args64): Modify for changed gcc
structure passing.
(ffi_closure_helper_LINUX64): Likewise.
* src/powerpc/linux64.S: Remove code writing to parm save area.
* src/powerpc/linux64_closure.S (ffi_closure_LINUX64): Use return
address in lr from ffi_closure_helper_LINUX64 call to calculate
table address. Optimize function tail.
ffitest now reports no errors, and no new libjava regressions.
OK to install mainline?
Index: libffi/src/powerpc/ffi.c
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/powerpc/ffi.c,v
retrieving revision 1.4
diff -u -p -r1.4 ffi.c
--- libffi/src/powerpc/ffi.c 18 Apr 2003 12:32:36 -0000 1.4
+++ libffi/src/powerpc/ffi.c 1 Aug 2003 14:34:54 -0000
@@ -288,7 +288,7 @@ enum { ASM_NEEDS_REGISTERS64 = 4 };
|--------------------------------------------| |
| TOC save area 8 | |
|--------------------------------------------| | stack |
- | Linker doubleword 8 | | gorws |
+ | Linker doubleword 8 | | grows |
|--------------------------------------------| | down V
| Compiler doubleword 8 | |
|--------------------------------------------| | lower addresses
@@ -384,15 +384,14 @@ void hidden ffi_prep_args64(extended_cif
}
else
{
- /* Structures with 1, 2 and 4 byte sizes are passed left-padded
- if they are in the first 8 arguments. */
- if (next_arg >= gpr_base
- && (*ptr)->size < 8
- && ((*ptr)->size & ~((*ptr)->size - 1)) == (*ptr)->size)
- memcpy((char *) next_arg + 8 - (*ptr)->size,
- (char *) *p_argv, (*ptr)->size);
- else
- memcpy((char *) next_arg, (char *) *p_argv, (*ptr)->size);
+ char *where = (char *) next_arg;
+
+ /* Structures with size less than eight bytes are passed
+ left-padded. */
+ if ((*ptr)->size < 8)
+ where += 8 - (*ptr)->size;
+
+ memcpy (where, (char *) *p_argv, (*ptr)->size);
next_arg += words;
if (next_arg == gpr_end)
next_arg = rest;
@@ -1027,12 +1026,9 @@ ffi_closure_helper_LINUX64 (ffi_closure*
#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
case FFI_TYPE_LONGDOUBLE:
#endif
- /* Structures with 1, 2 and 4 byte sizes are passed left-padded
- if they are in the first 8 arguments. */
- if (ng < NUM_GPR_ARG_REGISTERS64
- && arg_types[i]->size < 8
- && ((arg_types[i]->size & ~(arg_types[i]->size - 1))
- == arg_types[i]->size))
+ /* Structures with size less than eight bytes are passed
+ left-padded. */
+ if (arg_types[i]->size < 8)
avalue[i] = (char *) pst + 8 - arg_types[i]->size;
else
avalue[i] = pst;
Index: libffi/src/powerpc/linux64.S
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/powerpc/linux64.S,v
retrieving revision 1.2
diff -u -p -r1.2 linux64.S
--- libffi/src/powerpc/linux64.S 16 May 2003 22:09:21 -0000 1.2
+++ libffi/src/powerpc/linux64.S 1 Aug 2003 14:34:54 -0000
@@ -95,17 +95,6 @@ ffi_call_LINUX64:
lfd %f12, -32-(10*8)(%r28)
lfd %f13, -32-(9*8)(%r28)
2:
- /* FIXME: Shouldn't gcc use %r3-%r10 in this case
- and not the parm save area? */
- std %r3, 48+(0*8)(%r1)
- std %r4, 48+(1*8)(%r1)
- std %r5, 48+(2*8)(%r1)
- std %r6, 48+(3*8)(%r1)
- std %r7, 48+(4*8)(%r1)
- std %r8, 48+(5*8)(%r1)
- std %r9, 48+(6*8)(%r1)
- std %r10, 48+(7*8)(%r1)
- /* end of FIXME. */
/* Make the call. */
bctrl
Index: libffi/src/powerpc/linux64_closure.S
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/powerpc/linux64_closure.S,v
retrieving revision 1.2
diff -u -p -r1.2 linux64_closure.S
--- libffi/src/powerpc/linux64_closure.S 16 May 2003 22:09:21 -0000 1.2
+++ libffi/src/powerpc/linux64_closure.S 1 Aug 2003 14:34:54 -0000
@@ -64,6 +64,7 @@ ffi_closure_LINUX64:
# make the call
bl .ffi_closure_helper_LINUX64
+.Lret:
# now r3 contains the return type
# so use it to look up in a table
@@ -71,10 +72,10 @@ ffi_closure_LINUX64:
# look up the proper starting point in table
# by using return type as offset
- addi %r5, %r1, 112 # get pointer to results area
- bl .Lget_ret_type0_addr # get pointer to .Lret_type0 into LR
- mflr %r4 # move to r4
+ mflr %r4 # move address of .Lret to r4
sldi %r3, %r3, 4 # now multiply return type by 16
+ addi %r4, %r4, .Lret_type0 - .Lret
+ ld %r0, 224+16(%r1)
add %r3, %r3, %r4 # add contents of table to table address
mtctr %r3
bctr # jump to it
@@ -84,94 +85,84 @@ ffi_closure_LINUX64:
# first.
.align 4
- nop
- nop
- nop
-.Lget_ret_type0_addr:
- blrl
-
.Lret_type0:
# case FFI_TYPE_VOID
- b .Lfinish
- nop
- nop
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
nop
# case FFI_TYPE_INT
- lwa %r3, 4(%r5)
- b .Lfinish
- nop
- nop
+ lwa %r3, 112+4(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_FLOAT
- lfs %f1, 4(%r5)
- b .Lfinish
- nop
- nop
+ lfs %f1, 112+4(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_DOUBLE
- lfd %f1, 0(%r5)
- b .Lfinish
- nop
- nop
+ lfd %f1, 112+0(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_LONGDOUBLE
- lfd %f1, 0(%r5)
- b .Lfinish
- nop
- nop
+ lfd %f1, 112+0(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_UINT8
- lbz %r3, 7(%r5)
- b .Lfinish
- nop
- nop
+ lbz %r3, 112+7(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_SINT8
- lbz %r3, 7(%r5)
+ lbz %r3, 112+7(%r1)
extsb %r3,%r3
+ mtlr %r0
b .Lfinish
- nop
# case FFI_TYPE_UINT16
- lhz %r3, 6(%r5)
- b .Lfinish
- nop
- nop
+ lhz %r3, 112+6(%r1)
+ mtlr %r0
+.Lfinish:
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_SINT16
- lha %r3, 6(%r5)
- b .Lfinish
- nop
- nop
+ lha %r3, 112+6(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_UINT32
- lwz %r3, 4(%r5)
- b .Lfinish
- nop
- nop
+ lwz %r3, 112+4(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_SINT32
- lwa %r3, 4(%r5)
- b .Lfinish
- nop
- nop
+ lwa %r3, 112+4(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_UINT64
- ld %r3, 0(%r5)
- b .Lfinish
- nop
- nop
+ ld %r3, 112+0(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_SINT64
- ld %r3, 0(%r5)
- b .Lfinish
- nop
- nop
+ ld %r3, 112+0(%r1)
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
# case FFI_TYPE_STRUCT
- b .Lfinish
- nop
- nop
+ mtlr %r0
+ addi %r1, %r1, 224
+ blr
nop
# case FFI_TYPE_POINTER
- ld %r3, 0(%r5)
- b .Lfinish
- nop
- nop
-# esac
-.Lfinish:
- ld %r0, 224+16(%r1)
+ ld %r3, 112+0(%r1)
mtlr %r0
addi %r1, %r1, 224
blr
+# esac
.LFE1:
.long 0
.byte 0,12,0,1,128,0,0,0
--
Alan Modra
IBM OzLabs - Linux Technology Centre