[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 4/8] target/m68k/fpu_helper.c: rename the access ar
From: |
Laurent Vivier |
Subject: |
[Qemu-trivial] [PULL 4/8] target/m68k/fpu_helper.c: rename the access arguments |
Date: |
Thu, 19 Sep 2019 15:54:39 +0200 |
From: KONRAD Frederic <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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 9b039c856df8..4137542ec03b 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;
}
}
--
2.21.0
- [Qemu-trivial] [PULL 0/8] Trivial branch patches, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 1/8] vfio: fix a typo, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 6/8] Fix cacheline detection on FreeBSD/powerpc., Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 8/8] configure: Add xkbcommon configure options, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 4/8] target/m68k/fpu_helper.c: rename the access arguments,
Laurent Vivier <=
- [Qemu-trivial] [PULL 5/8] build: Don't ignore qapi-visit-core.c, Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 3/8] Replace '-machine accel=xyz' with '-accel xyz', Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 7/8] kvm: Fix typo in header of kvm_device_access(), Laurent Vivier, 2019/09/19
- [Qemu-trivial] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h", Laurent Vivier, 2019/09/19
- Re: [Qemu-devel] [PULL 0/8] Trivial branch patches, Peter Maydell, 2019/09/20