From: Mike Pall <mike>
Date: Wed, 27 Oct 2021 19:56:07 +0000 (+0200)
Subject: ARM64: Fix pcall() error case.
X-Git-Tag: v2.1.ROLLING~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4b2dce9fc3ffaaaede39b36d06415311e2aa516;p=thirdparty%2FLuaJIT.git

ARM64: Fix pcall() error case.

Reported by Alex Orlenko.
---

diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc
index c7090ca3..eb87857f 100644
--- a/src/vm_arm64.dasc
+++ b/src/vm_arm64.dasc
@@ -1164,9 +1164,10 @@ static void build_subroutines(BuildCtx *ctx)
   |//-- Base library: catch errors ----------------------------------------
   |
   |.ffunc pcall
+  |   cmp NARGS8:RC, #8
   |  ldrb TMP0w, GL->hookmask
-  |   subs NARGS8:RC, NARGS8:RC, #8
   |   blo ->fff_fallback
+  |   sub NARGS8:RC, NARGS8:RC, #8
   |    mov RB, BASE
   |    add BASE, BASE, #16
   |  ubfx TMP0w, TMP0w, #HOOK_ACTIVE_SHIFT, #1