Re: [Qemu-trivial] [Qemu-devel] [PATCH] target/m68k/fpu_helper.c: rename the access arguments

[KONRAD Frederic]

Le 9/12/19 à 4:32 PM, Philippe Mathieu-Daudé a écrit :
> On 9/12/19 4:02 PM, KONRAD Frederic wrote:
> > The "access" arguments clash with a macro under Windows with MinGW:
> >    CC      m68k-softmmu/target/m68k/fpu_helper.o
> >    target/m68k/fpu_helper.c: In function 'fmovem_predec':
> >    target/m68k/fpu_helper.c:405:56: error: macro "access" passed 4 arguments,
> >     but takes just 2
> >                 size = access(env, addr, &env->fregs[i], ra);
> >
> > So this renames them access_fn.
>
> access() is not your friend... this reminds me of
>
> commit 05e015f73c3b5c50c237d3d8e555e25cfa543a5c
> Author: KONRAD Frederic <address@hidden>
> Date:   Thu Sep 21 12:04:20 2017 +0200
>
>      memory: avoid a name clash with access macro
>
>      This avoids a name clash with the access macro on windows 64:

True, I didn't catch this one at the time because we didn't build m68k.

>      make
>              CHK version_gen.h
>        CC      aarch64-softmmu/memory.o
>      /home/konrad/qemu/memory.c: In function 'access_with_adjusted_size':
>      /home/konrad/qemu/memory.c:591:73: error: macro "access" passed 7
> arguments, \
>                       but takes just 2
>                       (size - access_size - i) * 8, access_mask, attrs);
>                                                                       ^
> > Tested with:
> >   ./configure --target-list=m68k-softmmu
> >   make -j8
> >
> > Signed-off-by: KONRAD Frederic <address@hidden>
>
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

Thanks!

Cheers,
Fred