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

MIPS64: Fix xpcall() error case.

Browse Source 
Thanks to François Perrad and Stefan Pejic.
This commit is contained in:
Mike Pall 2017-11-18 12:25:35 +01:00
parent d417ded179
commit ea7071d3c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vm_mips64.dasc
View File

@ -1399,15 +1399,16 @@ static void build_subroutines(BuildCtx *ctx)
|. nop |. nop
| |
|.ffunc xpcall |.ffunc xpcall
| daddiu NARGS8:RC, NARGS8:RC, -16 | daddiu NARGS8:TMP0, NARGS8:RC, -16
| ld CARG1, 0(BASE) | ld CARG1, 0(BASE)
| ld CARG2, 8(BASE) | ld CARG2, 8(BASE)
| bltz NARGS8:RC, ->fff_fallback | bltz NARGS8:TMP0, ->fff_fallback
|. lbu TMP1, DISPATCH_GL(hookmask)(DISPATCH) |. lbu TMP1, DISPATCH_GL(hookmask)(DISPATCH)
| gettp AT, CARG2 | gettp AT, CARG2
| daddiu AT, AT, -LJ_TFUNC | daddiu AT, AT, -LJ_TFUNC
| bnez AT, ->fff_fallback // Traceback must be a function. | bnez AT, ->fff_fallback // Traceback must be a function.
|. move TMP2, BASE |. move TMP2, BASE
| move NARGS8:RC, NARGS8:TMP0
| daddiu BASE, BASE, 24 | daddiu BASE, BASE, 24
| // Remember active hook before pcall. | // Remember active hook before pcall.
| srl TMP3, TMP3, HOOK_ACTIVE_SHIFT | srl TMP3, TMP3, HOOK_ACTIVE_SHIFT