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 50C366D60AF; Tue, 7 Nov 2023 14:15:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 50C366D60AF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1699355733; bh=xntsm9yNtaj+LwiZ66IGUIzBeQyw3bNDCJec/vqDthw=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=HMtd4Tgg9qutjy6DroU/xkV35WbCfIr7aAQXJxnbwRq1a1dNsSCA6hTzG2CpXWFdc DMosmL1D0kK3cIlgUm+sMOTCp/cLy3ajf7uAFRAh4CBNw0pUrf0JQ8ubnirUCIWStV Ovml0Zz6zD87bfKWzukbaSowVdXcHA4PaE6v7KWI= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D97CA6D6096 for ; Tue, 7 Nov 2023 14:15:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D97CA6D6096 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1r0K3Q-0000uO-1C; Tue, 07 Nov 2023 14:15:32 +0300 Date: Tue, 7 Nov 2023 14:10:59 +0300 To: Igor Munkin Message-ID: References: <20231107105418.18356-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9CDA3EE4AC542069D395AC74FA62DEBE1A85E743BFEE5863A182A05F5380850404C228DA9ACA6FE271861D9E02975B8006E0A78FA5CC77893B5BE52C6D31D08527AB4DD18C6112079 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77E216A0E97507353EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375CC217B55A7C05578638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8FFE3C199F24FED4E002C7AA9156EDF70117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18BDFBBEFFF4125B51D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269176DF2183F8FC7C0406C186E56A1B26068655334FD4449CB33AC447995A7AD18262FEC7FBD7D1F5BD5E8D9A59859A8B65B4C35AC65A386B3089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5509262C19684F6BF52056F3E1BD6B33E94C6C27787BA4A1BF87CCE6106E1FC07E67D4AC08A07B9B0735DFC8FA7AC1207CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFBF5CD947D535E347E5DF28765B9D6A96F4DBECC667DF0815ACFE88D1CFE67802B2CCF8B0FF448A892B33B16BC67043E09FB1365C001F12EF7B5319B7FF02B3A8E48CAC7CA610320002C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojoiosMWyUVRer3Zhom8myHA== X-DA7885C5: 44E9777EE0E790C8A1BF5C58B76451ECB09166080277B912F5DA7B89748F74BD262E2D401490A4A0DB037EFA58388B346E8BC1A9835FDE71 X-Mailru-Sender: 689FA8AB762F7393590D8C940224AE33E01A85E29C2498D5016B7D3CC57D68630FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED55FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] x64: Properly fix __call metamethod return dispatch. 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Igor! Thanks for the review! Fixed the nit and force-pushed the branch. On 07.11.23, Igor Munkin wrote: > Sergey, > > Thanks for the patch! LGTM as obvious, except the single nit regarding > the commit message. > > On 07.11.23, Sergey Kaplun wrote: > > From: Mike Pall > > > > Reported by Sergey Kaplun. > > > > (cherry-picked from commit d133d67c881f363f0b5584ebd21a965eb3435aa1) > > > > This patch is the follow-up for the commit > > 1672bdc0ffbee9f32fadb6943909d6af7eb9a7b1 ("x64: Fix __call metamethod > > return dispatch."). This patch uses the incorrect macro x64 (which is > > I don't get which one of the aforementioned patches is "this": *this* > one fixing the issue, or *that* one, that doesn't. Fixed to "That", as you suggested. Force-pushed the branch. > > > diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc > > index 9fa9a3f7..6a353796 100644 > > --- a/src/vm_x86.dasc > > +++ b/src/vm_x86.dasc > > @@ -1451,7 +1451,7 @@ static void build_subroutines(BuildCtx *ctx) > > | mov LFUNC:RB, [RA-8] > > | add NARGS:RD, 1 > > | // This is fragile. L->base must not move, KBASE must always be defined. > > - |.if x64 > > + |.if X64 > > Bonjour. Aah! Et bonjour mes nouveaux (espérons-le) amis ! > > > | cmp KBASEa, rdx // Continue with CALLT if flag set. > > |.else > > | cmp KBASE, BASE // Continue with CALLT if flag set. > > -- > > 2.42.0 > > > > -- > Best regards, > IM -- Best regards, Sergey Kaplun