From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: KONRAD Frederic <frederic.konrad@adacore.com>,
qemu-devel@nongnu.org, qemu-trivial@nongnu.org
Cc: Laurent Vivier <laurent@vivier.eu>
Subject: Re: [Qemu-devel] [PATCH] target/m68k/fpu_helper.c: rename the access arguments
Date: Thu, 12 Sep 2019 16:32:42 +0200 [thread overview]
Message-ID: <ca55df80-6461-9650-f2e4-b2136d54adc3@redhat.com> (raw)
In-Reply-To: <1568296920-29939-1-git-send-email-frederic.konrad@adacore.com>
On 9/12/19 4:02 PM, KONRAD Frederic wrote:
> 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.
access() is not your friend... this reminds me of
commit 05e015f73c3b5c50c237d3d8e555e25cfa543a5c
Author: KONRAD Frederic <frederic.konrad@adacore.com>
Date: Thu Sep 21 12:04:20 2017 +0200
memory: avoid a name clash with access macro
This avoids a name clash with the access macro on windows 64:
make
CHK version_gen.h
CC aarch64-softmmu/memory.o
/home/konrad/qemu/memory.c: In function 'access_with_adjusted_size':
/home/konrad/qemu/memory.c:591:73: error: macro "access" passed 7
arguments, \
but takes just 2
(size - access_size - i) * 8, access_mask, attrs);
^
>
> 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>
> ---
> 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;
> }
> }
>
next prev parent reply other threads:[~2019-09-12 14:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 14:02 [Qemu-devel] [PATCH] target/m68k/fpu_helper.c: rename the access arguments KONRAD Frederic
2019-09-12 14:32 ` Philippe Mathieu-Daudé [this message]
2019-09-12 14:35 ` KONRAD Frederic
2019-09-12 17:08 ` Laurent Vivier
2019-09-19 10:12 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
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=ca55df80-6461-9650-f2e4-b2136d54adc3@redhat.com \
--to=philmd@redhat.com \
--cc=frederic.konrad@adacore.com \
--cc=laurent@vivier.eu \
--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).