From cc382e5c1af3b867867cde8f906ae9fbfc9ac105 Mon Sep 17 00:00:00 2001
From: Hans Boehm <Hans_Boehm@hp.com>
Date: Mon, 8 Apr 2002 23:59:13 +0000
Subject: [PATCH] java_raw_api.c (ffi_java_raw_size): Handle FFI_TYPE_DOUBLE
correctly.
* src/java_raw_api.c (ffi_java_raw_size): Handle FFI_TYPE_DOUBLE
correctly.
* src/ia64/unix.S: Add unwind information. Fix comments.
Save sp in a way that's compatible with unwind info.
(ffi_call_unix): Correctly restore sp in all cases.
* src/ia64/ffi.c: Add, fix comments.
From-SVN: r52048
---
libffi/ChangeLog | 9 +++++++++
libffi/src/ia64/ffi.c | 9 +++++----
libffi/src/ia64/unix.S | 35 +++++++++++++++++++++++++++++------
libffi/src/java_raw_api.c | 1 +
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index ed235814bfa0..178dd9544a49 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-08 Hans Boehm <Hans_Boehm@hp.com>
+
+ * src/java_raw_api.c (ffi_java_raw_size): Handle FFI_TYPE_DOUBLE
+ correctly.
+ * src/ia64/unix.S: Add unwind information. Fix comments.
+ Save sp in a way that's compatible with unwind info.
+ (ffi_call_unix): Correctly restore sp in all cases.
+ * src/ia64/ffi.c: Add, fix comments.
+
2002-04-08 Jakub Jelinek <jakub@redhat.com>
* src/sparc/v8.S: Make .eh_frame dependent on target word size.
diff --git a/libffi/src/ia64/ffi.c b/libffi/src/ia64/ffi.c
index 4da6dd361d06..4338d34c4b04 100644
--- a/libffi/src/ia64/ffi.c
+++ b/libffi/src/ia64/ffi.c
@@ -35,7 +35,7 @@
/* type long enough to hold an entire register. For now we use double. */
typedef double float80;
-/* The stack layout at call to ffi_prep_regs. Other_args will remain */
+/* The stack layout at call to ffi_prep_args. Other_args will remain */
/* on the stack for the actual call. Everything else we be transferred */
/* to registers and popped by the assembly code. */
@@ -123,7 +123,8 @@ static bool is_homogeneous_fp_aggregate(ffi_type * type, int n,
}
/* ffi_prep_args is called by the assembly routine once stack space
- has been allocated for the function's arguments. Returns nonzero
+ has been allocated for the function's arguments. It fills in
+ the arguments in the structure referenced by stack. Returns nonzero
if fp registers are used for arguments. */
static bool
@@ -463,7 +464,7 @@ ffi_prep_incoming_args_UNIX(struct ia64_args *args, void **rvalue,
*/
/* ffi_closure_UNIX is an assembly routine, which copies the register */
-/* state into s struct ia64_args, and the invokes */
+/* state into a struct ia64_args, and then invokes */
/* ffi_closure_UNIX_inner. It also recovers the closure pointer */
/* from its fake gp pointer. */
void ffi_closure_UNIX();
@@ -473,7 +474,7 @@ void ffi_closure_UNIX();
#endif
void
ffi_closure_UNIX_inner (ffi_closure *closure, struct ia64_args * args)
-/* Hopefully declarint this as a varargs function will force all args */
+/* Hopefully declaring this as a varargs function will force all args */
/* to memory. */
{
// this is our return value storage
diff --git a/libffi/src/ia64/unix.S b/libffi/src/ia64/unix.S
index c0ca516be7f2..e599268c7211 100644
--- a/libffi/src/ia64/unix.S
+++ b/libffi/src/ia64/unix.S
@@ -42,13 +42,24 @@
#define FLOAT_SZ 8 /* in-memory size of fp operands */
+/* Allocate an ia64_args structure on the stack; call ffi_prep_args */
+/* to fill it in with argument values; copy those to the real */
+/* registers, leaving overflow arguments on the stack. Then call fn */
+/* and move the result from registers into *raddr. */
+ .pred.safe_across_calls p1-p5,p16-p63
.text
.align 16
- .global ffi_call_unix#
- .proc ffi_call_unix#
+ .global ffi_call_unix
+ .proc ffi_call_unix
ffi_call_unix:
- alloc loc0=ar.pfs,6,5,8,0
+ .prologue
+ .save ar.pfs,r38 /* loc0 */
+ alloc loc0=ar.pfs,6,6,8,0
+ .save rp,loc1
mov loc1=b0;
+ .vframe loc5
+ mov loc5=sp;
+ .body
sub sp=sp,bytes
mov loc4=r1 /* Save gp */
ld8 r8=[callback],8 /* code address of callback */
@@ -104,7 +115,7 @@ fp_done:
;;
ld8 r1=[fn] /* Set up gp */
mov b6=r8;;
- br.call.sptk.many b0 = b6 /* call ffi_prep_args */
+ br.call.sptk.many b0 = b6 /* call fn */
/* Handle return value. */
cmp.eq p6,p0=0,raddr
@@ -126,6 +137,7 @@ fp_done:
(p8) stfs [raddr]=f8
(p9) stfd [raddr]=f8
;;
+ .label_state 1
(p6) br.cond.dpnt.few handle_float_hfa
(p7) br.cond.dpnt.few handle_double_hfa
br done
@@ -151,9 +163,13 @@ done:
mov r1=loc4 /* Restore gp */
mov ar.pfs = loc0
mov b0 = loc1
+ .restore sp
+ mov sp = loc5
br.ret.sptk.many b0
handle_double_hfa:
+ .body
+ .copy_state 1
/* Homogeneous floating point array of doubles is returned in */
/* registers f8-f15. Save one at a time to return area. */
and flags=0xf,flags /* Retrieve size */
@@ -242,13 +258,19 @@ shfa2: add loc3=1*4,raddr
.endp ffi_call_unix
+ .pred.safe_across_calls p1-p5,p16-p63
.text
.align 16
.global ffi_closure_UNIX
.proc ffi_closure_UNIX
ffi_closure_UNIX:
- alloc loc0=ar.pfs,8,2,2,0
+ .prologue
+ .save ar.pfs,r40 /* loc0 */
+ alloc loc0=ar.pfs,8,3,2,0
+ .save rp,loc1
mov loc1=b0
+ .vframe loc2
+ mov loc2=sp
/* Retrieve closure pointer and real gp. */
mov out0=gp
add gp=16,gp
@@ -295,7 +317,8 @@ ffi_closure_UNIX:
;;
mov b0=loc1
mov ar.pfs=loc0
- add sp=BASIC_ARGS_SZ,sp
+ .restore sp
+ mov sp=loc2
br.ret.sptk.many b0
.endp ffi_closure_UNIX
diff --git a/libffi/src/java_raw_api.c b/libffi/src/java_raw_api.c
index 5f85582cfde4..55c3d132d533 100644
--- a/libffi/src/java_raw_api.c
+++ b/libffi/src/java_raw_api.c
@@ -52,6 +52,7 @@ ffi_java_raw_size (ffi_cif *cif)
switch((*at) -> type) {
case FFI_TYPE_UINT64:
case FFI_TYPE_SINT64:
+ case FFI_TYPE_DOUBLE:
result += 2 * SIZEOF_ARG;
break;
case FFI_TYPE_STRUCT:
--
GitLab