| Message ID | 20240316015720.3661236-20-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | plugins: Rewrite plugin code generation | expand |
On 3/16/24 05:57, Richard Henderson wrote: > Merge qemu_plugin_insn_alloc and qemu_plugin_tb_insn_get into > plugin_gen_insn_start, since it is used nowhere else. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/qemu/plugin.h | 39 --------------------------------------- > accel/tcg/plugin-gen.c | 39 ++++++++++++++++++++++++++++++++------- > 2 files changed, 32 insertions(+), 46 deletions(-) > > diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h > index 34498da717..07b1755990 100644 > --- a/include/qemu/plugin.h > +++ b/include/qemu/plugin.h > @@ -128,14 +128,6 @@ static inline void qemu_plugin_insn_cleanup_fn(gpointer data) > g_byte_array_free(insn->data, true); > } > > -static inline struct qemu_plugin_insn *qemu_plugin_insn_alloc(void) > -{ > - struct qemu_plugin_insn *insn = g_new0(struct qemu_plugin_insn, 1); > - > - insn->data = g_byte_array_sized_new(4); > - return insn; > -} > - > /* Internal context for this TranslationBlock */ > struct qemu_plugin_tb { > GPtrArray *insns; > @@ -152,37 +144,6 @@ struct qemu_plugin_tb { > GArray *cbs; > }; > > -/** > - * 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, > - uint64_t pc) > -{ > - struct qemu_plugin_insn *insn; > - > - if (unlikely(tb->n == tb->insns->len)) { > - struct qemu_plugin_insn *new_insn = qemu_plugin_insn_alloc(); > - g_ptr_array_add(tb->insns, new_insn); > - } > - > - insn = g_ptr_array_index(tb->insns, tb->n++); > - g_byte_array_set_size(insn->data, 0); > - insn->calls_helpers = false; > - insn->mem_helper = false; > - insn->vaddr = pc; > - if (insn->insn_cbs) { > - g_array_set_size(insn->insn_cbs, 0); > - } > - if (insn->mem_cbs) { > - g_array_set_size(insn->mem_cbs, 0); > - } > - > - return insn; > -} > - > /** > * struct CPUPluginState - per-CPU state for plugins > * @event_mask: plugin event bitmap. Modified only via async work. > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index 28414c4ff1..70914c3bf8 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -380,11 +380,34 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, > void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) > { > struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; > - struct qemu_plugin_insn *pinsn; > + struct qemu_plugin_insn *insn; > + size_t n = db->num_insns; > + vaddr pc; > > - pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); > - tcg_ctx->plugin_insn = pinsn; > - plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); > + assert(n >= 1); > + ptb->n = n; > + if (n <= ptb->insns->len) { > + insn = g_ptr_array_index(ptb->insns, n - 1); > + g_byte_array_set_size(insn->data, 0); > + } else { > + assert(n - 1 == ptb->insns->len); > + insn = g_new0(struct qemu_plugin_insn, 1); > + insn->data = g_byte_array_sized_new(4); > + g_ptr_array_add(ptb->insns, insn); > + } > + > + tcg_ctx->plugin_insn = insn; > + insn->calls_helpers = false; > + insn->mem_helper = false; > + if (insn->insn_cbs) { > + g_array_set_size(insn->insn_cbs, 0); > + } > + if (insn->mem_cbs) { > + g_array_set_size(insn->mem_cbs, 0); > + } > + > + pc = db->pc_next; > + insn->vaddr = pc; > > /* > * Detect page crossing to get the new host address. > @@ -392,16 +415,18 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) > * fetching instructions from a region not backed by RAM. > */ > if (ptb->haddr1 == NULL) { > - pinsn->haddr = NULL; > + insn->haddr = NULL; > } else if (is_same_page(db, db->pc_next)) { > - pinsn->haddr = ptb->haddr1 + pinsn->vaddr - ptb->vaddr; > + insn->haddr = ptb->haddr1 + pc - ptb->vaddr; > } else { > if (ptb->vaddr2 == -1) { > ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first); > get_page_addr_code_hostp(cpu_env(cpu), ptb->vaddr2, &ptb->haddr2); > } > - pinsn->haddr = ptb->haddr2 + pinsn->vaddr - ptb->vaddr2; > + insn->haddr = ptb->haddr2 + pc - ptb->vaddr2; > } > + > + plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); > } > > void plugin_gen_insn_end(void) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 34498da717..07b1755990 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -128,14 +128,6 @@ static inline void qemu_plugin_insn_cleanup_fn(gpointer data) g_byte_array_free(insn->data, true); } -static inline struct qemu_plugin_insn *qemu_plugin_insn_alloc(void) -{ - struct qemu_plugin_insn *insn = g_new0(struct qemu_plugin_insn, 1); - - insn->data = g_byte_array_sized_new(4); - return insn; -} - /* Internal context for this TranslationBlock */ struct qemu_plugin_tb { GPtrArray *insns; @@ -152,37 +144,6 @@ struct qemu_plugin_tb { GArray *cbs; }; -/** - * 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, - uint64_t pc) -{ - struct qemu_plugin_insn *insn; - - if (unlikely(tb->n == tb->insns->len)) { - struct qemu_plugin_insn *new_insn = qemu_plugin_insn_alloc(); - g_ptr_array_add(tb->insns, new_insn); - } - - insn = g_ptr_array_index(tb->insns, tb->n++); - g_byte_array_set_size(insn->data, 0); - insn->calls_helpers = false; - insn->mem_helper = false; - insn->vaddr = pc; - if (insn->insn_cbs) { - g_array_set_size(insn->insn_cbs, 0); - } - if (insn->mem_cbs) { - g_array_set_size(insn->mem_cbs, 0); - } - - return insn; -} - /** * struct CPUPluginState - per-CPU state for plugins * @event_mask: plugin event bitmap. Modified only via async work. diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 28414c4ff1..70914c3bf8 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -380,11 +380,34 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) { struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; - struct qemu_plugin_insn *pinsn; + struct qemu_plugin_insn *insn; + size_t n = db->num_insns; + vaddr pc; - pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); - tcg_ctx->plugin_insn = pinsn; - plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); + assert(n >= 1); + ptb->n = n; + if (n <= ptb->insns->len) { + insn = g_ptr_array_index(ptb->insns, n - 1); + g_byte_array_set_size(insn->data, 0); + } else { + assert(n - 1 == ptb->insns->len); + insn = g_new0(struct qemu_plugin_insn, 1); + insn->data = g_byte_array_sized_new(4); + g_ptr_array_add(ptb->insns, insn); + } + + tcg_ctx->plugin_insn = insn; + insn->calls_helpers = false; + insn->mem_helper = false; + if (insn->insn_cbs) { + g_array_set_size(insn->insn_cbs, 0); + } + if (insn->mem_cbs) { + g_array_set_size(insn->mem_cbs, 0); + } + + pc = db->pc_next; + insn->vaddr = pc; /* * Detect page crossing to get the new host address. @@ -392,16 +415,18 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) * fetching instructions from a region not backed by RAM. */ if (ptb->haddr1 == NULL) { - pinsn->haddr = NULL; + insn->haddr = NULL; } else if (is_same_page(db, db->pc_next)) { - pinsn->haddr = ptb->haddr1 + pinsn->vaddr - ptb->vaddr; + insn->haddr = ptb->haddr1 + pc - ptb->vaddr; } else { if (ptb->vaddr2 == -1) { ptb->vaddr2 = TARGET_PAGE_ALIGN(db->pc_first); get_page_addr_code_hostp(cpu_env(cpu), ptb->vaddr2, &ptb->haddr2); } - pinsn->haddr = ptb->haddr2 + pinsn->vaddr - ptb->vaddr2; + insn->haddr = ptb->haddr2 + pc - ptb->vaddr2; } + + plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); } void plugin_gen_insn_end(void)
Merge qemu_plugin_insn_alloc and qemu_plugin_tb_insn_get into plugin_gen_insn_start, since it is used nowhere else. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/qemu/plugin.h | 39 --------------------------------------- accel/tcg/plugin-gen.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 46 deletions(-)