From nobody Wed May 8 01:34:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488558586518739.9772528917648; Fri, 3 Mar 2017 08:29:46 -0800 (PST) Received: from localhost ([::1]:58921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjq5Q-0002fN-7e for importer@patchew.org; Fri, 03 Mar 2017 11:29:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjq4f-0002cI-5H for qemu-devel@nongnu.org; Fri, 03 Mar 2017 11:28:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjq4c-0001lC-0c for qemu-devel@nongnu.org; Fri, 03 Mar 2017 11:28:57 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33618) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjq4b-0001kV-OP for qemu-devel@nongnu.org; Fri, 03 Mar 2017 11:28:53 -0500 Received: by mail-wm0-x243.google.com with SMTP id n11so3945886wma.0 for ; Fri, 03 Mar 2017 08:28:53 -0800 (PST) Received: from 640k.lan (94-36-245-171.adsl-ull.clienti.tiscali.it. [94.36.245.171]) by smtp.gmail.com with ESMTPSA id f67sm3640225wmd.0.2017.03.03.08.28.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 08:28:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=QYPMnthmJBTxu+AHjEsHVVrBv8yRmmLUOtbONnzHBpg=; b=dwxcpDsrl7im35PFi1oX7UEjpafXvQIGVuBx46EXdEhB/uUTCRWHekxSmdtrzuFFOS R4PJobtkNKYEHXkwJb5yliCSqKKyK5IAZdW8CXLq9CwLLhUwMFzMpn6gD2Wk0oBPKJjR byL2Net5CW2kbbBusQ2qO9VAZwKS797m7BFvoXTT/I39W/4CYbvf5rvGfQA+Qrpv8fO6 kg1xfIAN3zNB1Gw7wFlUgM7R0zoyQA7eRbEBvA64dzCrvDOxwna89VWskWD2anEOMhAb jlk1hLr3N2UHdYcyeaVcu/1zO50I8qTttoadSytEBWBNuSqPueNRB6Ch6RQvtZKf4cjv 7NKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=QYPMnthmJBTxu+AHjEsHVVrBv8yRmmLUOtbONnzHBpg=; b=ZB6oyZ3huaYSHiPyXq0tHQW6ZjSSUCCjccsCTOb4UuS/lvNli28oHhKUgagGH+GcDQ ppTl+uZTqr/NC68XXMi3KZri1dHhhXAa26WLqVbBm0rve19zLuazaSDoL0jH+lajpWG3 LuIRHfpMbLG4PxQhLHBMtaw1EL2m4vHQs0LvkPfenNbCRVlnqxmgBl56jEyXVYQiidOZ qBzzqW5qYgZxWdt9VwP/2OQiOIuDSP3gqZYt2NvEDkl2a2eU4+JZqdK+pQJQ+SIqzj+a BxhH+22O/o+y0JJ9CF1RIAh4E0GYzwRGjly9/+fr5VYkaDuaerQFN2WlEzLHgABeUEtS 4+sA== X-Gm-Message-State: AMke39lNxOQY+QYW9ibu8OcecmW6A/18HlTDWK2Q1qOpqSBmu+eRNRwIidcN/1OoAgcdGw== X-Received: by 10.28.6.210 with SMTP id 201mr3954069wmg.85.1488558532620; Fri, 03 Mar 2017 08:28:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 3 Mar 2017 17:28:48 +0100 Message-Id: <1488558530-21016-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH] hppa: avoid anonymous unions in designated initializers. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" These cause compilation failures on CentOS 6 or other operating systems with older GCCs. Cc: Richard Henderson Cc: Peter Maydell Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- Peter, please consider applying this as a build fix, because the centos6 docker target is broken. target/hppa/translate.c | 66 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 5d571f0..9e8c233 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -84,14 +84,14 @@ typedef struct DisasInsn { ExitStatus (*trans)(DisasContext *ctx, uint32_t insn, const struct DisasInsn *f); union { - void (*f_ttt)(TCGv, TCGv, TCGv); - void (*f_weww)(TCGv_i32, TCGv_env, TCGv_i32, TCGv_i32); - void (*f_dedd)(TCGv_i64, TCGv_env, TCGv_i64, TCGv_i64); - void (*f_wew)(TCGv_i32, TCGv_env, TCGv_i32); - void (*f_ded)(TCGv_i64, TCGv_env, TCGv_i64); - void (*f_wed)(TCGv_i32, TCGv_env, TCGv_i64); - void (*f_dew)(TCGv_i64, TCGv_env, TCGv_i32); - }; + void (*ttt)(TCGv, TCGv, TCGv); + void (*weww)(TCGv_i32, TCGv_env, TCGv_i32, TCGv_i32); + void (*dedd)(TCGv_i64, TCGv_env, TCGv_i64, TCGv_i64); + void (*wew)(TCGv_i32, TCGv_env, TCGv_i32); + void (*ded)(TCGv_i64, TCGv_env, TCGv_i64); + void (*wed)(TCGv_i32, TCGv_env, TCGv_i64); + void (*dew)(TCGv_i64, TCGv_env, TCGv_i32); + } f; } DisasInsn; =20 /* global register indexes */ @@ -1934,7 +1934,7 @@ static ExitStatus trans_log(DisasContext *ctx, uint32= _t insn, } tcg_r1 =3D load_gpr(ctx, r1); tcg_r2 =3D load_gpr(ctx, r2); - ret =3D do_log(ctx, rt, tcg_r1, tcg_r2, cf, di->f_ttt); + ret =3D do_log(ctx, rt, tcg_r1, tcg_r2, cf, di->f.ttt); return nullify_end(ctx, ret); } =20 @@ -2111,10 +2111,10 @@ static ExitStatus trans_ds(DisasContext *ctx, uint3= 2_t insn, static const DisasInsn table_arith_log[] =3D { { 0x08000240u, 0xfc00ffffu, trans_nop }, /* or x,y,0 */ { 0x08000240u, 0xffe0ffe0u, trans_copy }, /* or x,0,t */ - { 0x08000000u, 0xfc000fe0u, trans_log, .f_ttt =3D tcg_gen_andc_tl }, - { 0x08000200u, 0xfc000fe0u, trans_log, .f_ttt =3D tcg_gen_and_tl }, - { 0x08000240u, 0xfc000fe0u, trans_log, .f_ttt =3D tcg_gen_or_tl }, - { 0x08000280u, 0xfc000fe0u, trans_log, .f_ttt =3D tcg_gen_xor_tl }, + { 0x08000000u, 0xfc000fe0u, trans_log, .f.ttt =3D tcg_gen_andc_tl }, + { 0x08000200u, 0xfc000fe0u, trans_log, .f.ttt =3D tcg_gen_and_tl }, + { 0x08000240u, 0xfc000fe0u, trans_log, .f.ttt =3D tcg_gen_or_tl }, + { 0x08000280u, 0xfc000fe0u, trans_log, .f.ttt =3D tcg_gen_xor_tl }, { 0x08000880u, 0xfc000fe0u, trans_cmpclr }, { 0x08000380u, 0xfc000fe0u, trans_uxor }, { 0x08000980u, 0xfc000fa0u, trans_uaddcm }, @@ -3061,7 +3061,7 @@ static ExitStatus trans_fop_wew_0c(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D extract32(insn, 0, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_wew(ctx, rt, ra, di->f_wew); + return do_fop_wew(ctx, rt, ra, di->f.wew); } =20 static ExitStatus trans_fop_wew_0e(DisasContext *ctx, uint32_t insn, @@ -3069,7 +3069,7 @@ static ExitStatus trans_fop_wew_0e(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D assemble_rt64(insn); unsigned ra =3D assemble_ra64(insn); - return do_fop_wew(ctx, rt, ra, di->f_wew); + return do_fop_wew(ctx, rt, ra, di->f.wew); } =20 static ExitStatus trans_fop_ded(DisasContext *ctx, uint32_t insn, @@ -3077,7 +3077,7 @@ static ExitStatus trans_fop_ded(DisasContext *ctx, ui= nt32_t insn, { unsigned rt =3D extract32(insn, 0, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_ded(ctx, rt, ra, di->f_ded); + return do_fop_ded(ctx, rt, ra, di->f.ded); } =20 static ExitStatus trans_fop_wed_0c(DisasContext *ctx, uint32_t insn, @@ -3085,7 +3085,7 @@ static ExitStatus trans_fop_wed_0c(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D extract32(insn, 0, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_wed(ctx, rt, ra, di->f_wed); + return do_fop_wed(ctx, rt, ra, di->f.wed); } =20 static ExitStatus trans_fop_wed_0e(DisasContext *ctx, uint32_t insn, @@ -3093,7 +3093,7 @@ static ExitStatus trans_fop_wed_0e(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D assemble_rt64(insn); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_wed(ctx, rt, ra, di->f_wed); + return do_fop_wed(ctx, rt, ra, di->f.wed); } =20 static ExitStatus trans_fop_dew_0c(DisasContext *ctx, uint32_t insn, @@ -3101,7 +3101,7 @@ static ExitStatus trans_fop_dew_0c(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D extract32(insn, 0, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_dew(ctx, rt, ra, di->f_dew); + return do_fop_dew(ctx, rt, ra, di->f.dew); } =20 static ExitStatus trans_fop_dew_0e(DisasContext *ctx, uint32_t insn, @@ -3109,7 +3109,7 @@ static ExitStatus trans_fop_dew_0e(DisasContext *ctx,= uint32_t insn, { unsigned rt =3D extract32(insn, 0, 5); unsigned ra =3D assemble_ra64(insn); - return do_fop_dew(ctx, rt, ra, di->f_dew); + return do_fop_dew(ctx, rt, ra, di->f.dew); } =20 static ExitStatus trans_fop_weww_0c(DisasContext *ctx, uint32_t insn, @@ -3118,7 +3118,7 @@ static ExitStatus trans_fop_weww_0c(DisasContext *ctx= , uint32_t insn, unsigned rt =3D extract32(insn, 0, 5); unsigned rb =3D extract32(insn, 16, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_weww(ctx, rt, ra, rb, di->f_weww); + return do_fop_weww(ctx, rt, ra, rb, di->f.weww); } =20 static ExitStatus trans_fop_weww_0e(DisasContext *ctx, uint32_t insn, @@ -3127,7 +3127,7 @@ static ExitStatus trans_fop_weww_0e(DisasContext *ctx= , uint32_t insn, unsigned rt =3D assemble_rt64(insn); unsigned rb =3D assemble_rb64(insn); unsigned ra =3D assemble_ra64(insn); - return do_fop_weww(ctx, rt, ra, rb, di->f_weww); + return do_fop_weww(ctx, rt, ra, rb, di->f.weww); } =20 static ExitStatus trans_fop_dedd(DisasContext *ctx, uint32_t insn, @@ -3136,7 +3136,7 @@ static ExitStatus trans_fop_dedd(DisasContext *ctx, u= int32_t insn, unsigned rt =3D extract32(insn, 0, 5); unsigned rb =3D extract32(insn, 16, 5); unsigned ra =3D extract32(insn, 21, 5); - return do_fop_dedd(ctx, rt, ra, rb, di->f_dedd); + return do_fop_dedd(ctx, rt, ra, rb, di->f.dedd); } =20 static void gen_fcpy_s(TCGv_i32 dst, TCGv_env unused, TCGv_i32 src) @@ -3340,13 +3340,13 @@ static ExitStatus trans_xmpyu(DisasContext *ctx, ui= nt32_t insn, return nullify_end(ctx, NO_EXIT); } =20 -#define FOP_DED trans_fop_ded, .f_ded -#define FOP_DEDD trans_fop_dedd, .f_dedd +#define FOP_DED trans_fop_ded, .f.ded +#define FOP_DEDD trans_fop_dedd, .f.dedd =20 -#define FOP_WEW trans_fop_wew_0c, .f_wew -#define FOP_DEW trans_fop_dew_0c, .f_dew -#define FOP_WED trans_fop_wed_0c, .f_wed -#define FOP_WEWW trans_fop_weww_0c, .f_weww +#define FOP_WEW trans_fop_wew_0c, .f.wew +#define FOP_DEW trans_fop_dew_0c, .f.dew +#define FOP_WED trans_fop_wed_0c, .f.wed +#define FOP_WEWW trans_fop_weww_0c, .f.weww =20 static const DisasInsn table_float_0c[] =3D { /* floating point class zero */ @@ -3425,10 +3425,10 @@ static const DisasInsn table_float_0c[] =3D { #undef FOP_DEW #undef FOP_WED #undef FOP_WEWW -#define FOP_WEW trans_fop_wew_0e, .f_wew -#define FOP_DEW trans_fop_dew_0e, .f_dew -#define FOP_WED trans_fop_wed_0e, .f_wed -#define FOP_WEWW trans_fop_weww_0e, .f_weww +#define FOP_WEW trans_fop_wew_0e, .f.wew +#define FOP_DEW trans_fop_dew_0e, .f.dew +#define FOP_WED trans_fop_wed_0e, .f.wed +#define FOP_WEWW trans_fop_weww_0e, .f.weww =20 static const DisasInsn table_float_0e[] =3D { /* floating point class zero */ --=20 1.8.3.1