diff mbox series

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

Message ID	20240424233131.988727-33-richard.henderson@linaro.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org> From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v2 32/33] target/s390x: Use translator_lduw in get_next_pc Date: Wed, 24 Apr 2024 16:31:30 -0700 Message-Id: <20240424233131.988727-33-richard.henderson@linaro.org> In-Reply-To: <20240424233131.988727-1-richard.henderson@linaro.org> References: <20240424233131.988727-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Series	accel/tcg: Improve disassembly for target and plugin \| expand [v2,00/33] accel/tcg: Improve disassembly for target and plugin [v2,01/33] accel/tcg: Use vaddr in translator_ld* [v2,02/33] accel/tcg: Hide in_same_page outside of a target-specific context [v2,03/33] accel/tcg: Pass DisasContextBase to translator_fake_ldb [v2,04/33] accel/tcg: Reorg translator_ld* [v2,05/33] accel/tcg: Cap the translation block when we encounter mmio [v2,06/33] accel/tcg: Record mmio bytes during translation [v2,07/33] accel/tcg: Record when translator_fake_ldb is used [v2,08/33] accel/tcg: Record DisasContextBase in tcg_ctx for plugins [v2,09/33] plugins: Copy memory in qemu_plugin_insn_data [v2,10/33] accel/tcg: Implement translator_st [v2,11/33] plugins: Use translator_st for qemu_plugin_insn_data [v2,12/33] plugins: Read mem_only directly from TB cflags [v2,13/33] plugins: Use DisasContextBase for qemu_plugin_insn_haddr [v2,14/33] plugins: Use DisasContextBase for qemu_plugin_tb_vaddr [v2,15/33] plugins: Merge alloc_tcg_plugin_context into plugin_gen_tb_start [v2,16/33] accel/tcg: Provide default implementation of disas_log [v2,17/33] accel/tcg: Return bool from TranslatorOps.disas_log [v2,18/33] disas: Split disas.c [v2,19/33] disas: Use translator_st to get disassembly data [v2,20/33] accel/tcg: Introduce translator_fake_ld [v2,21/33] target/s390x: Fix translator_fake_ld length [v2,22/33] target/s390x: Disassemble EXECUTEd instructions [v2,23/33] target/hexagon: Use translator_ldl in pkt_crosses_page [v2,24/33] target/microblaze: Use translator_ldl [v2,25/33] target/i386: Use translator_ldub for everything [v2,26/33] target/avr: Use translator_lduw [v2,27/33] target/cris: Use translator_ld* in cris_fetch [v2,28/33] target/cris: Use cris_fetch in translate_v10.c.inc [v2,29/33] target/riscv: Use translator_ld* for everything [v2,30/33] target/rx: Use translator_ld* [v2,31/33] target/xtensa: Use translator_ldub in xtensa_insn_len [v2,32/33] target/s390x: Use translator_lduw in get_next_pc [v2,33/33] accel/tcg: Remove cpu_ldsb_code / cpu_ldsw_code

Commit Message

Richard Henderson April 24, 2024, 11:31 p.m. UTC

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/s390x/tcg/translate.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé May 6, 2024, 10:41 p.m. UTC | #1

On 25/4/24 01:31, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/s390x/tcg/translate.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

diff mbox series

Patch

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, &s->base, pc);
 
     return pc + get_ilen((insn >> 8) & 0xff);
 }