samsonium/libffi
1
0
Fork 0
mirror of https://github.com/partic2/libffi synced 2026-11-11 02:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mingw build and crashing bugs for Python Windows ARM64 (#496)

Browse Source 
* fix mingw build and crashing bugs for Python Windows ARM64

* Fix issues found in PR review
This commit is contained in:
Paul Monson
2019-08-07 14:57:45 -04:00
committed by Anthony Green
parent e0b4f84fb7
commit c2a6859012
9 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aarch64/ffi.c
+9 -3
View File
@@ -666,7 +666,7 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *orig_rvalue,
{
int elems = 4 - (h & 3);
#ifdef _M_ARM64 /* for handling armasm calling convention */
if (cif->isVariadic)
if (cif->is_variadic)
{
if (state.ngrn + elems <= N_X_ARG_REG)
{
@@ -808,7 +808,13 @@ ffi_prep_closure_loc (ffi_closure *closure,
ffi_clear_cache(tramp, tramp + FFI_TRAMPOLINE_SIZE);
/* Also flush the cache for code mapping. */
#ifdef _M_ARM64
// Not using dlmalloc.c for Windows ARM64 builds
// so calling ffi_data_to_code_pointer() isn't necessary
unsigned char *tramp_code = tramp;
#else
unsigned char *tramp_code = ffi_data_to_code_pointer (tramp);
#endif
ffi_clear_cache (tramp_code, tramp_code + FFI_TRAMPOLINE_SIZE);
#endif
@@ -909,7 +915,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
{
n = 4 - (h & 3);
#ifdef _M_ARM64 /* for handling armasm calling convention */
if (cif->isVariadic)
if (cif->is_variadic)
{
if (state.ngrn + n <= N_X_ARG_REG)
{
@@ -948,7 +954,7 @@ ffi_closure_SYSV_inner (ffi_cif *cif,
avalue[i] = allocate_to_stack(&state, stack,
ty->alignment, s);
}
#ifdef _M_ARM64 /* for handling armasm calling convention */
#ifdef _M_ARM64 /* for handling armasm calling convention */
}
#endif /* for handling armasm calling convention */
}