[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/32] accel/tcg: Use vaddr in translator_ld*
From: |
Richard Henderson |
Subject: |
[PATCH 01/32] accel/tcg: Use vaddr in translator_ld* |
Date: |
Fri, 5 Apr 2024 00:24:28 -1000 |
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 +
target/nios2/translate.c | 1 +
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 51624feb10..29804de92e 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
@@ -180,14 +180,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) {
@@ -198,7 +198,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) {
@@ -209,7 +209,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) {
@@ -228,7 +228,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 38c34009a5..9ac0f52b47 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"
@@ -290,11 +291,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;
@@ -311,7 +312,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));
@@ -325,7 +326,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));
@@ -340,7 +341,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));
@@ -355,7 +356,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));
@@ -370,7 +371,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 4e52ef32db..916afd4dec 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"
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 7ddc6ac1a2..9c3958a0ba 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -32,6 +32,7 @@
#include "exec/translator.h"
#include "qemu/qemu-print.h"
#include "semihosting/semihost.h"
+#include "exec/cpu_ldst.h"
#define HELPER_H "helper.h"
#include "exec/helper-info.c.inc"
--
2.34.1
- [PATCH 05/32] accel/tcg: Cap the translation block when we encounter mmio, (continued)
- [PATCH 05/32] accel/tcg: Cap the translation block when we encounter mmio, Richard Henderson, 2024/04/05
- [PATCH 07/32] accel/tcg: Record when translator_fake_ldb is used, Richard Henderson, 2024/04/05
- [PATCH 09/32] plugins: Copy memory in qemu_plugin_insn_data, Richard Henderson, 2024/04/05
- [PATCH 10/32] accel/tcg: Implement translator_st, Richard Henderson, 2024/04/05
- [PATCH 08/32] accel/tcg: Record DisasContextBase in tcg_ctx for plugins, Richard Henderson, 2024/04/05
- [PATCH 11/32] plugins: Use translator_st for qemu_plugin_insn_data, Richard Henderson, 2024/04/05
- [PATCH 15/32] plugins: Merge alloc_tcg_plugin_context into plugin_gen_tb_start, Richard Henderson, 2024/04/05
- [PATCH 03/32] accel/tcg: Pass DisasContextBase to translator_fake_ldb, Richard Henderson, 2024/04/05
- [PATCH 01/32] accel/tcg: Use vaddr in translator_ld*,
Richard Henderson <=
- [PATCH 06/32] accel/tcg: Record mmio bytes during translation, Richard Henderson, 2024/04/05
- [PATCH 12/32] plugins: Read mem_only directly from TB cflags, Richard Henderson, 2024/04/05
- [PATCH 13/32] plugins: Use DisasContextBase for qemu_plugin_insn_haddr, Richard Henderson, 2024/04/05
- [PATCH 14/32] plugins: Use DisasContextBase for qemu_plugin_tb_vaddr, Richard Henderson, 2024/04/05
- [PATCH 19/32] disas: Use translator_st to get disassembly data, Richard Henderson, 2024/04/05
- [PATCH 17/32] accel/tcg: Return bool from TranslatorOps.disas_log, Richard Henderson, 2024/04/05
- [PATCH 16/32] accel/tcg: Provide default implementation of disas_log, Richard Henderson, 2024/04/05