Tarantool development patches archive
 help / color / mirror / Atom feed
From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: "Sergey Bronnikov" <sergeyb@tarantool.org>
Cc: "Maxim Kokryashkin" <max.kokryashkin@gmail.com>,
	tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches]  [PATCH luajit v2 1/5] Revert "Fix cur_L tracking on exceptional path"
Date: Wed, 04 Oct 2023 14:27:22 +0300	[thread overview]
Message-ID: <1696418842.445789488@f488.i.mail.ru> (raw)
In-Reply-To: <9fa6ba12-517a-0250-502f-5485ac580171@tarantool.org>

[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]


Hi, Sergey!
Thanks for the review!
Fixed your comment, branch is force-pushed.
 
 
--
Best regards,
Maxim Kokryashkin
 
  
>Вторник, 3 октября 2023, 21:54 +03:00 от Sergey Bronnikov <sergeyb@tarantool.org>:
> 
>Hi, Max
>
>please see my comment below
>
>
>On 9/29/23 09:20, Maxim Kokryashkin wrote:
>> This reverts commit 97699d9ee2467389b6aea21a098e38aff3469b5f.
>>
>> As was mentioned in tarantool/tarantool#6189, throwing an error
>> not on the currently executed coroutine is a violation of the
>> Lua/C API.
>
>Could you add a source of this statement?
>
>There is a section "3.6 – Error Handling in C" in Lua 5.1 Reference Manual,
>
>but there is no such statement there [1]. Could you clarify?
>
>1.  https://www.lua.org/manual/5.1/manual.html
>
>> 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 | 9 ++++-----
>> src/vm_x86.dasc | 8 ++++----
>> 2 files changed, 8 insertions(+), 9 deletions(-)
>>
>> diff --git a/src/vm_x64.dasc b/src/vm_x64.dasc
>> index 09bf67e5..116716ac 100644
>> --- a/src/vm_x64.dasc
>> +++ b/src/vm_x64.dasc
>> @@ -533,11 +533,11 @@ static void build_subroutines(BuildCtx *ctx)
>> | mov eax, CARG2d // Error return status for vm_pcall.
>> | mov rsp, CARG1
>> |->vm_unwind_c_eh: // Landing pad for external unwinder.
>> - | mov L:DISPATCH, SAVE_L
>> - | mov GL:RB, L:DISPATCH->glref
>> - | mov GL:RB->cur_L, L:DISPATCH
>> + | 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, L:DISPATCH->glref // Setup pointer to dispatch table.
>> + | mov DISPATCH, GL:RB // Setup pointer to dispatch table.
>> | add DISPATCH, GG_G2DISP
>> | jmp ->vm_leave_unw
>> |
>> @@ -561,7 +561,6 @@ static void build_subroutines(BuildCtx *ctx)
>> | add DISPATCH, GG_G2DISP
>> | mov PC, [BASE-8] // Fetch PC of previous frame.
>> | mov_false RA
>> - | mov [DISPATCH+DISPATCH_GL(cur_L)], L:RB
>> | mov RB, [BASE]
>> | mov [BASE-16], RA // Prepend false to error message.
>> | mov [BASE-8], RB
>> diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc
>> index f16ade1a..e3fbf751 100644
>> --- a/src/vm_x86.dasc
>> +++ b/src/vm_x86.dasc
>> @@ -681,11 +681,11 @@ static void build_subroutines(BuildCtx *ctx)
>> |.endif
>> |.endif
>> |->vm_unwind_c_eh: // Landing pad for external unwinder.
>> - | mov L:DISPATCH, SAVE_L
>> - | mov GL:RB, L:DISPATCH->glref
>> - | mov dword GL:RB->cur_L, L:DISPATCH
>> + | 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, L:DISPATCH->glref // Setup pointer to dispatch table.
>> + | mov DISPATCH, GL:RB // Setup pointer to dispatch table.
>> | add DISPATCH, GG_G2DISP
>> | jmp ->vm_leave_unw
>> |
 

[-- Attachment #2: Type: text/html, Size: 3799 bytes --]

  reply	other threads:[~2023-10-04 11:27 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 [this message]
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
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=1696418842.445789488@f488.i.mail.ru \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=m.kokryashkin@tarantool.org \
    --cc=max.kokryashkin@gmail.com \
    --cc=sergeyb@tarantool.org \
    --subject='Re: [Tarantool-patches]  [PATCH luajit v2 1/5] Revert "Fix cur_L tracking 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