From 820724d170dd97bd216810c6965ee1ebd0ba01e8 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 20 Jun 2016 11:03:37 +1000 Subject: [PATCH] target-ppc: Fix rlwimi, rlwinm, rlwnm again In 63ae0915f8ec, I arranged to use a 32-bit rotate, without considering the effect of a mask value that wraps around to the high bits of the word. [dwg: In 2e11b15 this was partially fixed, but an edge case was still incorrect, which this fixes] Signed-off-by: Richard Henderson [dwg: Folded with a revert of 2e11b15, an earlier buggy version of this patch which already went upstream] Tested-by: Anton Blanchard Signed-off-by: David Gibson --- target-ppc/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 72b67e42cf..395b885f5b 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -1696,9 +1696,7 @@ static void gen_rlwinm(DisasContext *ctx) #endif mask = MASK(mb, me); - if (sh == 0) { - tcg_gen_andi_tl(t_ra, t_rs, mask); - } else if (mask <= 0xffffffffu) { + if (mask <= 0xffffffffu) { TCGv_i32 t0 = tcg_temp_new_i32(); tcg_gen_trunc_tl_i32(t0, t_rs); tcg_gen_rotli_i32(t0, t0, sh); -- 2.11.4.GIT