From nobody Tue Feb 10 06:26:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1628283972; cv=none; d=zohomail.com; s=zohoarc; b=nhT4skrBvbqYL+zd1KWTss6I3rGYlBKW9rZA/2uWd0TnUTlC0X9npcWgZzhbCtCvEL0a7v7oyROVh8tYNVF6Ba+dQONjDE82eGdmnpxLuJkkiKQ3+raf3TGjPq7bAATg8asiKEhGDRSr0oug0KUexyg3M/635b5m80bp81IkxC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628283972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6SZML5P41Leg5fiH1VZakhfKR7iqv+jE35zozdqPu0Q=; b=YjwtEPxuGuCcFDJMvVPW9aW1KUmwYy0biceeI8kjmaHWvGk1N3IpKxoy1w7CYlcUNYrrtZP1inATAG91AAvYqA8P5upNeWfYlefqempzgeuAceLCiMgc//0fi9/Z7w85OnUAhCi+/L7YC9xDURmQUmV16MvH3PN8UX6ADFVuZZ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1628283972464273.3617599777949; Fri, 6 Aug 2021 14:06:12 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id d8so12635321wrm.4 for ; Fri, 06 Aug 2021 14:06:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id h9sm9333216wmb.35.2021.08.06.14.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 14:06:10 -0700 (PDT) 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=6SZML5P41Leg5fiH1VZakhfKR7iqv+jE35zozdqPu0Q=; b=Oq/AIUPthETedkPR1vYhAFmt0dOyu2Dsa8i9kJ7DrysdyAnZ9QLyH45EtEPqyf3fCA VwzscSd3nT8pblAH7Ou3hYfu0k+qeAy1cSUhTlDGxhmWWdBsslmL8sMt+0z9yLZyVxLr p+jvKH+JpeBQOD1BkHAsKP7cLxEGJes8YOTjRm/swpmkgy3xwohsClyiHVGJENvbOj9k 5qplNT9LIqsEFmH6Cv3XgUof6JFicmx4DzF3vi2Idrnx1twCLhKL833s/ji7wKEDRT2U BGEOI0APjna0MxPyCvjqDn9PV7/OjXe3XyNAsjirVHdyl6Gnmv2pigUgdcpEsdrCLer+ c8sg== 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=6SZML5P41Leg5fiH1VZakhfKR7iqv+jE35zozdqPu0Q=; b=IiFpR3NQNBo0/OqJ2VQFAZDrviH4I//3sV7V5/zfqHRaCFphTlsBoXnnzbfbj/Bebe OhGtFiibhB00Asy3w16uk/NYftN+Q2scuMUCJquLR+j5n+hNPFKI+H8NDON7c+GU1O13 3vuibS58iU0YUVtoqN+PxMihx8Zm1YgMM3w/IIx2hBhYuaQJCtjs+vzf2s9E3mjU0/cX x3RZ/NfYrVueGI3l35D4usCKGFf2z7ynVYK4AI9tgQI0T4Bvkq4MfBHkbBam4cu0sMAj sipplEQZ33WbIq5RwTJy7GI0Ay30KSQsAHOFw6cYY7uZce6Xw39K1qtRXKdiV5xOILqb flTA== X-Gm-Message-State: AOAM532I8jlEBvjYGwbw+bbIcjO5P5KK91wTWVc9J9af4tXSotPz68fP algsuxL1k6ELUgS26LoW1UQ= X-Google-Smtp-Source: ABdhPJzGI/uk3FcntvsA8ELqzmZCzabIsbOjbKAWo06OWP2ROzSiAOp+tpfYfIQrvA7ocD16SpNnNw== X-Received: by 2002:a05:6000:120f:: with SMTP id e15mr12616111wrx.399.1628283970520; Fri, 06 Aug 2021 14:06:10 -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: Aleksandar Rikalo , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Matheus Ferst , Richard Henderson Subject: [PATCH-for-6.2 v2 4/5] target/mips: Convert Vr54xx MUL* opcodes to decodetree Date: Fri, 6 Aug 2021 23:05:47 +0200 Message-Id: <20210806210548.8568-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210806210548.8568-1-f4bug@amsat.org> References: <20210806210548.8568-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: 1628283973260100001 Convert the following Integer Multiply-Accumulate opcodes: * MULHI Multiply and move HI * MULHIU Unsigned multiply and move HI * MULS Multiply, negate, and move LO * MULSHI Multiply, negate, and move HI * MULSHIU Unsigned multiply, negate, and move HI * MULSU Unsigned multiply, negate, and move LO Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/vr54xx.decode | 6 ++++++ target/mips/tcg/translate.c | 24 ------------------------ target/mips/tcg/vr54xx_translate.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/target/mips/tcg/vr54xx.decode b/target/mips/tcg/vr54xx.decode index 73778f101a5..79bb5175eab 100644 --- a/target/mips/tcg/vr54xx.decode +++ b/target/mips/tcg/vr54xx.decode @@ -11,7 +11,13 @@ =20 @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &r =20 +MULS 000000 ..... ..... ..... 00011011000 @rs_rt_rd +MULSU 000000 ..... ..... ..... 00011011001 @rs_rt_rd MACC 000000 ..... ..... ..... 00101011000 @rs_rt_rd MACCU 000000 ..... ..... ..... 00101011001 @rs_rt_rd +MULHI 000000 ..... ..... ..... 01001011000 @rs_rt_rd +MULHIU 000000 ..... ..... ..... 01001011001 @rs_rt_rd +MULSHI 000000 ..... ..... ..... 01011011000 @rs_rt_rd +MULSHIU 000000 ..... ..... ..... 01011011001 @rs_rt_rd MACCHI 000000 ..... ..... ..... 01101011000 @rs_rt_rd MACCHIU 000000 ..... ..... ..... 01101011001 @rs_rt_rd diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 76e153d61aa..864773faf80 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -298,14 +298,8 @@ enum { #define MASK_MUL_VR54XX(op) (MASK_SPECIAL(op) | (op & (0x1F << 6))) =20 enum { - OPC_VR54XX_MULS =3D (0x03 << 6) | OPC_MULT, - OPC_VR54XX_MULSU =3D (0x03 << 6) | OPC_MULTU, OPC_VR54XX_MSAC =3D (0x07 << 6) | OPC_MULT, OPC_VR54XX_MSACU =3D (0x07 << 6) | OPC_MULTU, - OPC_VR54XX_MULHI =3D (0x09 << 6) | OPC_MULT, - OPC_VR54XX_MULHIU =3D (0x09 << 6) | OPC_MULTU, - OPC_VR54XX_MULSHI =3D (0x0B << 6) | OPC_MULT, - OPC_VR54XX_MULSHIU =3D (0x0B << 6) | OPC_MULTU, OPC_VR54XX_MSACHI =3D (0x0F << 6) | OPC_MULT, OPC_VR54XX_MSACHIU =3D (0x0F << 6) | OPC_MULTU, }; @@ -3770,30 +3764,12 @@ static void gen_mul_vr54xx(DisasContext *ctx, uint3= 2_t opc, gen_load_gpr(t1, rt); =20 switch (opc) { - case OPC_VR54XX_MULS: - gen_helper_muls(t0, cpu_env, t0, t1); - break; - case OPC_VR54XX_MULSU: - gen_helper_mulsu(t0, cpu_env, t0, t1); - break; case OPC_VR54XX_MSAC: gen_helper_msac(t0, cpu_env, t0, t1); break; case OPC_VR54XX_MSACU: gen_helper_msacu(t0, cpu_env, t0, t1); break; - case OPC_VR54XX_MULHI: - gen_helper_mulhi(t0, cpu_env, t0, t1); - break; - case OPC_VR54XX_MULHIU: - gen_helper_mulhiu(t0, cpu_env, t0, t1); - break; - case OPC_VR54XX_MULSHI: - gen_helper_mulshi(t0, cpu_env, t0, t1); - break; - case OPC_VR54XX_MULSHIU: - gen_helper_mulshiu(t0, cpu_env, t0, t1); - break; case OPC_VR54XX_MSACHI: gen_helper_msachi(t0, cpu_env, t0, t1); break; diff --git a/target/mips/tcg/vr54xx_translate.c b/target/mips/tcg/vr54xx_tr= anslate.c index f749fc588b7..d70641dee13 100644 --- a/target/mips/tcg/vr54xx_translate.c +++ b/target/mips/tcg/vr54xx_translate.c @@ -25,6 +25,12 @@ * MACCHI Multiply, accumulate, and move HI * MACCHIU Unsigned multiply, accumulate, and move HI * MACCU Unsigned multiply, accumulate, and move LO + * MULHI Multiply and move HI + * MULHIU Unsigned multiply and move HI + * MULS Multiply, negate, and move LO + * MULSHI Multiply, negate, and move HI + * MULSHIU Unsigned multiply, negate, and move HI + * MULSU Unsigned multiply, negate, and move LO */ =20 typedef void gen_helper_mult_acc_t(TCGv, TCGv_ptr, TCGv, TCGv); @@ -60,3 +66,9 @@ TRANS(MACC, trans_mult_acc, gen_helper_macc); TRANS(MACCHI, trans_mult_acc, gen_helper_macchi); TRANS(MACCHIU, trans_mult_acc, gen_helper_macchiu); TRANS(MACCU, trans_mult_acc, gen_helper_maccu); +TRANS(MULHI, trans_mult_acc, gen_helper_mulhi); +TRANS(MULHIU, trans_mult_acc, gen_helper_mulhiu); +TRANS(MULS, trans_mult_acc, gen_helper_muls); +TRANS(MULSHI, trans_mult_acc, gen_helper_mulshi); +TRANS(MULSHIU, trans_mult_acc, gen_helper_mulshiu); +TRANS(MULSU, trans_mult_acc, gen_helper_mulsu); --=20 2.31.1