Le 12/09/2019 à 16:02, KONRAD Frederic a écrit : > 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. > > Tested with: > ./configure --target-list=m68k-softmmu > make -j8 > > Signed-off-by: KONRAD Frederic <frederic.kon...@adacore.com> > --- > target/m68k/fpu_helper.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c > index 9b039c8..4137542 100644 > --- a/target/m68k/fpu_helper.c > +++ b/target/m68k/fpu_helper.c > @@ -396,14 +396,14 @@ typedef int (*float_access)(CPUM68KState *env, uint32_t > addr, FPReg *fp, > uintptr_t ra); > > static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t > mask, > - float_access access) > + float_access access_fn) > { > uintptr_t ra = GETPC(); > int i, size; > > for (i = 7; i >= 0; i--, mask <<= 1) { > if (mask & 0x80) { > - size = access(env, addr, &env->fregs[i], ra); > + size = access_fn(env, addr, &env->fregs[i], ra); > if ((mask & 0xff) != 0x80) { > addr -= size; > } > @@ -414,14 +414,14 @@ static uint32_t fmovem_predec(CPUM68KState *env, > uint32_t addr, uint32_t mask, > } > > static uint32_t fmovem_postinc(CPUM68KState *env, uint32_t addr, uint32_t > mask, > - float_access access) > + float_access access_fn) > { > uintptr_t ra = GETPC(); > int i, size; > > for (i = 0; i < 8; i++, mask <<= 1) { > if (mask & 0x80) { > - size = access(env, addr, &env->fregs[i], ra); > + size = access_fn(env, addr, &env->fregs[i], ra); > addr += size; > } > } >
Applied to my trivial-patches branch. Thanks, Laurent