ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix case where callback arg value is split across regs and stack

Browse Source
This commit is contained in:
Anthony Green
2018-04-08 18:25:34 -04:00
parent 8660e69359
commit e27f70b8cf
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/moxie/ffi.c
View File

@@ -215,7 +215,18 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
break; break;
default: default:
/* This is an 8-byte value. */ /* This is an 8-byte value. */
avalue[i] = ptr; if (ptr == (char *) &register_args[5])
{
/* The value is split across two locations */
unsigned *ip = alloca(8);
avalue[i] = ip;
ip[0] = *(unsigned *) ptr;
ip[1] = *(unsigned *) stack_args;
}
else
{
avalue[i] = ptr;
}
ptr += 4; ptr += 4;
break; break;
} }
@@ -223,9 +234,9 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
/* If we've handled more arguments than fit in registers, /* If we've handled more arguments than fit in registers,
start looking at the those passed on the stack. */ start looking at the those passed on the stack. */
if (ptr == &register_args[6]) if (ptr == (char *) &register_args[6])
ptr = stack_args; ptr = stack_args;
else if (ptr == &register_args[7]) else if (ptr == (char *) &register_args[7])
ptr = stack_args + 4; ptr = stack_args + 4;
} }