diff options
author | Mike Pall <mike> | 2020-08-09 23:12:48 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2020-08-09 23:12:48 +0200 |
commit | 94d4abcca966df2cc423e821bcacd04898f73117 (patch) | |
tree | 4ae1ee5d806e445b56747436a2562beb94ac2032 /src/vm_arm.dasc | |
parent | 46a6d06dc57a52da9d0f295914094ee7d89b4a9c (diff) | |
parent | e296f56b825c688c3530a981dc6b495d972f3d01 (diff) | |
download | luajit-94d4abcca966df2cc423e821bcacd04898f73117.tar.gz luajit-94d4abcca966df2cc423e821bcacd04898f73117.tar.bz2 luajit-94d4abcca966df2cc423e821bcacd04898f73117.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_arm.dasc')
-rw-r--r-- | src/vm_arm.dasc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/vm_arm.dasc b/src/vm_arm.dasc index 770a8e21..6b5572b7 100644 --- a/src/vm_arm.dasc +++ b/src/vm_arm.dasc | |||
@@ -2245,9 +2245,8 @@ static void build_subroutines(BuildCtx *ctx) | |||
2245 | | b <2 | 2245 | | b <2 |
2246 | | | 2246 | | |
2247 | |9: // Rethrow error from the right C frame. | 2247 | |9: // Rethrow error from the right C frame. |
2248 | | rsb CARG2, CARG1, #0 | ||
2249 | | mov CARG1, L | 2248 | | mov CARG1, L |
2250 | | bl extern lj_err_throw // (lua_State *L, int errcode) | 2249 | | bl extern lj_err_run // (lua_State *L) |
2251 | |.endif | 2250 | |.endif |
2252 | | | 2251 | | |
2253 | |//----------------------------------------------------------------------- | 2252 | |//----------------------------------------------------------------------- |