Вторник, 7 ноября 2023, 14:15 +03:00 от Sergey Kaplun <skaplun@tarantool.org>:
 

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 <mike>
> >
> > 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.

>

<snipped>

> > 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