From nobody Wed Nov 12 03:45:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1568298147; cv=none; d=zoho.com; s=zohoarc; b=RbibMnNFHqlJbWWbsPEEryV87Am15VClxfMdqmdkZ+sIGbxMYjwsxBjaFODTU+fPaG2YQlzd4GzPjuNIWl27TXAGT++0u6PU1e+REwWGaBSdAPF/SiESzXsYo4Z922GZit73OzIDXWmDB5ipWuivFNFioHVwMTQRYmAh6ksVT+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568298147; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Bgkq2JKDooz/HAApmW7WJFRTR69opcR0bsWbt97vBjI=; b=BpQTAFLvzhITr3jNVXc42JXjxRCkccMCWqpsZmkcTQWRL2GGnTtfTwfyOOsVfCc3SyNX+4Lxc/PBkx3/vRrI+3XqdgxucY4JnQ5rkwZFc3QrfyclpY/gQC9pkjlcYSnDWYoyRuzCKw0CONXCD75VSoLLmGUlSL7R25AkGFSJy/8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568298147514422.44711480037904; Thu, 12 Sep 2019 07:22:27 -0700 (PDT) Received: from localhost ([::1]:35040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8PzN-0000Fd-R0 for importer@patchew.org; Thu, 12 Sep 2019 10:22:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42654) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Pft-0002aO-VM for qemu-devel@nongnu.org; Thu, 12 Sep 2019 10:02:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Pfs-0000i4-T9 for qemu-devel@nongnu.org; Thu, 12 Sep 2019 10:02:17 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:53956 helo=smtp.eu.adacore.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Pfs-0000hI-NX; Thu, 12 Sep 2019 10:02:16 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 0CEDE81549; Thu, 12 Sep 2019 16:02:15 +0200 (CEST) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8pIj6RhTj-Hn; Thu, 12 Sep 2019 16:02:14 +0200 (CEST) Received: from localhost.localdomain.localdomain (lfbn-tou-1-447-75.w86-206.abo.wanadoo.fr [86.206.4.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.eu.adacore.com (Postfix) with ESMTPSA id C77FA8138C; Thu, 12 Sep 2019 16:02:14 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at eu.adacore.com From: KONRAD Frederic To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Date: Thu, 12 Sep 2019 16:02:00 +0200 Message-Id: <1568296920-29939-1-git-send-email-frederic.konrad@adacore.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH] target/m68k/fpu_helper.c: rename the access arguments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: KONRAD Frederic , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D access(env, addr, &env->fregs[i], ra); So this renames them access_fn. Tested with: ./configure --target-list=3Dm68k-softmmu make -j8 Signed-off-by: KONRAD Frederic Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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); =20 static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t m= ask, - float_access access) + float_access access_fn) { uintptr_t ra =3D GETPC(); int i, size; =20 for (i =3D 7; i >=3D 0; i--, mask <<=3D 1) { if (mask & 0x80) { - size =3D access(env, addr, &env->fregs[i], ra); + size =3D access_fn(env, addr, &env->fregs[i], ra); if ((mask & 0xff) !=3D 0x80) { addr -=3D size; } @@ -414,14 +414,14 @@ static uint32_t fmovem_predec(CPUM68KState *env, uint= 32_t addr, uint32_t mask, } =20 static uint32_t fmovem_postinc(CPUM68KState *env, uint32_t addr, uint32_t = mask, - float_access access) + float_access access_fn) { uintptr_t ra =3D GETPC(); int i, size; =20 for (i =3D 0; i < 8; i++, mask <<=3D 1) { if (mask & 0x80) { - size =3D access(env, addr, &env->fregs[i], ra); + size =3D access_fn(env, addr, &env->fregs[i], ra); addr +=3D size; } } --=20 1.8.3.1