[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/10] target/tricore: Fix OPC2_32_RRRR_DEXTR
From: |
Bastian Koppelmann |
Subject: |
[PATCH v2 07/10] target/tricore: Fix OPC2_32_RRRR_DEXTR |
Date: |
Thu, 2 Feb 2023 13:04:29 +0100 |
if cpu_gpr_d[r3] == 0 then we were shifting the lower register to the
right by 32 which is undefined behaviour. In this case the TriCore would
do nothing an just return the higher register cpu_reg_d[r1]. We fixed
that by detecting whether cpu_gpr_d[r3] was zero and cleared the lower
register.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
v1 -> v2:
- use tcg_constant_tl(0) for TCGv zero
- add extra line on top of comment
target/tricore/translate.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/target/tricore/translate.c b/target/tricore/translate.c
index 3b4ec530b1..8bf78b46d0 100644
--- a/target/tricore/translate.c
+++ b/target/tricore/translate.c
@@ -8245,10 +8245,19 @@ static void decode_rrrr_extract_insert(DisasContext
*ctx)
if (r1 == r2) {
tcg_gen_rotl_tl(cpu_gpr_d[r4], cpu_gpr_d[r1], tmp_pos);
} else {
+ TCGv msw = tcg_temp_new();
+ TCGv zero = tcg_constant_tl(0);
tcg_gen_shl_tl(tmp_width, cpu_gpr_d[r1], tmp_pos);
- tcg_gen_subfi_tl(tmp_pos, 32, tmp_pos);
- tcg_gen_shr_tl(tmp_pos, cpu_gpr_d[r2], tmp_pos);
- tcg_gen_or_tl(cpu_gpr_d[r4], tmp_width, tmp_pos);
+ tcg_gen_subfi_tl(msw, 32, tmp_pos);
+ tcg_gen_shr_tl(msw, cpu_gpr_d[r2], msw);
+ /*
+ * if pos == 0, then we do cpu_gpr_d[r2] << 32, which is undefined
+ * behaviour. So check that case here and set the low bits to zero
+ * which effectivly returns cpu_gpr_d[r1]
+ */
+ tcg_gen_movcond_tl(TCG_COND_EQ, msw, tmp_pos, zero, zero, msw);
+ tcg_gen_or_tl(cpu_gpr_d[r4], tmp_width, msw);
+ tcg_temp_free(msw);
}
break;
case OPC2_32_RRRR_EXTR:
--
2.39.1
- [PATCH v2 00/10] TriCore instruction bugfixes, Bastian Koppelmann, 2023/02/02
- [PATCH v2 08/10] tests/tcg/tricore: Add OPC2_32_RRRR_DEXTR tests, Bastian Koppelmann, 2023/02/02
- [PATCH v2 09/10] target/tricore: Fix OPC2_32_BO_LD_BU_PREINC, Bastian Koppelmann, 2023/02/02
- [PATCH v2 02/10] tests/tcg/tricore: Add test for OPC2_32_RCRW_IMASK, Bastian Koppelmann, 2023/02/02
- [PATCH v2 06/10] tests/tcg/tricore: Add tests for RRPW_DEXTR, Bastian Koppelmann, 2023/02/02
- [PATCH v2 05/10] target/tricore: Fix RRPW_DEXTR, Bastian Koppelmann, 2023/02/02
- [PATCH v2 03/10] target/tricore: Fix OPC2_32_RCRW_INSERT translation, Bastian Koppelmann, 2023/02/02
- [PATCH v2 01/10] target/tricore: Fix OPC2_32_RCRW_IMASK translation, Bastian Koppelmann, 2023/02/02
- [PATCH v2 07/10] target/tricore: Fix OPC2_32_RRRR_DEXTR,
Bastian Koppelmann <=
- [PATCH v2 04/10] tests/tcg/tricore: Add test for OPC2_32_RCRW_INSERT, Bastian Koppelmann, 2023/02/02
- [PATCH v2 10/10] tests/tcg/tricore: Add LD.BU tests, Bastian Koppelmann, 2023/02/02