From: Alex Bennée <alex.bennee@linaro.org>
Date: Thu, 27 Oct 2022 18:36:29 +0000 (+0100)
Subject: target/s390x: don't use ld_code2 to probe next pc
X-Git-Tag: qemu-xen-4.18.0-rc5~464^2~7
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=efe7c4f08d543cd4181c672bedba5575390db2a8;p=qemu-xen.git

target/s390x: don't use ld_code2 to probe next pc

This isn't an translator picking up an instruction so we shouldn't use
the translator_lduw function which has side effects for plugins.

Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221027183637.2772968-24-alex.bennee@linaro.org>
---

diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 5798928473..9df7f9e693 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -6612,7 +6612,7 @@ static void s390x_tr_insn_start(DisasContextBase *dcbase, CPUState *cs)
 static target_ulong get_next_pc(CPUS390XState *env, DisasContext *s,
                                 uint64_t pc)
 {
-    uint64_t insn = ld_code2(env, s, pc);
+    uint64_t insn = cpu_lduw_code(env, pc);
 
     return pc + get_ilen((insn >> 8) & 0xff);
 }