| Message ID | 20240316015720.3661236-15-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | plugins: Rewrite plugin code generation | expand |
On 3/16/24 05:57, Richard Henderson wrote: > These opcodes are no longer used. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/tcg/tcg-op-common.h | 2 -- > include/tcg/tcg-opc.h | 2 -- > accel/tcg/plugin-gen.c | 18 ------------------ > tcg/tcg-op.c | 10 ---------- > 4 files changed, 32 deletions(-) > > diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h > index 72b80b20d0..009e2778c5 100644 > --- a/include/tcg/tcg-op-common.h > +++ b/include/tcg/tcg-op-common.h > @@ -76,8 +76,6 @@ void tcg_gen_lookup_and_goto_ptr(void); > > void tcg_gen_plugin_cb(unsigned from); > void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo); > -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr); > -void tcg_gen_plugin_cb_end(void); > > /* 32 bit ops */ > > diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h > index be9e36e386..546eb49c11 100644 > --- a/include/tcg/tcg-opc.h > +++ b/include/tcg/tcg-opc.h > @@ -199,8 +199,6 @@ DEF(goto_ptr, 0, 1, 0, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) > > DEF(plugin_cb, 0, 0, 1, TCG_OPF_NOT_PRESENT) > DEF(plugin_mem_cb, 0, 1, 1, TCG_OPF_NOT_PRESENT) > -DEF(plugin_cb_start, 0, 0, 3, TCG_OPF_NOT_PRESENT) > -DEF(plugin_cb_end, 0, 0, 0, TCG_OPF_NOT_PRESENT) > > /* Replicate ld/st ops for 32 and 64-bit guest addresses. */ > DEF(qemu_ld_a32_i32, 1, 1, 1, > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index b5261edc38..c8f0e0ecaa 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -58,29 +58,11 @@ > # define CONFIG_SOFTMMU_GATE 0 > #endif > > -/* > - * plugin_cb_start TCG op args[]: > - * 0: enum plugin_gen_from > - * 1: enum plugin_gen_cb > - * 2: set to 1 for mem callback that is a write, 0 otherwise. > - */ > - > enum plugin_gen_from { > PLUGIN_GEN_FROM_TB, > PLUGIN_GEN_FROM_INSN, > PLUGIN_GEN_AFTER_INSN, > PLUGIN_GEN_AFTER_TB, > - PLUGIN_GEN_N_FROMS, > -}; > - > -enum plugin_gen_cb { > - PLUGIN_GEN_CB_UDATA, > - PLUGIN_GEN_CB_UDATA_R, > - PLUGIN_GEN_CB_INLINE, > - PLUGIN_GEN_CB_MEM, > - PLUGIN_GEN_ENABLE_MEM_HELPER, > - PLUGIN_GEN_DISABLE_MEM_HELPER, > - PLUGIN_GEN_N_CBS, > }; > Nice that you could remove this enum sounded duplicated from the similar one when registering ops/cbs. > static void plugin_gen_empty_callback(enum plugin_gen_from from) > diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c > index 0ae12fa49d..eff3728622 100644 > --- a/tcg/tcg-op.c > +++ b/tcg/tcg-op.c > @@ -322,16 +322,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo) > tcg_gen_op2(INDEX_op_plugin_mem_cb, tcgv_i64_arg(addr), meminfo); > } > > -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr) > -{ > - tcg_gen_op3(INDEX_op_plugin_cb_start, from, type, wr); > -} > - > -void tcg_gen_plugin_cb_end(void) > -{ > - tcg_emit_op(INDEX_op_plugin_cb_end, 0); > -} > - > /* 32 bit ops */ > > void tcg_gen_discard_i32(TCGv_i32 arg) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index 72b80b20d0..009e2778c5 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -76,8 +76,6 @@ void tcg_gen_lookup_and_goto_ptr(void); void tcg_gen_plugin_cb(unsigned from); void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo); -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr); -void tcg_gen_plugin_cb_end(void); /* 32 bit ops */ diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index be9e36e386..546eb49c11 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -199,8 +199,6 @@ DEF(goto_ptr, 0, 1, 0, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) DEF(plugin_cb, 0, 0, 1, TCG_OPF_NOT_PRESENT) DEF(plugin_mem_cb, 0, 1, 1, TCG_OPF_NOT_PRESENT) -DEF(plugin_cb_start, 0, 0, 3, TCG_OPF_NOT_PRESENT) -DEF(plugin_cb_end, 0, 0, 0, TCG_OPF_NOT_PRESENT) /* Replicate ld/st ops for 32 and 64-bit guest addresses. */ DEF(qemu_ld_a32_i32, 1, 1, 1, diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index b5261edc38..c8f0e0ecaa 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -58,29 +58,11 @@ # define CONFIG_SOFTMMU_GATE 0 #endif -/* - * plugin_cb_start TCG op args[]: - * 0: enum plugin_gen_from - * 1: enum plugin_gen_cb - * 2: set to 1 for mem callback that is a write, 0 otherwise. - */ - enum plugin_gen_from { PLUGIN_GEN_FROM_TB, PLUGIN_GEN_FROM_INSN, PLUGIN_GEN_AFTER_INSN, PLUGIN_GEN_AFTER_TB, - PLUGIN_GEN_N_FROMS, -}; - -enum plugin_gen_cb { - PLUGIN_GEN_CB_UDATA, - PLUGIN_GEN_CB_UDATA_R, - PLUGIN_GEN_CB_INLINE, - PLUGIN_GEN_CB_MEM, - PLUGIN_GEN_ENABLE_MEM_HELPER, - PLUGIN_GEN_DISABLE_MEM_HELPER, - PLUGIN_GEN_N_CBS, }; static void plugin_gen_empty_callback(enum plugin_gen_from from) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 0ae12fa49d..eff3728622 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -322,16 +322,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo) tcg_gen_op2(INDEX_op_plugin_mem_cb, tcgv_i64_arg(addr), meminfo); } -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr) -{ - tcg_gen_op3(INDEX_op_plugin_cb_start, from, type, wr); -} - -void tcg_gen_plugin_cb_end(void) -{ - tcg_emit_op(INDEX_op_plugin_cb_end, 0); -} - /* 32 bit ops */ void tcg_gen_discard_i32(TCGv_i32 arg)
These opcodes are no longer used. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/tcg/tcg-op-common.h | 2 -- include/tcg/tcg-opc.h | 2 -- accel/tcg/plugin-gen.c | 18 ------------------ tcg/tcg-op.c | 10 ---------- 4 files changed, 32 deletions(-)