Re: [PATCH v2 32/33] target/s390x: Use translator_lduw in get_next_pc

[Philippe Mathieu-Daudé]

On 25/4/24 01:31, Richard Henderson wrote:

Signed-off-by: Richard Henderson 
---
  target/s390x/tcg/translate.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

[PATCH v2 32/33] target/s390x: Use translator_lduw in get_next_pc

[Richard Henderson]

Signed-off-by: Richard Henderson 
---
 target/s390x/tcg/translate.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index bac033c63c..ebd96abe6c 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -36,7 +36,6 @@
 #include "tcg/tcg-op-gvec.h"
 #include "qemu/log.h"
 #include "qemu/host-utils.h"
-#include "exec/cpu_ldst.h"
 #include "exec/helper-proto.h"
 #include "exec/helper-gen.h"
 
@@ -6471,7 +6470,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 = cpu_lduw_code(env, pc);
+uint64_t insn = translator_lduw(env, >base, pc);
 
 return pc + get_ilen((insn >> 8) & 0xff);
 }
-- 
2.34.1