diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-03 09:59:18 -1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-05-15 08:55:18 +0200 |
| commit | e763953a2445770bb5d1653d0c258dca5a6de5e2 (patch) | |
| tree | 410ae49ce696efeaa1cd316574f2ac066bb769ca | |
| parent | d3ace105900c43d1eb034b81ce0951e6110ab990 (diff) | |
| download | qemu-e763953a2445770bb5d1653d0c258dca5a6de5e2.zip qemu-e763953a2445770bb5d1653d0c258dca5a6de5e2.tar.gz qemu-e763953a2445770bb5d1653d0c258dca5a6de5e2.tar.bz2 | |
plugins: Use DisasContextBase for qemu_plugin_tb_vaddr
We do not need to separately record the start of the TB.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | accel/tcg/plugin-gen.c | 3 | ||||
| -rw-r--r-- | include/qemu/plugin.h | 1 | ||||
| -rw-r--r-- | plugins/api.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index c36632e..b544947 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -188,7 +188,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) int insn_idx = -1; if (unlikely(qemu_loglevel_mask(LOG_TB_OP_PLUGIN) - && qemu_log_in_addr_range(plugin_tb->vaddr))) { + && qemu_log_in_addr_range(tcg_ctx->plugin_db->pc_first))) { FILE *logfile = qemu_log_trylock(); if (logfile) { fprintf(logfile, "OP before plugin injection:\n"); @@ -318,7 +318,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db) ret = true; - ptb->vaddr = db->pc_first; ptb->mem_helper = false; tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB); diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index da0f37e..7fda6ef 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -118,7 +118,6 @@ struct qemu_plugin_scoreboard { struct qemu_plugin_tb { GPtrArray *insns; size_t n; - uint64_t vaddr; /* if set, the TB calls helpers that might access guest memory */ bool mem_helper; diff --git a/plugins/api.c b/plugins/api.c index 0ae1977..02014d4 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -200,7 +200,8 @@ size_t qemu_plugin_tb_n_insns(const struct qemu_plugin_tb *tb) uint64_t qemu_plugin_tb_vaddr(const struct qemu_plugin_tb *tb) { - return tb->vaddr; + const DisasContextBase *db = tcg_ctx->plugin_db; + return db->pc_first; } struct qemu_plugin_insn * |