From: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
To: qemu-devel@nongnu.org
Cc: kbastian@mail.uni-paderborn.de,
Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 04/20] target/tricore: Add crc32l.w insn
Date: Wed, 21 Jun 2023 18:14:06 +0200 [thread overview]
Message-ID: <20230621161422.1652151-5-kbastian@mail.uni-paderborn.de> (raw)
In-Reply-To: <20230621161422.1652151-1-kbastian@mail.uni-paderborn.de>
reported in https://gitlab.com/qemu-project/qemu/-/issues/1667
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20230614100039.1337971-5-kbastian@mail.uni-paderborn.de>
---
target/tricore/helper.h | 3 ++-
target/tricore/op_helper.c | 10 +++++++++-
target/tricore/translate.c | 12 ++++++++++--
target/tricore/tricore-opcodes.h | 3 ++-
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/target/tricore/helper.h b/target/tricore/helper.h
index b64780c37d..24da5e97c0 100644
--- a/target/tricore/helper.h
+++ b/target/tricore/helper.h
@@ -131,7 +131,8 @@ DEF_HELPER_FLAGS_5(mul_h, TCG_CALL_NO_RWG_SE, i64, i32, i32, i32, i32, i32)
DEF_HELPER_FLAGS_5(mulm_h, TCG_CALL_NO_RWG_SE, i64, i32, i32, i32, i32, i32)
DEF_HELPER_FLAGS_5(mulr_h, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32, i32, i32)
/* crc32 */
-DEF_HELPER_FLAGS_2(crc32, TCG_CALL_NO_RWG_SE, i32, i32, i32)
+DEF_HELPER_FLAGS_2(crc32_be, TCG_CALL_NO_RWG_SE, i32, i32, i32)
+DEF_HELPER_FLAGS_2(crc32_le, TCG_CALL_NO_RWG_SE, i32, i32, i32)
/* CSA */
DEF_HELPER_2(call, void, env, i32)
DEF_HELPER_1(ret, void, env)
diff --git a/target/tricore/op_helper.c b/target/tricore/op_helper.c
index 54f54811d9..8ce404cb93 100644
--- a/target/tricore/op_helper.c
+++ b/target/tricore/op_helper.c
@@ -2284,7 +2284,7 @@ uint32_t helper_mulr_h(uint32_t arg00, uint32_t arg01,
return (result1 & 0xffff0000) | (result0 >> 16);
}
-uint32_t helper_crc32(uint32_t arg0, uint32_t arg1)
+uint32_t helper_crc32_be(uint32_t arg0, uint32_t arg1)
{
uint8_t buf[4];
stl_be_p(buf, arg0);
@@ -2292,6 +2292,14 @@ uint32_t helper_crc32(uint32_t arg0, uint32_t arg1)
return crc32(arg1, buf, 4);
}
+uint32_t helper_crc32_le(uint32_t arg0, uint32_t arg1)
+{
+ uint8_t buf[4];
+ stl_le_p(buf, arg0);
+
+ return crc32(arg1, buf, 4);
+}
+
/* context save area (CSA) related helpers */
static int cdc_increment(target_ulong *psw)
diff --git a/target/tricore/translate.c b/target/tricore/translate.c
index 898557d22a..250de80de5 100644
--- a/target/tricore/translate.c
+++ b/target/tricore/translate.c
@@ -6190,13 +6190,21 @@ static void decode_rr_divide(DisasContext *ctx)
CHECK_REG_PAIR(r3);
gen_unpack(cpu_gpr_d[r3], cpu_gpr_d[r3+1], cpu_gpr_d[r1]);
break;
- case OPC2_32_RR_CRC32:
+ case OPC2_32_RR_CRC32: /* CRC32B.W in 1.6.2 */
if (has_feature(ctx, TRICORE_FEATURE_161)) {
- gen_helper_crc32(cpu_gpr_d[r3], cpu_gpr_d[r1], cpu_gpr_d[r2]);
+ gen_helper_crc32_be(cpu_gpr_d[r3], cpu_gpr_d[r1], cpu_gpr_d[r2]);
} else {
generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
}
break;
+ case OPC2_32_RR_CRC32L_W:
+ if (has_feature(ctx, TRICORE_FEATURE_162)) {
+ gen_helper_crc32_le(cpu_gpr_d[r3], cpu_gpr_d[r1], cpu_gpr_d[r2]);
+ } else {
+ generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC);
+ }
+ break;
+
case OPC2_32_RR_POPCNT_W:
if (has_feature(ctx, TRICORE_FEATURE_162)) {
tcg_gen_ctpop_tl(cpu_gpr_d[r3], cpu_gpr_d[r1]);
diff --git a/target/tricore/tricore-opcodes.h b/target/tricore/tricore-opcodes.h
index 9fab4bd75c..be07f82ec1 100644
--- a/target/tricore/tricore-opcodes.h
+++ b/target/tricore/tricore-opcodes.h
@@ -1139,7 +1139,8 @@ enum {
OPC2_32_RR_DVINIT_U = 0x0a,
OPC2_32_RR_PARITY = 0x02,
OPC2_32_RR_UNPACK = 0x08,
- OPC2_32_RR_CRC32 = 0x03,
+ OPC2_32_RR_CRC32 = 0x03, /* CRC32B.W in 1.6.2 */
+ OPC2_32_RR_CRC32L_W = 0x07, /* 1.6.2 only */
OPC2_32_RR_POPCNT_W = 0x22, /* 1.6.2 only */
OPC2_32_RR_DIV = 0x20,
OPC2_32_RR_DIV_U = 0x21,
--
2.40.1
next prev parent reply other threads:[~2023-06-21 16:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-21 16:14 [PULL 00/20] tricore queue Bastian Koppelmann
2023-06-21 16:14 ` [PULL 01/20] target/tricore: Introduce ISA 1.6.2 feature Bastian Koppelmann
2023-06-21 16:14 ` [PULL 02/20] target/tricore: Add popcnt.w insn Bastian Koppelmann
2023-06-21 16:14 ` [PULL 03/20] target/tricore: Add LHA insn Bastian Koppelmann
2023-06-21 16:14 ` Bastian Koppelmann [this message]
2023-06-21 16:14 ` [PULL 05/20] target/tricore: Add crc32.b insn Bastian Koppelmann
2023-06-21 16:14 ` [PULL 06/20] target/tricore: Add shuffle insn Bastian Koppelmann
2023-06-21 16:14 ` [PULL 07/20] target/tricore: Implement SYCSCALL insn Bastian Koppelmann
2023-06-21 16:14 ` [PULL 08/20] target/tricore: Add DISABLE insn variant Bastian Koppelmann
2023-06-21 16:14 ` [PULL 09/20] target/tricore: Fix out-of-bounds index in imask instruction Bastian Koppelmann
2023-06-22 7:43 ` Michael Tokarev
2023-06-22 14:51 ` Bastian Koppelmann
2023-06-23 6:54 ` Michael Tokarev
2023-06-23 9:51 ` Bastian Koppelmann
2023-06-23 10:29 ` Michael Tokarev
2023-06-23 11:09 ` Bastian Koppelmann
2023-06-21 16:14 ` [PULL 10/20] target/tricore: Correctly fix saving PSW.CDE to CSA on call Bastian Koppelmann
2023-06-21 16:14 ` [PULL 11/20] target/tricore: Add CHECK_REG_PAIR() for insn accessing 64 bit regs Bastian Koppelmann
2023-06-21 16:14 ` [PULL 12/20] target/tricore: Fix helper_ret() not correctly restoring PSW Bastian Koppelmann
2023-06-21 16:14 ` [PULL 13/20] target/tricore: Fix RR_JLI clobbering reg A[11] Bastian Koppelmann
2023-06-21 16:14 ` [PULL 14/20] target/tricore: Introduce DISAS_TARGET_EXIT Bastian Koppelmann
2023-06-21 16:14 ` [PULL 15/20] target/tricore: ENABLE exit to main-loop Bastian Koppelmann
2023-06-21 16:14 ` [PULL 16/20] target/tricore: Indirect jump insns use tcg_gen_lookup_and_goto_ptr() Bastian Koppelmann
2023-06-21 16:14 ` [PULL 17/20] target/tricore: Introduce priv tb flag Bastian Koppelmann
2023-06-21 16:14 ` [PULL 18/20] target/tricore: Implement privilege level for all insns Bastian Koppelmann
2023-06-21 16:14 ` [PULL 19/20] target/tricore: Honour privilege changes on PSW write Bastian Koppelmann
2023-06-21 16:14 ` [PULL 20/20] target/tricore: Fix ICR.IE offset in RESTORE insn Bastian Koppelmann
2023-06-21 20:43 ` [PULL 00/20] tricore queue Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230621161422.1652151-5-kbastian@mail.uni-paderborn.de \
--to=kbastian@mail.uni-paderborn.de \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).