diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2021-10-26 11:22:26 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2021-11-04 10:32:01 +0000 |
| commit | 357af9be5ca47ae8ac2bc439de4bb9a39e186fd4 (patch) | |
| tree | 763bcbb19526f9542e9a28568713594ceb1e95ba /accel | |
| parent | e83f79b3faee1316a243b05bb768840d21cec6f4 (diff) | |
| download | qemu-357af9be5ca47ae8ac2bc439de4bb9a39e186fd4.zip qemu-357af9be5ca47ae8ac2bc439de4bb9a39e186fd4.tar.gz qemu-357af9be5ca47ae8ac2bc439de4bb9a39e186fd4.tar.bz2 | |
plugins: try and make plugin_insn_append more ergonomic
Currently we make the assumption that the guest frontend loads all
op code bytes sequentially. This mostly holds up for regular fixed
encodings but some architectures like s390x like to re-read the
instruction which causes weirdness to occur. Rather than changing the
frontends make the plugin API a little more ergonomic and able to
handle the re-read case.
Stuff will still get strange if we read ahead of the opcode but so far
no front ends have done that and this patch asserts the case so we can
catch it early if they do.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211026102234.3961636-21-alex.bennee@linaro.org>
Diffstat (limited to 'accel')
| -rw-r--r-- | accel/tcg/plugin-gen.c | 3 | ||||
| -rw-r--r-- | accel/tcg/translator.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 61be64b..22d95fe 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -876,9 +876,8 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; struct qemu_plugin_insn *pinsn; - pinsn = qemu_plugin_tb_insn_get(ptb); + pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); tcg_ctx->plugin_insn = pinsn; - pinsn->vaddr = db->pc_next; plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); /* diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 390bd9d..f06c314 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -169,7 +169,7 @@ static inline void translator_maybe_page_protect(DisasContextBase *dcbase, if (do_swap) { \ ret = swap_fn(ret); \ } \ - plugin_insn_append(&ret, sizeof(ret)); \ + plugin_insn_append(pc, &ret, sizeof(ret)); \ return ret; \ } |