Commit 198d7003 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Laurent Vivier
Browse files

target/m68k/fpu_helper.c: rename the access arguments 



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: default avatarKONRAD Frederic <frederic.konrad@adacore.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <1568296920-29939-1-git-send-email-frederic.konrad@adacore.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 976e8c54

target/m68k/fpu_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

        }

    }