From nobody Mon Feb 9 17:25:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635358088; cv=none; d=zohomail.com; s=zohoarc; b=iiJg6gYwJdqBgfnfLF5DcNOcSSoCIsOcCn9kfBUtShVDVeA3Ryfb4Gd/p4elbSOeHmcIUVyo2/a5K0c9XWAM4D261WQXA8rJELfn14N9Z68e58nh7I/uyGJs8D0GA7stPl9S9KkzhZI2AZakX7tvpO8Nj+xGCxkeBunNBb2B+Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635358088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ymlJE+GgnCMHylvq3NV60YJEP1f57Nhad4Tc/Po/blQ=; b=ZljvrdaPbr6azyImJ7RKpUryinwZCG+RVtzJ9SWdao01qFHLkeokMBYMpUGiSxLpqWdknXPS3cG8jbRWHp6+SUnA2SJrhpD7XLG0GMTwR8Zkh0qKJU8l6KggcUrEo6jKb90rnsFJNJCSbQx3gv8oOEQVjczhb3tqI3m0ahVbxwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1635358088239353.01434464013334; Wed, 27 Oct 2021 11:08:08 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id c71-20020a1c9a4a000000b0032cdcc8cbafso217281wme.3 for ; Wed, 27 Oct 2021 11:08:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id o40sm3953683wms.10.2021.10.27.11.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ymlJE+GgnCMHylvq3NV60YJEP1f57Nhad4Tc/Po/blQ=; b=m2Ct4wu9Nrh5k5EtMIRE3Yw41/kbi8RuMqEPaTKGGw96Ujsv/qgGPIhBKUEUfTEKwZ 5fnq5ZC+gmMRSi+sbWwpxywOYX0mfhmwoJzAb8Tbn4N2GI7CVPq0p9raAgSbjKWbpc1g KLhuiODM8Kfgn0thP8pYDVFx6fYEZH44xfPTctfNlcq1pgGK1YRC1NJ5ysDhtzoERyAW TiLMJ4Et3Y+6M2I+HmDXy2Fhw1IEBai2UAK5+oNVGmiwQ3X4QoGR/3LCo/yddMiCN3Sh Y64HXDB2/Q2efqtnlyoQrbMJD90a/+lmIfyWXKrAsUbTd7Ownu8MrdTIVDh+m8+NEXhi Ediw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ymlJE+GgnCMHylvq3NV60YJEP1f57Nhad4Tc/Po/blQ=; b=JTPu5Dxq5XZbV0T0DowVKPT+INn+il/pi34GkluY1DS4KUA4d14SGvMtOXdeiIz7zY Fi9mbIROmFzPns4lqK37N0+gIufGKes9IVTmSTTsntP2AG+06VT+XhZaBHyB9AQqUUIW jQVyTxqFY7FtPLx4tUvIyJxPnI0J0XRUrCI79ma+Jhd/VOPR8Z5TgijqVqO1aiaaf8NN WmHuPZ05Aakg6ToH+c4dfDpFGqNFjhqnU+iFf1ywDFi9ZfmyPTgENVW7OyZVKWk8ysgK yKyiZflxBvV0AYgDWQYavlEBWr5YFgqqGQu/Gtfq7PFvSoygR5+24cuYDCPO6E1iod9W M6kw== X-Gm-Message-State: AOAM5316IOM2Tuva9XzcImpjb10gWMk/+rFJY+ZLxZUtNd+mOaw0w1pD 46aCyGuInwU8JK/NF6b5KXE= X-Google-Smtp-Source: ABdhPJzsj4B/TOXdfyKGCLvieB/apPI0e4GwsCQHDVBCrYLTbrN7MSF7hfVdWxnsFsJp3C+MbBx9ZA== X-Received: by 2002:a05:600c:1989:: with SMTP id t9mr7304688wmq.48.1635358086155; Wed, 27 Oct 2021 11:08:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , Richard Henderson Subject: [PATCH v2 07/32] target/mips: Rename sa16 -> sa, bz_df -> bz -> bz_v Date: Wed, 27 Oct 2021 20:07:05 +0200 Message-Id: <20211027180730.1551932-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027180730.1551932-1-f4bug@amsat.org> References: <20211027180730.1551932-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635358089770100001 This 'shift amount' format is not always 16-bit, so name it generically as 'sa'. This will help to unify the various arg_msa decodetree generated structures. Rename the @bz format -> @bz_v (specific @bz with df=3D3) and @bz_df -> @bz (generic @bz). Since we modify &msa_bz, re-align its arguments, so the other structures added in the following commits stay visually aligned. Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/msa.decode | 15 +++++++-------- target/mips/tcg/msa_translate.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 74d99f6862c..56419a24eb9 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -13,19 +13,18 @@ =20 &r rs rt rd sa =20 -&msa_bz df wt s16 +&msa_bz df wt sa =20 @lsa ...... rs:5 rt:5 rd:5 ... sa:2 ...... &r -@bz ...... ... .. wt:5 s16:16 &msa_bz df=3D3 -@bz_df ...... ... df:2 wt:5 s16:16 &msa_bz +@bz_v ...... ... .. wt:5 sa:16 &msa_bz df=3D3 +@bz ...... ... df:2 wt:5 sa:16 &msa_bz =20 LSA 000000 ..... ..... ..... 000 .. 000101 @lsa DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa =20 -BZ_V 010001 01011 ..... ................ @bz -BNZ_V 010001 01111 ..... ................ @bz - -BZ_x 010001 110 .. ..... ................ @bz_df -BNZ_x 010001 111 .. ..... ................ @bz_df +BZ_V 010001 01011 ..... ................ @bz_v +BNZ_V 010001 01111 ..... ................ @bz_v +BZ 010001 110 .. ..... ................ @bz +BNZ 010001 111 .. ..... ................ @bz =20 MSA 011110 -------------------------- diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 41ade61879e..0aaf441f359 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -338,7 +338,7 @@ static void gen_check_zero_element(TCGv tresult, uint8_= t df, uint8_t wt, tcg_temp_free_i64(t1); } =20 -static bool gen_msa_BxZ_V(DisasContext *ctx, int wt, int s16, TCGCond cond) +static bool gen_msa_BxZ_V(DisasContext *ctx, int wt, int sa, TCGCond cond) { TCGv_i64 t0; =20 @@ -356,7 +356,7 @@ static bool gen_msa_BxZ_V(DisasContext *ctx, int wt, in= t s16, TCGCond cond) tcg_gen_trunc_i64_tl(bcond, t0); tcg_temp_free_i64(t0); =20 - ctx->btarget =3D ctx->base.pc_next + (s16 << 2) + 4; + ctx->btarget =3D ctx->base.pc_next + (sa << 2) + 4; =20 ctx->hflags |=3D MIPS_HFLAG_BC; ctx->hflags |=3D MIPS_HFLAG_BDS32; @@ -366,15 +366,15 @@ static bool gen_msa_BxZ_V(DisasContext *ctx, int wt, = int s16, TCGCond cond) =20 static bool trans_BZ_V(DisasContext *ctx, arg_msa_bz *a) { - return gen_msa_BxZ_V(ctx, a->wt, a->s16, TCG_COND_EQ); + return gen_msa_BxZ_V(ctx, a->wt, a->sa, TCG_COND_EQ); } =20 static bool trans_BNZ_V(DisasContext *ctx, arg_msa_bz *a) { - return gen_msa_BxZ_V(ctx, a->wt, a->s16, TCG_COND_NE); + return gen_msa_BxZ_V(ctx, a->wt, a->sa, TCG_COND_NE); } =20 -static bool gen_msa_BxZ(DisasContext *ctx, int df, int wt, int s16, bool i= f_not) +static bool gen_msa_BxZ(DisasContext *ctx, int df, int wt, int sa, bool if= _not) { if (!check_msa_enabled(ctx)) { return true; @@ -387,21 +387,21 @@ static bool gen_msa_BxZ(DisasContext *ctx, int df, in= t wt, int s16, bool if_not) =20 gen_check_zero_element(bcond, df, wt, if_not ? TCG_COND_EQ : TCG_COND_= NE); =20 - ctx->btarget =3D ctx->base.pc_next + (s16 << 2) + 4; + ctx->btarget =3D ctx->base.pc_next + (sa << 2) + 4; ctx->hflags |=3D MIPS_HFLAG_BC; ctx->hflags |=3D MIPS_HFLAG_BDS32; =20 return true; } =20 -static bool trans_BZ_x(DisasContext *ctx, arg_msa_bz *a) +static bool trans_BZ(DisasContext *ctx, arg_msa_bz *a) { - return gen_msa_BxZ(ctx, a->df, a->wt, a->s16, false); + return gen_msa_BxZ(ctx, a->df, a->wt, a->sa, false); } =20 -static bool trans_BNZ_x(DisasContext *ctx, arg_msa_bz *a) +static bool trans_BNZ(DisasContext *ctx, arg_msa_bz *a) { - return gen_msa_BxZ(ctx, a->df, a->wt, a->s16, true); + return gen_msa_BxZ(ctx, a->df, a->wt, a->sa, true); } =20 static void gen_msa_i8(DisasContext *ctx) --=20 2.31.1