aboutsummaryrefslogtreecommitdiff
path: root/src/vm_x86.dasc
diff options
context:
space:
mode:
authorMike Pall <mike>2021-03-23 00:35:46 +0100
committerMike Pall <mike>2021-03-23 00:39:50 +0100
commita32aeadc6878305658fb3939830e6abaef587e40 (patch)
tree48f3df3a4ca72b1fb7cd628f15b9d21d864bbbc2 /src/vm_x86.dasc
parentddd0fd8f3754ad83423623655d8b3f8454a7cf1e (diff)
downloadluajit-a32aeadc6878305658fb3939830e6abaef587e40.tar.gz
luajit-a32aeadc6878305658fb3939830e6abaef587e40.tar.bz2
luajit-a32aeadc6878305658fb3939830e6abaef587e40.zip
Handle on-trace OOM errors from helper functions.
Diffstat (limited to 'src/vm_x86.dasc')
-rw-r--r--src/vm_x86.dasc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
index 1fee4a2a..1e376e45 100644
--- a/src/vm_x86.dasc
+++ b/src/vm_x86.dasc
@@ -2964,8 +2964,10 @@ static void build_subroutines(BuildCtx *ctx)
2964 | jmp <2 2964 | jmp <2
2965 | 2965 |
2966 |9: // Rethrow error from the right C frame. 2966 |9: // Rethrow error from the right C frame.
2967 | mov FCARG2, RD
2967 | mov FCARG1, L:RB 2968 | mov FCARG1, L:RB
2968 | call extern lj_err_run@4 // (lua_State *L) 2969 | neg FCARG2
2970 | call extern lj_err_trace@8 // (lua_State *L, int errcode)
2969 |.endif 2971 |.endif
2970 | 2972 |
2971 |//----------------------------------------------------------------------- 2973 |//-----------------------------------------------------------------------