[PATCH v2 21/25] target/ppc: Fix gen_tlbsx_booke206

Richard Henderson posted 25 patches 2 years, 11 months ago
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Laurent Vivier <laurent@vivier.eu>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
[PATCH v2 21/25] target/ppc: Fix gen_tlbsx_booke206
Posted by Richard Henderson 2 years, 11 months ago
Fix incorrect read from rD.
Avoid adding 0 when rA == 0.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>
Cc: Cédric Le Goater <clg@kaod.org>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Greg Kurz <groug@kaod.org>
Cc: qemu-ppc@nongnu.org
---
 target/ppc/translate.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index df324fc7ff..7ec940b7d8 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -5875,12 +5875,10 @@ static void gen_tlbsx_booke206(DisasContext *ctx)
     CHK_SV(ctx);
     if (rA(ctx->opcode)) {
         t0 = tcg_temp_new();
-        tcg_gen_mov_tl(t0, cpu_gpr[rD(ctx->opcode)]);
+        tcg_gen_add_tl(t0, cpu_gpr[rA(ctx->opcode)], cpu_gpr[rB(ctx->opcode)]);
     } else {
-        t0 = tcg_const_tl(0);
+        t0 = cpu_gpr[rB(ctx->opcode)];
     }
-
-    tcg_gen_add_tl(t0, t0, cpu_gpr[rB(ctx->opcode)]);
     gen_helper_booke206_tlbsx(cpu_env, t0);
 #endif /* defined(CONFIG_USER_ONLY) */
 }
-- 
2.34.1


Re: [PATCH v2 21/25] target/ppc: Fix gen_tlbsx_booke206
Posted by Daniel Henrique Barboza 2 years, 11 months ago

On 3/7/23 15:34, Richard Henderson wrote:
> Fix incorrect read from rD.
> Avoid adding 0 when rA == 0.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

> Cc: Daniel Henrique Barboza <danielhb413@gmail.com>
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: qemu-ppc@nongnu.org
> ---
>   target/ppc/translate.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> index df324fc7ff..7ec940b7d8 100644
> --- a/target/ppc/translate.c
> +++ b/target/ppc/translate.c
> @@ -5875,12 +5875,10 @@ static void gen_tlbsx_booke206(DisasContext *ctx)
>       CHK_SV(ctx);
>       if (rA(ctx->opcode)) {
>           t0 = tcg_temp_new();
> -        tcg_gen_mov_tl(t0, cpu_gpr[rD(ctx->opcode)]);
> +        tcg_gen_add_tl(t0, cpu_gpr[rA(ctx->opcode)], cpu_gpr[rB(ctx->opcode)]);
>       } else {
> -        t0 = tcg_const_tl(0);
> +        t0 = cpu_gpr[rB(ctx->opcode)];
>       }
> -
> -    tcg_gen_add_tl(t0, t0, cpu_gpr[rB(ctx->opcode)]);
>       gen_helper_booke206_tlbsx(cpu_env, t0);
>   #endif /* defined(CONFIG_USER_ONLY) */
>   }