From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id C2CEF68CAE8; Tue, 3 Oct 2023 21:55:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C2CEF68CAE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1696359328; bh=Os4abPr0h5em8N9uDX514q5iU/tSl6HWdSx4uP9bzys=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=y+B5eAWMhNcEw8KRFZabWQ4Ofkm81z+6qQ4t6FIKdWMw5hgFGiXq+Wegx/fgsstCf 63RsHkEJx0LtsxuFuhFgkHHZc+laF11mCrd9vC7nX0/pya7RWvNPiahQV94EnJP9PU BWAp/60eXg22bQ8fKN43V3Nm62Xy5wIthsusNVqk= Received: from smtp58.i.mail.ru (smtp58.i.mail.ru [95.163.41.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 80F4F68CACB for ; Tue, 3 Oct 2023 21:55:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 80F4F68CACB Received: by smtp58.i.mail.ru with esmtpa (envelope-from ) id 1qnkYI-00E2KC-26; Tue, 03 Oct 2023 21:55:27 +0300 Message-ID: Date: Tue, 3 Oct 2023 21:55:26 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: Maxim Kokryashkin , tarantool-patches@dev.tarantool.org, skaplun@tarantool.org References: <962014531f23bc9fdad79fbf9b7064a75a6a6c5d.1695968227.git.m.kokryashkin@tarantool.org> In-Reply-To: <962014531f23bc9fdad79fbf9b7064a75a6a6c5d.1695968227.git.m.kokryashkin@tarantool.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD94A796AF4779ECFCE1BE00F0E5C5A8D12284DD5A837512F7F182A05F538085040CFBFCBA479F62F86FD911CFD272DF27446D9A8D7D6F2885189BE3B7052EC5403 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE712EB008F780777E9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006371005780D56A98C20EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BE5CCB53A13BC8DBA1E6C12BAAA6A90A9DA9E0D59411E6389CC7F00164DA146DAFE8445B8C89999728AA50765F7900637E603D20A273AEC4F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC85FF72824B19451C6F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C2A336C6518635091302FCEF25BFAB3454AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3DF404FCFBB7C2CD3BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7CD707F342D9BDC98731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5EC71AC1586FCECB0A41C4DA0E88AC37F411A8D1EFCC30483F87CCE6106E1FC07E67D4AC08A07B9B02A336C6518635091CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF4A0FA5B6A11972080DEC43765E19254A0DCDA922584AB6C12A443C0F1D10AC9D0AA6441730D2A0F0CC231B5D63B17C6B73186847B9CA324B5AE8F71366355BBFA74DFFEFA5DC0E7F02C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojH0UbTrDsBkBZHrU+GXEL9g== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458E083F2A0290A3A75C32FE467CC8BF1DEDB6346839D2957A6282EC151BADDC1D3523A6D01B4765B2DFB59E2DDD9FE06B14FA522850F29BC30B0DAF586E7D11B3E67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit v2 2/5] Revert "Update cur_L on exceptional path" X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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.