|
 |
006bc1 |
From ea7071d3c30b6432bfe6f8a9d263e0285cec25e3 Mon Sep 17 00:00:00 2001
|
|
|
006bc1 |
From: Mike Pall <mike>
|
|
|
006bc1 |
Date: Sat, 18 Nov 2017 12:25:35 +0100
|
|
|
006bc1 |
Subject: [PATCH 25/72] MIPS64: Fix xpcall() error case.
|
|
|
006bc1 |
MIME-Version: 1.0
|
|
|
006bc1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
006bc1 |
Content-Transfer-Encoding: 8bit
|
|
|
006bc1 |
|
|
|
006bc1 |
Thanks to François Perrad and Stefan Pejic.
|
|
|
006bc1 |
---
|
|
|
006bc1 |
src/vm_mips64.dasc | 5 +++--
|
|
|
006bc1 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
006bc1 |
|
|
|
006bc1 |
diff --git a/src/vm_mips64.dasc b/src/vm_mips64.dasc
|
|
|
006bc1 |
index 75b38de..a78cd25 100644
|
|
|
006bc1 |
--- a/src/vm_mips64.dasc
|
|
|
006bc1 |
+++ b/src/vm_mips64.dasc
|
|
|
006bc1 |
@@ -1399,15 +1399,16 @@ static void build_subroutines(BuildCtx *ctx)
|
|
|
006bc1 |
|. nop
|
|
|
006bc1 |
|
|
|
|
006bc1 |
|.ffunc xpcall
|
|
|
006bc1 |
- | daddiu NARGS8:RC, NARGS8:RC, -16
|
|
|
006bc1 |
+ | daddiu NARGS8:TMP0, NARGS8:RC, -16
|
|
|
006bc1 |
| ld CARG1, 0(BASE)
|
|
|
006bc1 |
| ld CARG2, 8(BASE)
|
|
|
006bc1 |
- | bltz NARGS8:RC, ->fff_fallback
|
|
|
006bc1 |
+ | bltz NARGS8:TMP0, ->fff_fallback
|
|
|
006bc1 |
|. lbu TMP1, DISPATCH_GL(hookmask)(DISPATCH)
|
|
|
006bc1 |
| gettp AT, CARG2
|
|
|
006bc1 |
| daddiu AT, AT, -LJ_TFUNC
|
|
|
006bc1 |
| bnez AT, ->fff_fallback // Traceback must be a function.
|
|
|
006bc1 |
|. move TMP2, BASE
|
|
|
006bc1 |
+ | move NARGS8:RC, NARGS8:TMP0
|
|
|
006bc1 |
| daddiu BASE, BASE, 24
|
|
|
006bc1 |
| // Remember active hook before pcall.
|
|
|
006bc1 |
| srl TMP3, TMP3, HOOK_ACTIVE_SHIFT
|
|
|
006bc1 |
--
|
|
|
006bc1 |
2.20.1
|
|
|
006bc1 |
|