OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

Browse Source 
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.konrad@adacore.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1568296920-29939-1-git-send-email-frederic.konrad@adacore.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
KONRAD Frederic 2019-09-12 16:02:00 +02:00 committed by Laurent Vivier
parent 976e8c5414
commit 198d7003f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/m68k/fpu_helper.c
View File

@ -396,14 +396,14 @@ typedef int (*float_access)(CPUM68KState *env, uint32_t addr, FPReg *fp,
uintptr_t ra); uintptr_t ra);
static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t mask, static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t mask,
float_access access) float_access access_fn)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
int i, size; int i, size;
for (i = 7; i >= 0; i--, mask <<= 1) { for (i = 7; i >= 0; i--, mask <<= 1) {
if (mask & 0x80) { if (mask & 0x80) {
size = access(env, addr, &env->fregs[i], ra); size = access_fn(env, addr, &env->fregs[i], ra);
if ((mask & 0xff) != 0x80) { if ((mask & 0xff) != 0x80) {
addr -= size; 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, static uint32_t fmovem_postinc(CPUM68KState *env, uint32_t addr, uint32_t mask,
float_access access) float_access access_fn)
{ {
uintptr_t ra = GETPC(); uintptr_t ra = GETPC();
int i, size; int i, size;
for (i = 0; i < 8; i++, mask <<= 1) { for (i = 0; i < 8; i++, mask <<= 1) {
if (mask & 0x80) { if (mask & 0x80) {
size = access(env, addr, &env->fregs[i], ra); size = access_fn(env, addr, &env->fregs[i], ra);
addr += size; addr += size;
} }
} }