From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [Qemu-devel] [PULL 4/8] target/m68k/fpu_helper.c: rename the access arguments
Date: Thu, 19 Sep 2019 15:54:39 +0200 [thread overview]
Message-ID: <20190919135443.15164-5-laurent@vivier.eu> (raw)
In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu>
From: KONRAD Frederic <frederic.konrad@adacore.com>
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>
---
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
next prev parent reply other threads:[~2019-09-19 14:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 13:54 [Qemu-devel] [PULL 0/8] Trivial branch patches Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 1/8] vfio: fix a typo Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h" Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 3/8] Replace '-machine accel=xyz' with '-accel xyz' Laurent Vivier
2019-09-19 13:54 ` Laurent Vivier [this message]
2019-09-19 13:54 ` [Qemu-devel] [PULL 5/8] build: Don't ignore qapi-visit-core.c Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 6/8] Fix cacheline detection on FreeBSD/powerpc Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 7/8] kvm: Fix typo in header of kvm_device_access() Laurent Vivier
2019-09-19 13:54 ` [Qemu-devel] [PULL 8/8] configure: Add xkbcommon configure options Laurent Vivier
2019-09-20 16:28 ` [Qemu-devel] [PULL 0/8] Trivial branch patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190919135443.15164-5-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=frederic.konrad@adacore.com \
--cc=mjt@tls.msk.ru \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).