gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFI/ARM64/OSX: Fix vararg call handling.

Browse Source 
Thanks to Igor Munkin.
This commit is contained in:
Mike Pall 2021-05-02 22:11:05 +02:00
parent fcdb246506
commit 521b367567
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lj_ccall.c
View File

@ -334,7 +334,7 @@
isfp = sz == 2*sizeof(float) ? 2 : 1; isfp = sz == 2*sizeof(float) ? 2 : 1;
#define CCALL_HANDLE_REGARG \ #define CCALL_HANDLE_REGARG \
if (LJ_TARGET_IOS && isva) { \ if (LJ_TARGET_OSX && isva) { \
/* IOS: All variadic arguments are on the stack. */ \ /* IOS: All variadic arguments are on the stack. */ \
} else if (isfp) { /* Try to pass argument in FPRs. */ \ } else if (isfp) { /* Try to pass argument in FPRs. */ \
int n2 = ctype_isvector(d->info) ? 1 : \ int n2 = ctype_isvector(d->info) ? 1 : \
@ -345,10 +345,10 @@
goto done; \ goto done; \
} else { \ } else { \
nfpr = CCALL_NARG_FPR; /* Prevent reordering. */ \ nfpr = CCALL_NARG_FPR; /* Prevent reordering. */ \
if (LJ_TARGET_IOS && d->size < 8) goto err_nyi; \ if (LJ_TARGET_OSX && d->size < 8) goto err_nyi; \
} \ } \
} else { /* Try to pass argument in GPRs. */ \ } else { /* Try to pass argument in GPRs. */ \
if (!LJ_TARGET_IOS && (d->info & CTF_ALIGN) > CTALIGN_PTR) \ if (!LJ_TARGET_OSX && (d->info & CTF_ALIGN) > CTALIGN_PTR) \
ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \ ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \
if (ngpr + n <= maxgpr) { \ if (ngpr + n <= maxgpr) { \
dp = &cc->gpr[ngpr]; \ dp = &cc->gpr[ngpr]; \
@ -356,7 +356,7 @@
goto done; \ goto done; \
} else { \ } else { \
ngpr = maxgpr; /* Prevent reordering. */ \ ngpr = maxgpr; /* Prevent reordering. */ \
if (LJ_TARGET_IOS && d->size < 8) goto err_nyi; \ if (LJ_TARGET_OSX && d->size < 8) goto err_nyi; \
} \ } \
} }

2
src/lj_ccallback.c
View File

@ -414,7 +414,7 @@ void lj_ccallback_mcode_free(CTState *cts)
nfpr = CCALL_NARG_FPR; /* Prevent reordering. */ \ nfpr = CCALL_NARG_FPR; /* Prevent reordering. */ \
} \ } \
} else { \ } else { \
if (!LJ_TARGET_IOS && n > 1) \ if (!LJ_TARGET_OSX && n > 1) \
ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \ ngpr = (ngpr + 1u) & ~1u; /* Align to regpair. */ \
if (ngpr + n <= maxgpr) { \ if (ngpr + n <= maxgpr) { \
sp = &cts->cb.gpr[ngpr]; \ sp = &cts->cb.gpr[ngpr]; \