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_x86.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_x86.dasc')
| -rw-r--r-- | src/vm_x86.dasc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index f9bea426..b26cde4f 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
| @@ -2960,10 +2960,8 @@ static void build_subroutines(BuildCtx *ctx) | |||
| 2960 | | jmp <2 | 2960 | | jmp <2 |
| 2961 | | | 2961 | | |
| 2962 | |9: // Rethrow error from the right C frame. | 2962 | |9: // Rethrow error from the right C frame. |
| 2963 | | neg RD | ||
| 2964 | | mov FCARG1, L:RB | 2963 | | mov FCARG1, L:RB |
| 2965 | | mov FCARG2, RD | 2964 | | call extern lj_err_run@4 // (lua_State *L) |
| 2966 | | call extern lj_err_throw@8 // (lua_State *L, int errcode) | ||
| 2967 | |.endif | 2965 | |.endif |
| 2968 | | | 2966 | | |
| 2969 | |//----------------------------------------------------------------------- | 2967 | |//----------------------------------------------------------------------- |