From 3e86b595ac576217a66fdeb50058d9b44402ce97 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Thu, 18 Sep 2003 20:53:19 +0000 Subject: [PATCH] aix.S: Cleanup whitespaces. * src/powerpc/aix.S: Cleanup whitespaces. * src/powerpc/aix_closure.S: Likewise. From-SVN: r71542 --- libffi/ChangeLog | 5 +++++ libffi/src/powerpc/aix.S | 28 ++++++++++++++-------------- libffi/src/powerpc/aix_closure.S | 17 ++++++++--------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 9a002168004..f575f30e681 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2003-09-18 David Edelsohn + + * src/powerpc/aix.S: Cleanup whitespaces. + * src/powerpc/aix_closure.S: Likewise. + 2003-09-18 Andreas Tobler * src/powerpc/darwin.S: Cleanup whitespaces, comment formatting. diff --git a/libffi/src/powerpc/aix.S b/libffi/src/powerpc/aix.S index 427733f5976..1346fb200c0 100644 --- a/libffi/src/powerpc/aix.S +++ b/libffi/src/powerpc/aix.S @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- aix.S - Copyright (c) 2002 Free Software Foundation, Inc. based on darwin.S by John Hornkvist - + PowerPC Assembly glue. Permission is hereby granted, free of charge, to any person obtaining @@ -121,7 +121,7 @@ ffi_call_AIX: mr r30,r6 /* rvalue, */ mr r29,r7 /* function address, */ mr r28,r8 /* our AP. */ - + /* Call ffi_prep_args. */ mr r4,r1 li r9,0 @@ -140,16 +140,16 @@ ffi_call_AIX: mtctr r12 lwz r2,4(r29) /* Load all those argument registers. */ - // We have set up a nice stack frame, just load it into registers. - lwz r3, 20+(1*4)(r1) - lwz r4, 20+(2*4)(r1) - lwz r5, 20+(3*4)(r1) - lwz r6, 20+(4*4)(r1) - nop + // We have set up a nice stack frame, just load it into registers. + lwz r3, 20+(1*4)(r1) + lwz r4, 20+(2*4)(r1) + lwz r5, 20+(3*4)(r1) + lwz r6, 20+(4*4)(r1) + nop lwz r7, 20+(5*4)(r1) - lwz r8, 20+(6*4)(r1) - lwz r9, 20+(7*4)(r1) - lwz r10,20+(8*4)(r1) + lwz r8, 20+(6*4)(r1) + lwz r9, 20+(7*4)(r1) + lwz r10,20+(8*4)(r1) L1: /* Load all the FP registers. */ @@ -165,17 +165,17 @@ L1: lfd f8,-16-(6*8)(r28) nop lfd f9,-16-(5*8)(r28) - lfd f10,-16-(4*8)(r28) + lfd f10,-16-(4*8)(r28) lfd f11,-16-(3*8)(r28) lfd f12,-16-(2*8)(r28) nop lfd f13,-16-(1*8)(r28) -L2: +L2: /* Make the call. */ bctrl lwz r2,20(r1) - + /* Now, deal with the return value. */ mtcrf 0x01,r31 diff --git a/libffi/src/powerpc/aix_closure.S b/libffi/src/powerpc/aix_closure.S index bb5818b44c2..8a26121ee59 100644 --- a/libffi/src/powerpc/aix_closure.S +++ b/libffi/src/powerpc/aix_closure.S @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- aix_closure.S - Copyright (c) 2002 2003 Free Software Foundation, Inc. based on darwin_closure.S - + PowerPC Assembly glue. Permission is hereby granted, free of charge, to any person obtaining @@ -102,19 +102,19 @@ ffi_closure_ASM: mflr r0 /* extract return address */ stw r0, 8(r1) /* save the return address */ - + /* 24 Bytes (Linkage Area) */ /* 32 Bytes (params) */ /* 104 Bytes (13*8 from FPR) */ /* 8 Bytes (result) */ /* 168 Bytes */ - + stwu r1,-176(r1) /* skip over caller save area keep stack aligned to 16 */ /* we want to build up an area for the parameters passed */ /* in registers (both floating point and integer) */ - + /* we store gpr 3 to gpr 10 (aligned to 4) in the parents outgoing area */ stw r3, 200(r1) @@ -199,18 +199,18 @@ L..46: L..47: lfs f1,0(r5) b L..44 - + /* case long long */ L..48: lwz r3,0(r5) lwz r4,4(r5) b L..44 - + /* case default / int32 / pointer */ L..50: lwz r3,0(r5) b L..44 - + /* case signed int8 */ L..55: addi r5,r5,3 @@ -239,10 +239,9 @@ L..58: /* case void / done */ L..44: - addi r1,r1,176 /* restore stack pointer */ lwz r0,8(r1) /* get return address */ mtlr r0 /* reset link register */ blr - + /* END(ffi_closure_ASM) */