From nobody Tue Feb 10 05:46:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610488514; cv=none; d=zohomail.com; s=zohoarc; b=SkhhxXzO1FHZutsUEhGqq3HJI+u21BOJ5FbzkzRCDRe9Xd0ZpM0ijWrbcMr/o2apN+7Od6IBz8zzBoKtNzfn7RxQvwYv7nBCNQSu5pT5xczx37GMhdkpJ/xpLcQbbNUqFqA2vqEN0XbR/Lh1b10GpzLTvtCNwH/0g+4IgRg3t7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610488514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R5+CptAzrxEHDBYh29wFpGC187htOzgdNCjnN5XvwCI=; b=C59hvssiSAFq+EvJPJ76iaLAq6PX4SC47hCxxPycRRPo1wlZgrJX8DBFhd0jI1FWXhTWMAWtdTZkLc614AtepCwJXUwyjs+MomthaUMwxqKDjuVtDdEcKk2Dcrq+zz2XxsN3ZT+zDeNmvGz+hCzuelLvWOTYH7TXLRSprVP8o0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1610488514945253.38644478762694; Tue, 12 Jan 2021 13:55:14 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id d13so4021619wrc.13 for ; Tue, 12 Jan 2021 13:55:14 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (190.red-83-57-173.dynamicip.rima-tde.net. [83.57.173.190]) by smtp.gmail.com with ESMTPSA id h16sm5609960wmb.41.2021.01.12.13.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 13:55:12 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=R5+CptAzrxEHDBYh29wFpGC187htOzgdNCjnN5XvwCI=; b=OCi/7PPdCubpE/c1YGbvItN8Lus43KTft0crVkPZEh3v+wKXkibv0r5G8DPThsMCiq bDHvi915BFBtMwWPJZsWs2ymeIB41zXtJBljhydP8+qZC+QuviOA+jT5CbNpxvt5yMf7 BdwyMkxNG+sjcuX8+rz2WJlqJHIABM+aPpkm90v1Z9VxM7LfXYQSDNBZBUzfEPZID7XW 7eFwb1Ny5LshEp3qnL47gmLQbCCQNIaJO5bYZlLEKfGu5iDDvKCgn0DaRsG1zQT7z4rh j4RxUyT8ycFgMxMxQdjTpV4Rc/D6j0sEJ2+lMo6BfauKrg/YQW5a/FVM4xR4gcIT6LTy yzTg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=R5+CptAzrxEHDBYh29wFpGC187htOzgdNCjnN5XvwCI=; b=m4gcQYOSkrKR2N7NjgC4gUXfqAtkSs7AaTdBt6rjVVkXju6oHzTB7J7vx4iWJeTBzs ETalRuYuHwaQH73taOi+9HKfqNh9RH6rZmCSX01rKjCJRl2cM8xusSSi1qPJCqZSuEk1 QkIzLP6/GEBuLHZE4VrSW8A2EUda3wZQf9lhOT1bw5sYFoze6nL85UWqBbp1E7frnDSI rZp4oTAeTOX1xWXCJb2rvaDUA6IzBHEh6Dj+dA+xu9XhrGJB0aDDU7K99UyRVaXpDPEd ShvWwOYr4tf+6Hm8RtEloKd1gnKyWWx5mhwgsh26OeHmserhTp3PstpmfWMbgAOWFqgv Vwxg== X-Gm-Message-State: AOAM530CNH5hBjD5P5Io0J+o3Tu1VpHg6ie+IV/KrrqWU378D+jTfSLV c9BjUhdS3I11dI7efHO7yvM= X-Google-Smtp-Source: ABdhPJzMBcnPXrKy4BIW6pIYL+mccqHozAO6UWN6KE1lFANP/0Mf+DjQqu0jAh2mUw8jI0x0vSwYmA== X-Received: by 2002:adf:8342:: with SMTP id 60mr842567wrd.140.1610488513085; Tue, 12 Jan 2021 13:55:13 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , Richard Henderson , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/6] target/mips: Re-introduce OPC_ADDUH_QB_DSP and OPC_MUL_PH_DSP Date: Tue, 12 Jan 2021 22:54:59 +0100 Message-Id: <20210112215504.2093955-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210112215504.2093955-1-f4bug@amsat.org> References: <20210112215504.2093955-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) There is no issue having multiple enum declarations with the same value. As we are going to remove the OPC_MULT_G_2E definition in few commits, restore the OPC_ADDUH_QB_DSP and OPC_MUL_PH_DSP definitions and use them where they belong. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson --- target/mips/translate.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index a2b3026132d..cbd152eff50 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -399,16 +399,14 @@ enum { OPC_ADDU_OB_DSP =3D 0x14 | OPC_SPECIAL3, OPC_ABSQ_S_PH_DSP =3D 0x12 | OPC_SPECIAL3, OPC_ABSQ_S_QH_DSP =3D 0x16 | OPC_SPECIAL3, - /* OPC_ADDUH_QB_DSP is same as OPC_MULT_G_2E. */ - /* OPC_ADDUH_QB_DSP =3D 0x18 | OPC_SPECIAL3, */ + OPC_ADDUH_QB_DSP =3D 0x18 | OPC_SPECIAL3, OPC_CMPU_EQ_QB_DSP =3D 0x11 | OPC_SPECIAL3, OPC_CMPU_EQ_OB_DSP =3D 0x15 | OPC_SPECIAL3, /* MIPS DSP GPR-Based Shift Sub-class */ OPC_SHLL_QB_DSP =3D 0x13 | OPC_SPECIAL3, OPC_SHLL_OB_DSP =3D 0x17 | OPC_SPECIAL3, /* MIPS DSP Multiply Sub-class insns */ - /* OPC_MUL_PH_DSP is same as OPC_ADDUH_QB_DSP. */ - /* OPC_MUL_PH_DSP =3D 0x18 | OPC_SPECIAL3, */ + OPC_MUL_PH_DSP =3D 0x18 | OPC_SPECIAL3, OPC_DPA_W_PH_DSP =3D 0x30 | OPC_SPECIAL3, OPC_DPAQ_W_QH_DSP =3D 0x34 | OPC_SPECIAL3, /* DSP Bit/Manipulation Sub-class */ @@ -566,7 +564,6 @@ enum { OPC_MULQ_S_PH =3D (0x1E << 6) | OPC_ADDU_QB_DSP, }; =20 -#define OPC_ADDUH_QB_DSP OPC_MULT_G_2E #define MASK_ADDUH_QB(op) (MASK_SPECIAL3(op) | (op & (0x1F << 6)= )) enum { /* MIPS DSP Arithmetic Sub-class */ @@ -22681,8 +22678,7 @@ static void gen_mipsdsp_arith(DisasContext *ctx, ui= nt32_t op1, uint32_t op2, gen_load_gpr(v2_t, v2); =20 switch (op1) { - /* OPC_MULT_G_2E is equal OPC_ADDUH_QB_DSP */ - case OPC_MULT_G_2E: + case OPC_ADDUH_QB_DSP: check_dsp_r2(ctx); switch (op2) { case OPC_ADDUH_QB: @@ -23376,11 +23372,7 @@ static void gen_mipsdsp_multiply(DisasContext *ctx= , uint32_t op1, uint32_t op2, gen_load_gpr(v2_t, v2); =20 switch (op1) { - /* - * OPC_MULT_G_2E, OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have - * the same mask and op1. - */ - case OPC_MULT_G_2E: + case OPC_MUL_PH_DSP: check_dsp_r2(ctx); switch (op2) { case OPC_MUL_PH: @@ -27337,7 +27329,7 @@ static void decode_opc_special3_legacy(CPUMIPSState= *env, DisasContext *ctx) * OPC_MULT_G_2E, OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have * the same mask and op1. */ - if ((ctx->insn_flags & ASE_DSP_R2) && (op1 =3D=3D OPC_MULT_G_2E)) { + if ((ctx->insn_flags & ASE_DSP_R2) && (op1 =3D=3D OPC_MUL_PH_DSP))= { op2 =3D MASK_ADDUH_QB(ctx->opcode); switch (op2) { case OPC_ADDUH_QB: --=20 2.26.2