From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Subject: [Tarantool-patches] [PATCH luajit 2/4] Revert "Update cur_L on exceptional path" Date: Thu, 28 Sep 2023 20:08:47 +0300 [thread overview] Message-ID: <962014531f23bc9fdad79fbf9b7064a75a6a6c5d.1695920642.git.m.kokryashkin@tarantool.org> (raw) In-Reply-To: <cover.1695920642.git.m.kokryashkin@tarantool.org> This reverts commit ed412cd9f55fe87fd32a69c86e1732690fc5c1b0. As was mentioned in tarantool/tarantool#6189, throwing an error not on the currently executed coroutine is a violation of the Lua/C API. This patch is a part of the patchset that supports this violation and is reverted because of it. Part of tarantool/tarantool#6323 --- src/vm_x64.dasc | 1 - src/vm_x86.dasc | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/vm_x64.dasc b/src/vm_x64.dasc index 116716ac..399dfcbf 100644 --- a/src/vm_x64.dasc +++ b/src/vm_x64.dasc @@ -535,7 +535,6 @@ static void build_subroutines(BuildCtx *ctx) |->vm_unwind_c_eh: // Landing pad for external unwinder. | mov L:RB, SAVE_L | mov GL:RB, L:RB->glref - | mov [GL:RB->cur_L], L:RB | mov dword GL:RB->vmstate, ~LJ_VMST_CFUNC | mov DISPATCH, GL:RB // Setup pointer to dispatch table. | add DISPATCH, GG_G2DISP diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index e3fbf751..9fa9a3f7 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc @@ -683,7 +683,6 @@ static void build_subroutines(BuildCtx *ctx) |->vm_unwind_c_eh: // Landing pad for external unwinder. | mov L:RB, SAVE_L | mov GL:RB, L:RB->glref - | mov dword GL:RB->cur_L, L:RB | mov dword GL:RB->vmstate, ~LJ_VMST_CFUNC | mov DISPATCH, GL:RB // Setup pointer to dispatch table. | add DISPATCH, GG_G2DISP @@ -719,7 +718,6 @@ static void build_subroutines(BuildCtx *ctx) | add DISPATCH, GG_G2DISP | mov PC, [BASE-4] // Fetch PC of previous frame. | mov dword [BASE-4], LJ_TFALSE // Prepend false to error message. - | mov [DISPATCH+DISPATCH_GL(cur_L)], L:RB | // INTERP until jump to BC_RET* or return to C. | set_vmstate INTERP | jmp ->vm_returnc // Increments RD/MULTRES and returns. -- 2.42.0
next prev parent reply other threads:[~2023-09-28 17:09 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-28 17:08 [Tarantool-patches] [PATCH luajit 0/4] Fix error-throwing on an incorrect coroutine Maxim Kokryashkin via Tarantool-patches 2023-09-28 17:08 ` [Tarantool-patches] [PATCH luajit 1/4] Revert "Fix cur_L tracking on exceptional path" Maxim Kokryashkin via Tarantool-patches 2023-09-28 17:08 ` Maxim Kokryashkin via Tarantool-patches [this message] 2023-09-28 17:08 ` [Tarantool-patches] [PATCH luajit 3/4] Revert "Update cur_L on exceptional path (arm)" Maxim Kokryashkin via Tarantool-patches 2023-09-28 17:08 ` [Tarantool-patches] [PATCH luajit 4/4] Restore cur_L for specific Lua/C API use case Maxim Kokryashkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=962014531f23bc9fdad79fbf9b7064a75a6a6c5d.1695920642.git.m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 2/4] Revert "Update cur_L on exceptional path"' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox