Commit 8a3a2723aaa615cb95ee1c798469d7a3b2d95d31
2014-12-12T10:13:27
Merge pull request #156 from rth7680/sparc sparc: Define FFI_TARGET_SPECIFIC_VARIADIC for v9
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106
diff --git a/src/sparc/ffi64.c b/src/sparc/ffi64.c
index a4e41d2..340b198 100644
--- a/src/sparc/ffi64.c
+++ b/src/sparc/ffi64.c
@@ -159,8 +159,8 @@ ffi_struct_float_copy (int size_mask, void *vd, void *vi, void *vf)
/* Perform machine dependent cif processing */
-ffi_status FFI_HIDDEN
-ffi_prep_cif_machdep(ffi_cif *cif)
+static ffi_status
+ffi_prep_cif_machdep_core(ffi_cif *cif)
{
ffi_type *rtype = cif->rtype;
int rtt = rtype->type;
@@ -304,6 +304,20 @@ ffi_prep_cif_machdep(ffi_cif *cif)
return FFI_OK;
}
+ffi_status FFI_HIDDEN
+ffi_prep_cif_machdep(ffi_cif *cif)
+{
+ cif->nfixedargs = cif->nargs;
+ return ffi_prep_cif_machdep_core(cif);
+}
+
+ffi_status FFI_HIDDEN
+ffi_prep_cif_machdep_var(ffi_cif *cif, unsigned nfixedargs, unsigned ntotalargs)
+{
+ cif->nfixedargs = nfixedargs;
+ return ffi_prep_cif_machdep_core(cif);
+}
+
extern void ffi_call_v9(ffi_cif *cif, void (*fn)(void), void *rvalue,
void **avalue, size_t bytes, void *closure) FFI_HIDDEN;
@@ -495,11 +509,12 @@ ffi_closure_sparc_inner_v9(ffi_cif *cif,
{
ffi_type **arg_types;
void **avalue;
- int i, argn, argx, nargs, flags;
+ int i, argn, argx, nargs, flags, nfixedargs;
arg_types = cif->arg_types;
nargs = cif->nargs;
flags = cif->flags;
+ nfixedargs = cif->nfixedargs;
avalue = alloca(nargs * sizeof(void *));
@@ -517,6 +532,7 @@ ffi_closure_sparc_inner_v9(ffi_cif *cif,
/* Grab the addresses of the arguments from the stack frame. */
for (i = 0; i < nargs; i++, argn = argx)
{
+ int named = i < nfixedargs;
ffi_type *ty = arg_types[i];
void *a = &gpr[argn];
size_t z;
@@ -532,7 +548,7 @@ ffi_closure_sparc_inner_v9(ffi_cif *cif,
else
{
argx = argn + ALIGN (z, 8) / 8;
- if (argn < 16)
+ if (named && argn < 16)
{
int size_mask = ffi_struct_float_mask (ty, 0);
int argn_mask = (0xffff00 >> argn) & 0xff00;
@@ -546,15 +562,15 @@ ffi_closure_sparc_inner_v9(ffi_cif *cif,
case FFI_TYPE_LONGDOUBLE:
argn = ALIGN (argn, 2);
- a = (argn < 16 ? fpr : gpr) + argn;
+ a = (named && argn < 16 ? fpr : gpr) + argn;
argx = argn + 2;
break;
case FFI_TYPE_DOUBLE:
- if (argn <= 16)
+ if (named && argn < 16)
a = fpr + argn;
break;
case FFI_TYPE_FLOAT:
- if (argn <= 16)
+ if (named && argn < 16)
a = fpr + argn;
a += 4;
break;
diff --git a/src/sparc/ffitarget.h b/src/sparc/ffitarget.h
index 6982903..2f4cd9a 100644
--- a/src/sparc/ffitarget.h
+++ b/src/sparc/ffitarget.h
@@ -57,8 +57,13 @@ typedef enum ffi_abi {
} ffi_abi;
#endif
-#define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
-#define FFI_TARGET_HAS_COMPLEX_TYPE
+#define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION 1
+#define FFI_TARGET_HAS_COMPLEX_TYPE 1
+
+#ifdef SPARC64
+# define FFI_TARGET_SPECIFIC_VARIADIC 1
+# define FFI_EXTRA_CIF_FIELDS unsigned int nfixedargs
+#endif
/* ---- Definitions for closures ----------------------------------------- */