Commit c1e237b22ee6042e2d4229008acea8f38c3d0109
2022-05-28T20:46:14
Pass large structs by value on the stack
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 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
diff --git a/src/or1k/ffi.c b/src/or1k/ffi.c
index 2bad938..c8ed110 100644
--- a/src/or1k/ffi.c
+++ b/src/or1k/ffi.c
@@ -37,7 +37,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif)
ffi_type **arg;
int count = 0;
int nfixedargs;
-
+
nfixedargs = ecif->cif->nfixedargs;
arg = ecif->cif->arg_types;
void **argv = ecif->avalue;
@@ -47,7 +47,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif)
*(void **) stack = ecif->rvalue;
stack += 4;
count = 4;
- }
+ }
for(i=0; i<ecif->cif->nargs; i++)
{
@@ -55,12 +55,12 @@ void* ffi_prep_args(char *stack, extended_cif *ecif)
if ((nfixedargs == 0) && (count < 24))
{
count = 24;
- stack = stacktemp + 24;
+ stack = stacktemp + 24;
}
nfixedargs--;
s = 4;
- switch((*arg)->type)
+ switch((*arg)->type)
{
case FFI_TYPE_STRUCT:
*(void **)stack = *argv;
@@ -94,7 +94,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif)
{
stack += 4;
count += 4;
- }
+ }
s = (*arg)->size;
memcpy(stack, *argv, s);
break;
@@ -133,6 +133,19 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
size += 4;
else
size += 8;
+
+ /* If we have any large structure arguments, make a copy so we are passing
+ by value. */
+ {
+ ffi_type *at = cif->arg_types[i];
+ int size = at->size;
+ if (at->type == FFI_TYPE_STRUCT && size > 4)
+ {
+ char *argcopy = alloca (size);
+ memcpy (argcopy, avalue[i], size);
+ avalue[i] = argcopy;
+ }
+ }
}
/* for variadic functions more space is needed on the stack */
@@ -148,7 +161,7 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
ecif.avalue = avalue;
ecif.rvalue = rvalue;
- switch (cif->abi)
+ switch (cif->abi)
{
case FFI_SYSV:
ffi_call_SYSV(size, &ecif, ffi_prep_args, rvalue, fn, cif->flags);
@@ -160,7 +173,7 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
}
-void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5,
+void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5,
unsigned long r6, unsigned long r7, unsigned long r8)
{
register int *sp __asm__ ("r17");
@@ -186,7 +199,7 @@ void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5,
/* preserve struct type return pointer passing */
- if ((cif->rtype != NULL) && (cif->rtype->type == FFI_TYPE_STRUCT))
+ if ((cif->rtype != NULL) && (cif->rtype->type == FFI_TYPE_STRUCT))
{
ptr += 4;
count = 4;
@@ -256,7 +269,7 @@ void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5,
long long rvalue;
(closure->fun) (cif, &rvalue, avalue, closure->user_data);
if (cif->rtype)
- asm ("l.ori r12, %0, 0x0\n l.lwz r11, 0(r12)\n l.lwz r12, 4(r12)" : : "r" (&rvalue));
+ asm ("l.ori r12, %0, 0x0\n l.lwz r11, 0(r12)\n l.lwz r12, 4(r12)" : : "r" (&rvalue));
}
}
@@ -303,11 +316,11 @@ ffi_prep_closure_loc (ffi_closure* closure,
ffi_status ffi_prep_cif_machdep (ffi_cif *cif)
{
cif->flags = 0;
-
+
/* structures are returned as pointers */
if (cif->rtype->type == FFI_TYPE_STRUCT)
cif->flags = FFI_TYPE_STRUCT;
- else
+ else
if (cif->rtype->size > 4)
cif->flags = FFI_TYPE_UINT64;
@@ -325,4 +338,4 @@ ffi_status ffi_prep_cif_machdep_var(ffi_cif *cif,
status = ffi_prep_cif_machdep (cif);
cif->nfixedargs = nfixedargs;
return status;
-}
+}