From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 01/33] accel/tcg: Use vaddr in translator_ld*
Date: Wed, 24 Apr 2024 16:30:59 -0700 [thread overview]
Message-ID: <20240424233131.988727-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240424233131.988727-1-richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/translator.h | 18 +++++++++---------
accel/tcg/translator.c | 15 ++++++++-------
target/hexagon/translate.c | 1 +
target/microblaze/translate.c | 1 +
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 2c4fb818e7..51489c181c 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -19,7 +19,7 @@
*/
#include "qemu/bswap.h"
-#include "exec/cpu_ldst.h" /* for abi_ptr */
+#include "exec/vaddr.h"
/**
* gen_intermediate_code
@@ -182,14 +182,14 @@ bool translator_io_start(DisasContextBase *db);
* the relevant information at translation time.
*/
-uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, abi_ptr pc);
-uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, abi_ptr pc);
-uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, abi_ptr pc);
-uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, abi_ptr pc);
+uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc);
+uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc);
+uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc);
+uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc);
static inline uint16_t
translator_lduw_swap(CPUArchState *env, DisasContextBase *db,
- abi_ptr pc, bool do_swap)
+ vaddr pc, bool do_swap)
{
uint16_t ret = translator_lduw(env, db, pc);
if (do_swap) {
@@ -200,7 +200,7 @@ translator_lduw_swap(CPUArchState *env, DisasContextBase *db,
static inline uint32_t
translator_ldl_swap(CPUArchState *env, DisasContextBase *db,
- abi_ptr pc, bool do_swap)
+ vaddr pc, bool do_swap)
{
uint32_t ret = translator_ldl(env, db, pc);
if (do_swap) {
@@ -211,7 +211,7 @@ translator_ldl_swap(CPUArchState *env, DisasContextBase *db,
static inline uint64_t
translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
- abi_ptr pc, bool do_swap)
+ vaddr pc, bool do_swap)
{
uint64_t ret = translator_ldq(env, db, pc);
if (do_swap) {
@@ -230,7 +230,7 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
* re-synthesised for s390x "ex"). It ensures we update other areas of
* the translator with details of the executed instruction.
*/
-void translator_fake_ldb(uint8_t insn8, abi_ptr pc);
+void translator_fake_ldb(uint8_t insn8, vaddr pc);
/*
* Return whether addr is on the same page as where disassembly started.
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 9de0bc34c8..42fa977e45 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -13,6 +13,7 @@
#include "exec/exec-all.h"
#include "exec/translator.h"
#include "exec/plugin-gen.h"
+#include "exec/cpu_ldst.h"
#include "tcg/tcg-op-common.h"
#include "internal-target.h"
@@ -293,11 +294,11 @@ static void *translator_access(CPUArchState *env, DisasContextBase *db,
return host + (pc - base);
}
-static void plugin_insn_append(abi_ptr pc, const void *from, size_t size)
+static void plugin_insn_append(vaddr pc, const void *from, size_t size)
{
#ifdef CONFIG_PLUGIN
struct qemu_plugin_insn *insn = tcg_ctx->plugin_insn;
- abi_ptr off;
+ size_t off;
if (insn == NULL) {
return;
@@ -314,7 +315,7 @@ static void plugin_insn_append(abi_ptr pc, const void *from, size_t size)
#endif
}
-uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
+uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
uint8_t ret;
void *p = translator_access(env, db, pc, sizeof(ret));
@@ -328,7 +329,7 @@ uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
return ret;
}
-uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
+uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
uint16_t ret, plug;
void *p = translator_access(env, db, pc, sizeof(ret));
@@ -343,7 +344,7 @@ uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
return ret;
}
-uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
+uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
uint32_t ret, plug;
void *p = translator_access(env, db, pc, sizeof(ret));
@@ -358,7 +359,7 @@ uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
return ret;
}
-uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
+uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
uint64_t ret, plug;
void *p = translator_access(env, db, pc, sizeof(ret));
@@ -373,7 +374,7 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, abi_ptr pc)
return ret;
}
-void translator_fake_ldb(uint8_t insn8, abi_ptr pc)
+void translator_fake_ldb(uint8_t insn8, vaddr pc)
{
plugin_insn_append(pc, &insn8, sizeof(insn8));
}
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index f163eefe97..c9bf0e7508 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -24,6 +24,7 @@
#include "exec/helper-proto.h"
#include "exec/translation-block.h"
#include "exec/log.h"
+#include "exec/cpu_ldst.h"
#include "internal.h"
#include "attribs.h"
#include "insn.h"
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index fc451befae..0941aa67c0 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -25,6 +25,7 @@
#include "tcg/tcg-op.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
+#include "exec/cpu_ldst.h"
#include "exec/translator.h"
#include "qemu/qemu-print.h"
--
2.34.1
next prev parent reply other threads:[~2024-04-24 23:34 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 23:30 [PATCH v2 00/33] accel/tcg: Improve disassembly for target and plugin Richard Henderson
2024-04-24 23:30 ` Richard Henderson [this message]
2024-04-24 23:31 ` [PATCH v2 02/33] accel/tcg: Hide in_same_page outside of a target-specific context Richard Henderson
2024-04-24 23:31 ` [PATCH v2 03/33] accel/tcg: Pass DisasContextBase to translator_fake_ldb Richard Henderson
2024-04-24 23:31 ` [PATCH v2 04/33] accel/tcg: Reorg translator_ld* Richard Henderson
2024-05-06 22:47 ` Philippe Mathieu-Daudé
2024-05-07 16:49 ` Richard Henderson
2024-05-08 8:18 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 05/33] accel/tcg: Cap the translation block when we encounter mmio Richard Henderson
2024-04-24 23:31 ` [PATCH v2 06/33] accel/tcg: Record mmio bytes during translation Richard Henderson
2024-04-29 10:34 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 07/33] accel/tcg: Record when translator_fake_ldb is used Richard Henderson
2024-04-29 10:36 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 08/33] accel/tcg: Record DisasContextBase in tcg_ctx for plugins Richard Henderson
2024-05-03 15:11 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 09/33] plugins: Copy memory in qemu_plugin_insn_data Richard Henderson
2024-04-29 10:40 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 10/33] accel/tcg: Implement translator_st Richard Henderson
2024-05-08 15:20 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 11/33] plugins: Use translator_st for qemu_plugin_insn_data Richard Henderson
2024-04-29 10:44 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 12/33] plugins: Read mem_only directly from TB cflags Richard Henderson
2024-04-29 10:45 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 13/33] plugins: Use DisasContextBase for qemu_plugin_insn_haddr Richard Henderson
2024-05-13 14:18 ` Philippe Mathieu-Daudé
2024-05-13 18:16 ` Pierrick Bouvier
2024-04-24 23:31 ` [PATCH v2 14/33] plugins: Use DisasContextBase for qemu_plugin_tb_vaddr Richard Henderson
2024-04-24 23:31 ` [PATCH v2 15/33] plugins: Merge alloc_tcg_plugin_context into plugin_gen_tb_start Richard Henderson
2024-05-06 22:38 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 16/33] accel/tcg: Provide default implementation of disas_log Richard Henderson
2024-04-24 23:31 ` [PATCH v2 17/33] accel/tcg: Return bool from TranslatorOps.disas_log Richard Henderson
2024-04-24 23:31 ` [PATCH v2 18/33] disas: Split disas.c Richard Henderson
2024-05-08 15:26 ` Philippe Mathieu-Daudé
2024-05-10 9:42 ` Richard Henderson
2024-04-24 23:31 ` [PATCH v2 19/33] disas: Use translator_st to get disassembly data Richard Henderson
2024-05-08 15:33 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 20/33] accel/tcg: Introduce translator_fake_ld Richard Henderson
2024-04-24 23:31 ` [PATCH v2 21/33] target/s390x: Fix translator_fake_ld length Richard Henderson
2024-05-08 16:33 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 22/33] target/s390x: Disassemble EXECUTEd instructions Richard Henderson
2024-05-08 16:31 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 23/33] target/hexagon: Use translator_ldl in pkt_crosses_page Richard Henderson
2024-04-29 10:47 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 24/33] target/microblaze: Use translator_ldl Richard Henderson
2024-04-24 23:31 ` [PATCH v2 25/33] target/i386: Use translator_ldub for everything Richard Henderson
2024-04-24 23:31 ` [PATCH v2 26/33] target/avr: Use translator_lduw Richard Henderson
2024-04-24 23:31 ` [PATCH v2 27/33] target/cris: Use translator_ld* in cris_fetch Richard Henderson
2024-04-24 23:31 ` [PATCH v2 28/33] target/cris: Use cris_fetch in translate_v10.c.inc Richard Henderson
2024-04-24 23:31 ` [PATCH v2 29/33] target/riscv: Use translator_ld* for everything Richard Henderson
2024-04-29 10:55 ` Philippe Mathieu-Daudé
2024-05-08 16:31 ` Philippe Mathieu-Daudé
2024-05-14 6:25 ` Alistair Francis
2024-04-24 23:31 ` [PATCH v2 30/33] target/rx: Use translator_ld* Richard Henderson
2024-04-24 23:31 ` [PATCH v2 31/33] target/xtensa: Use translator_ldub in xtensa_insn_len Richard Henderson
2024-04-24 23:31 ` [PATCH v2 32/33] target/s390x: Use translator_lduw in get_next_pc Richard Henderson
2024-05-06 22:41 ` Philippe Mathieu-Daudé
2024-04-24 23:31 ` [PATCH v2 33/33] accel/tcg: Remove cpu_ldsb_code / cpu_ldsw_code Richard Henderson
2024-04-29 10:52 ` [PATCH v2 00/33] accel/tcg: Improve disassembly for target and plugin Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424233131.988727-2-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).