Skip to content

Commit

Permalink
ARM64: Fix xpcall() error case.
Browse files Browse the repository at this point in the history
Thanks to Stefan Pejic.
  • Loading branch information
Mike Pall committed Nov 16, 2017
1 parent 99cdfbf commit 33082a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/vm_arm64.dasc
Original file line number Diff line number Diff line change
Expand Up @@ -1185,12 +1185,12 @@ static void build_subroutines(BuildCtx *ctx)
| subs NARGS8:RC, NARGS8:RC, #16
| blo ->fff_fallback
| mov RB, BASE
| add BASE, BASE, #24
| asr ITYPE, CARG2, #47
| ubfx TMP0w, TMP0w, #HOOK_ACTIVE_SHIFT, #1
| cmn ITYPE, #-LJ_TFUNC
| add PC, TMP0, #24+FRAME_PCALL
| bne ->fff_fallback // Traceback must be a function.
| add BASE, BASE, #24
| stp CARG2, CARG1, [RB] // Swap function and traceback.
| cbz NARGS8:RC, ->vm_call_dispatch
| b <1
Expand Down

0 comments on commit 33082a6

Please sign in to comment.