From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 26 Mar 2024 18:34:35 +0000 (-1000)
Subject: target/hppa: Clear psw_n for BE on use_nullify_skip path
X-Git-Tag: v7.2.11~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fca92c9d14865e2e6b2be9e1a8facabca4b64be;p=thirdparty%2Fqemu.git

target/hppa: Clear psw_n for BE on use_nullify_skip path

Along this path we have already skipped the insn to be
nullified, so the subsequent insn should be executed.

Cc: qemu-stable@nongnu.org
Reported-by: Sven Schnelle <svens@stackframe.org>
Tested-by: Sven Schnelle <svens@stackframe.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
(cherry picked from commit 4a3aa11e1fb25c28c24a43fd2835c429b00a463d)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 1af77473da8..ee68d2f834f 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -3473,6 +3473,7 @@ static bool trans_be(DisasContext *ctx, arg_be *a)
         tcg_gen_addi_reg(cpu_iaoq_b, cpu_iaoq_f, 4);
         tcg_gen_mov_i64(cpu_iasq_f, new_spc);
         tcg_gen_mov_i64(cpu_iasq_b, cpu_iasq_f);
+        nullify_set(ctx, 0);
     } else {
         copy_iaoq_entry(cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b);
         if (ctx->iaoq_b == -1) {