diff options
author | Mike Pall <mike> | 2023-11-12 15:11:29 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2023-11-12 15:11:29 +0100 |
commit | 7c9671a043468b27c02301b6261a9e2a8eff787f (patch) | |
tree | 0b9d99bcc7b4319a5d9274c7b320a7e07a7dbdb2 /src/vm_mips64.dasc | |
parent | 69bbbf77363ceb00ad2653a7729a5c9e8316e61f (diff) | |
parent | a4c1640432a9d8a60624cdc8065b15078c228e36 (diff) | |
download | luajit-7c9671a043468b27c02301b6261a9e2a8eff787f.tar.gz luajit-7c9671a043468b27c02301b6261a9e2a8eff787f.tar.bz2 luajit-7c9671a043468b27c02301b6261a9e2a8eff787f.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_mips64.dasc')
-rw-r--r-- | src/vm_mips64.dasc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/vm_mips64.dasc b/src/vm_mips64.dasc index ef0d901d..a8d20413 100644 --- a/src/vm_mips64.dasc +++ b/src/vm_mips64.dasc | |||
@@ -1415,8 +1415,12 @@ static void build_subroutines(BuildCtx *ctx) | |||
1415 | |//-- Base library: catch errors ---------------------------------------- | 1415 | |//-- Base library: catch errors ---------------------------------------- |
1416 | | | 1416 | | |
1417 | |.ffunc pcall | 1417 | |.ffunc pcall |
1418 | | ld TMP1, L->maxstack | ||
1419 | | daddu TMP2, BASE, NARGS8:RC | ||
1420 | | sltu AT, TMP1, TMP2 | ||
1421 | | bnez AT, ->fff_fallback | ||
1422 | |. lbu TMP3, DISPATCH_GL(hookmask)(DISPATCH) | ||
1418 | | daddiu NARGS8:RC, NARGS8:RC, -8 | 1423 | | daddiu NARGS8:RC, NARGS8:RC, -8 |
1419 | | lbu TMP3, DISPATCH_GL(hookmask)(DISPATCH) | ||
1420 | | bltz NARGS8:RC, ->fff_fallback | 1424 | | bltz NARGS8:RC, ->fff_fallback |
1421 | |. move TMP2, BASE | 1425 | |. move TMP2, BASE |
1422 | | daddiu BASE, BASE, 16 | 1426 | | daddiu BASE, BASE, 16 |
@@ -1437,8 +1441,12 @@ static void build_subroutines(BuildCtx *ctx) | |||
1437 | |. nop | 1441 | |. nop |
1438 | | | 1442 | | |
1439 | |.ffunc xpcall | 1443 | |.ffunc xpcall |
1444 | | ld TMP1, L->maxstack | ||
1445 | | daddu TMP2, BASE, NARGS8:RC | ||
1446 | | sltu AT, TMP1, TMP2 | ||
1447 | | bnez AT, ->fff_fallback | ||
1448 | |. ld CARG1, 0(BASE) | ||
1440 | | daddiu NARGS8:TMP0, NARGS8:RC, -16 | 1449 | | daddiu NARGS8:TMP0, NARGS8:RC, -16 |
1441 | | ld CARG1, 0(BASE) | ||
1442 | | ld CARG2, 8(BASE) | 1450 | | ld CARG2, 8(BASE) |
1443 | | bltz NARGS8:TMP0, ->fff_fallback | 1451 | | bltz NARGS8:TMP0, ->fff_fallback |
1444 | |. lbu TMP1, DISPATCH_GL(hookmask)(DISPATCH) | 1452 | |. lbu TMP1, DISPATCH_GL(hookmask)(DISPATCH) |