|
 |
c52aaa |
Date: Wed, 20 Nov 2013 18:03:32 +1030
|
|
|
c52aaa |
From: Alan Modra <amodra at gmail dot com>
|
|
|
c52aaa |
To: libffi-discuss at sourceware dot org
|
|
|
c52aaa |
Subject: PowerPC64 ELFv2 fix 1 of 2
|
|
|
c52aaa |
Message-ID: <20131120073332.GF22514@bubble.grove.modra.org>
|
|
|
c52aaa |
MIME-Version: 1.0
|
|
|
c52aaa |
Content-Type: text/plain; charset=us-ascii
|
|
|
c52aaa |
Content-Disposition: inline
|
|
|
c52aaa |
User-Agent: Mutt/1.5.21 (2010-09-15)
|
|
|
c52aaa |
|
|
|
c52aaa |
Using the return value area as a place to pass parameters wasn't such
|
|
|
c52aaa |
a good idea, causing a failure of cls_ulonglong.c. I didn't see this
|
|
|
c52aaa |
when running the mainline gcc libffi testsuite because that version of
|
|
|
c52aaa |
the test is inferior to the upstreamm libffi test.
|
|
|
c52aaa |
|
|
|
c52aaa |
* src/powerpc/linux64_closure.S: Don't use the return value area
|
|
|
c52aaa |
as a parameter save area on ELFv2.
|
|
|
c52aaa |
|
|
|
c52aaa |
diff --git a/src/powerpc/linux64_closure.S b/src/powerpc/linux64_closure.S
|
|
|
c52aaa |
index 9b6b5f3..4d012cc 100644
|
|
|
c52aaa |
--- a/src/powerpc/linux64_closure.S
|
|
|
c52aaa |
+++ b/src/powerpc/linux64_closure.S
|
|
|
c52aaa |
@@ -60,13 +60,11 @@ ffi_closure_LINUX64:
|
|
|
c52aaa |
# endif
|
|
|
c52aaa |
|
|
|
c52aaa |
# if _CALL_ELF == 2
|
|
|
c52aaa |
-# 32 byte special reg save area + 64 byte parm save area and retval
|
|
|
c52aaa |
-# + 13*8 fpr save area + round to 16
|
|
|
c52aaa |
-# define STACKFRAME 208
|
|
|
c52aaa |
+# 32 byte special reg save area + 64 byte parm save area
|
|
|
c52aaa |
+# + 64 byte retval area + 13*8 fpr save area + round to 16
|
|
|
c52aaa |
+# define STACKFRAME 272
|
|
|
c52aaa |
# define PARMSAVE 32
|
|
|
c52aaa |
-# No parameter save area is needed for the call to ffi_closure_helper_LINUX64,
|
|
|
c52aaa |
-# so return value can start there.
|
|
|
c52aaa |
-# define RETVAL PARMSAVE
|
|
|
c52aaa |
+# define RETVAL PARMSAVE+64
|
|
|
c52aaa |
# else
|
|
|
c52aaa |
# 48 bytes special reg save area + 64 bytes parm save area
|
|
|
c52aaa |
# + 16 bytes retval area + 13*8 bytes fpr save area + round to 16
|
|
|
c52aaa |
@@ -85,8 +83,8 @@ ffi_closure_LINUX64:
|
|
|
c52aaa |
bt 7, .Lparmsave
|
|
|
c52aaa |
# Our caller has not allocated a parameter save area.
|
|
|
c52aaa |
# We need to allocate one here and use it to pass gprs to
|
|
|
c52aaa |
- # ffi_closure_helper_LINUX64. The return value area will do.
|
|
|
c52aaa |
- addi %r12, %r1, -STACKFRAME+RETVAL
|
|
|
c52aaa |
+ # ffi_closure_helper_LINUX64.
|
|
|
c52aaa |
+ addi %r12, %r1, -STACKFRAME+PARMSAVE
|
|
|
c52aaa |
.Lparmsave:
|
|
|
c52aaa |
std %r0, 16(%r1)
|
|
|
c52aaa |
# Save general regs into parm save area
|
|
|
c52aaa |
|
|
|
c52aaa |
--
|
|
|
c52aaa |
Alan Modra
|
|
|
c52aaa |
Australia Development Lab, IBM
|
|
|
c52aaa |
|