From 05b6ca9bbcaede74120050aa8e6684300c09257c Mon Sep 17 00:00:00 2001 From: Bastian Koppelmann Date: Fri, 22 May 2015 12:15:56 +0200 Subject: [PATCH 1/3] target-tricore: fix OPC2_32_RR_DVINIT_HU having write before use on the result If the argument r1 was the same as the extended result register r3+1, we would overwrite r1 and then use it. Signed-off-by: Bastian Koppelmann Message-Id: <1432289758-6250-2-git-send-email-kbastian@mail.uni-paderborn.de> --- target-tricore/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-tricore/translate.c b/target-tricore/translate.c index 5f8eff04fa..6c14843438 100644 --- a/target-tricore/translate.c +++ b/target-tricore/translate.c @@ -6451,8 +6451,8 @@ static void decode_rr_divide(CPUTriCoreState *env, DisasContext *ctx) /* sv */ tcg_gen_or_tl(cpu_PSW_SV, cpu_PSW_SV, cpu_PSW_V); /* write result */ - tcg_gen_mov_tl(cpu_gpr_d[r3+1], temp3); tcg_gen_shli_tl(cpu_gpr_d[r3], cpu_gpr_d[r1], 16); + tcg_gen_mov_tl(cpu_gpr_d[r3+1], temp3); tcg_temp_free(temp); tcg_temp_free(temp2); tcg_temp_free(temp3); From 9bbd4843c052a0a467c7a3363046b0c95c0e5fc0 Mon Sep 17 00:00:00 2001 From: Bastian Koppelmann Date: Fri, 22 May 2015 12:15:57 +0200 Subject: [PATCH 2/3] target-tricore: fix msub32_q producing the wrong overflow bit The inversion of the overflow bit as a special case, which was needed for the madd32_q instructions, does not apply for msub32_q instructions. So remove it. Signed-off-by: Bastian Koppelmann Message-Id: <1432289758-6250-3-git-send-email-kbastian@mail.uni-paderborn.de> --- target-tricore/translate.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/target-tricore/translate.c b/target-tricore/translate.c index 6c14843438..8560d00058 100644 --- a/target-tricore/translate.c +++ b/target-tricore/translate.c @@ -1980,17 +1980,6 @@ gen_msub32_q(TCGv ret, TCGv arg1, TCGv arg2, TCGv arg3, uint32_t n, tcg_gen_or_i64(t1, t1, t2); tcg_gen_trunc_i64_i32(cpu_PSW_V, t1); tcg_gen_shli_tl(cpu_PSW_V, cpu_PSW_V, 31); - /* We produce an overflow on the host if the mul before was - (0x80000000 * 0x80000000) << 1). If this is the - case, we negate the ovf. */ - if (n == 1) { - tcg_gen_setcondi_tl(TCG_COND_EQ, temp, arg2, 0x80000000); - tcg_gen_setcond_tl(TCG_COND_EQ, temp2, arg2, arg3); - tcg_gen_and_tl(temp, temp, temp2); - tcg_gen_shli_tl(temp, temp, 31); - /* negate v bit, if special condition */ - tcg_gen_xor_tl(cpu_PSW_V, cpu_PSW_V, temp); - } /* Calc SV bit */ tcg_gen_or_tl(cpu_PSW_SV, cpu_PSW_SV, cpu_PSW_V); /* Calc AV/SAV bits */ From 07e15486faf353260431f10e85185372c5036baa Mon Sep 17 00:00:00 2001 From: Bastian Koppelmann Date: Fri, 22 May 2015 12:15:58 +0200 Subject: [PATCH 3/3] target-tricore: fix BOL_ST_H_LONGOFF using ld Signed-off-by: Bastian Koppelmann Message-Id: <1432289758-6250-4-git-send-email-kbastian@mail.uni-paderborn.de> --- target-tricore/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-tricore/translate.c b/target-tricore/translate.c index 8560d00058..8d41239617 100644 --- a/target-tricore/translate.c +++ b/target-tricore/translate.c @@ -5276,7 +5276,7 @@ static void decode_bol_opc(CPUTriCoreState *env, DisasContext *ctx, int32_t op1) break; case OPC1_32_BOL_ST_H_LONGOFF: if (tricore_feature(env, TRICORE_FEATURE_16)) { - gen_offset_ld(ctx, cpu_gpr_d[r1], cpu_gpr_a[r2], address, MO_LESW); + gen_offset_st(ctx, cpu_gpr_d[r1], cpu_gpr_a[r2], address, MO_LESW); } else { /* raise illegal opcode trap */ }