From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 5 Apr 2024 09:53:24 +0000 (-1000)
Subject: target/xtensa: Use translator_ldub in xtensa_insn_len
X-Git-Tag: v9.1.0-rc0~106^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a41cd1e6c3475932f9a3ca51a3fc2cc7a697b44e;p=thirdparty%2Fqemu.git

target/xtensa: Use translator_ldub in xtensa_insn_len

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 42109d33ad2..75b7bfda4c8 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -35,7 +35,6 @@
 #include "tcg/tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/qemu-print.h"
-#include "exec/cpu_ldst.h"
 #include "semihosting/semihost.h"
 #include "exec/translator.h"
 
@@ -1118,7 +1117,7 @@ static void disas_xtensa_insn(CPUXtensaState *env, DisasContext *dc)
 
 static inline unsigned xtensa_insn_len(CPUXtensaState *env, DisasContext *dc)
 {
-    uint8_t b0 = cpu_ldub_code(env, dc->pc);
+    uint8_t b0 = translator_ldub(env, &dc->base, dc->pc);
     return xtensa_op0_insn_len(dc, b0);
 }