]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
MIPS64: Fix xpcall() error case.
authorMike Pall <mike>
Sat, 18 Nov 2017 11:25:35 +0000 (12:25 +0100)
committerMike Pall <mike>
Sat, 18 Nov 2017 11:25:35 +0000 (12:25 +0100)
Thanks to François Perrad and Stefan Pejic.

src/vm_mips64.dasc

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