From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <max.kokryashkin@gmail.com>,
tarantool-patches@dev.tarantool.org, skaplun@tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit v2 2/5] Revert "Update cur_L on exceptional path"
Date: Tue, 3 Oct 2023 21:55:26 +0300 [thread overview]
Message-ID: <d9efe5bd-0c07-9fd2-81a5-ea3cdd96c992@tarantool.org> (raw)
In-Reply-To: <962014531f23bc9fdad79fbf9b7064a75a6a6c5d.1695968227.git.m.kokryashkin@tarantool.org>
On 9/29/23 09:20, Maxim Kokryashkin wrote:
> 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.
Ditto.
> 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.
next prev parent reply other threads:[~2023-10-03 18:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 6:20 [Tarantool-patches] [PATCH luajit v2 0/5] Fix error-throwing on an incorrect coroutine Maxim Kokryashkin via Tarantool-patches
2023-09-29 6:20 ` [Tarantool-patches] [PATCH luajit v2 1/5] Revert "Fix cur_L tracking on exceptional path" Maxim Kokryashkin via Tarantool-patches
2023-10-03 18:54 ` Sergey Bronnikov via Tarantool-patches
2023-10-04 11:27 ` Maxim Kokryashkin via Tarantool-patches
2023-10-06 8:28 ` Sergey Bronnikov via Tarantool-patches
2023-10-10 8:19 ` Sergey Kaplun via Tarantool-patches
2023-09-29 6:20 ` [Tarantool-patches] [PATCH luajit v2 2/5] Revert "Update cur_L " Maxim Kokryashkin via Tarantool-patches
2023-10-03 18:55 ` Sergey Bronnikov via Tarantool-patches [this message]
2023-10-04 11:27 ` Maxim Kokryashkin via Tarantool-patches
2023-10-06 8:28 ` Sergey Bronnikov via Tarantool-patches
2023-10-10 8:20 ` Sergey Kaplun via Tarantool-patches
2023-09-29 6:20 ` [Tarantool-patches] [PATCH luajit v2 3/5] Revert "arm64: fix cur_L restoration on error throw" Maxim Kokryashkin via Tarantool-patches
2023-10-06 8:29 ` Sergey Bronnikov via Tarantool-patches
2023-10-10 8:21 ` Sergey Kaplun via Tarantool-patches
2023-09-29 6:20 ` [Tarantool-patches] [PATCH luajit v2 4/5] Revert "Update cur_L on exceptional path (arm)" Maxim Kokryashkin via Tarantool-patches
2023-10-06 8:29 ` Sergey Bronnikov via Tarantool-patches
2023-10-10 8:21 ` Sergey Kaplun via Tarantool-patches
2023-09-29 6:20 ` [Tarantool-patches] [PATCH luajit v2 5/5] Restore cur_L for specific Lua/C API use case Maxim Kokryashkin via Tarantool-patches
2023-10-03 19:16 ` Sergey Bronnikov via Tarantool-patches
2023-10-04 11:26 ` Maxim Kokryashkin via Tarantool-patches
2023-10-06 8:30 ` Sergey Bronnikov via Tarantool-patches
2023-10-10 8:57 ` Sergey Kaplun via Tarantool-patches
2023-10-13 11:50 ` Maxim Kokryashkin via Tarantool-patches
2023-10-22 1:58 ` Sergey Kaplun via Tarantool-patches
2023-11-07 13:31 ` [Tarantool-patches] [PATCH luajit v2 0/5] Fix error-throwing on an incorrect coroutine Igor Munkin 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=d9efe5bd-0c07-9fd2-81a5-ea3cdd96c992@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 v2 2/5] 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