diff options
author | Mike Pall <mike> | 2012-11-07 18:04:58 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2012-11-07 18:04:58 +0100 |
commit | 8a11869d4905249600ce34bc12a47d6058fa4e21 (patch) | |
tree | 94c28fcdd0c9600d7ea002b81edfa0cb27567901 | |
parent | e941caafcf2e549d7c994363c50eaaf6aa082842 (diff) | |
download | luajit2-8a11869d4905249600ce34bc12a47d6058fa4e21.tar.gz |
FFI: Fix stack-adjustment for __thiscall callbacks.
-rw-r--r-- | src/lj_ccallback.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lj_ccallback.c b/src/lj_ccallback.c index e1d03fcf..0b5adb09 100644 --- a/src/lj_ccallback.c +++ b/src/lj_ccallback.c @@ -481,12 +481,9 @@ static void callback_conv_args(CTState *cts, lua_State *L) } L->top = o; #if LJ_TARGET_X86 - /* Store stack adjustment for returns from fastcall/stdcall callbacks. */ - switch (ctype_cconv(ct->info)) { - case CTCC_FASTCALL: case CTCC_STDCALL: + /* Store stack adjustment for returns from non-cdecl callbacks. */ + if (ctype_cconv(ct->info) != CTCC_CDECL) (L->base-2)->u32.hi |= (nsp << (16+2)); - break; - } #endif } |