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 /include/qemu | |
| 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 'include/qemu')
| -rw-r--r-- | include/qemu/plugin.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index b3172b1..145f8a2 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -163,10 +163,12 @@ struct qemu_plugin_tb { /** * qemu_plugin_tb_insn_get(): get next plugin record for translation. - * + * @tb: the internal tb context + * @pc: address of instruction */ static inline -struct qemu_plugin_insn *qemu_plugin_tb_insn_get(struct qemu_plugin_tb *tb) +struct qemu_plugin_insn *qemu_plugin_tb_insn_get(struct qemu_plugin_tb *tb, + uint64_t pc) { struct qemu_plugin_insn *insn; int i, j; @@ -179,6 +181,7 @@ struct qemu_plugin_insn *qemu_plugin_tb_insn_get(struct qemu_plugin_tb *tb) g_byte_array_set_size(insn->data, 0); insn->calls_helpers = false; insn->mem_helper = false; + insn->vaddr = pc; for (i = 0; i < PLUGIN_N_CB_TYPES; i++) { for (j = 0; j < PLUGIN_N_CB_SUBTYPES; j++) { |