SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plugins: Add PLUGIN_GEN_AFTER_TB

Browse Source 
Delay test of plugin_tb->mem_helper until the inject pass.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-03-14 23:47:07 -10:00
parent 21a3f62ff2
commit 74bb8acc6a
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
accel/tcg/plugin-gen.c
View File

@ -69,6 +69,7 @@ enum plugin_gen_from {
PLUGIN_GEN_FROM_INSN, PLUGIN_GEN_FROM_INSN,
PLUGIN_GEN_FROM_MEM, PLUGIN_GEN_FROM_MEM,
PLUGIN_GEN_AFTER_INSN, PLUGIN_GEN_AFTER_INSN,
PLUGIN_GEN_AFTER_TB,
PLUGIN_GEN_N_FROMS, PLUGIN_GEN_N_FROMS,
}; };
@ -609,20 +610,9 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb,
/* called before finishing a TB with exit_tb, goto_tb or goto_ptr */ /* called before finishing a TB with exit_tb, goto_tb or goto_ptr */
void plugin_gen_disable_mem_helpers(void) void plugin_gen_disable_mem_helpers(void)
{ {
/* if (tcg_ctx->plugin_insn) {
* We could emit the clearing unconditionally and be done. However, this can tcg_gen_plugin_cb(PLUGIN_GEN_AFTER_TB);
* be wasteful if for instance plugins don't track memory accesses, or if
* most TBs don't use helpers. Instead, emit the clearing iff the TB calls
* helpers that might access guest memory.
*
* Note: we do not reset plugin_tb->mem_helper here; a TB might have several
* exit points, and we want to emit the clearing from all of them.
*/
if (!tcg_ctx->plugin_tb->mem_helper) {
return;
} }
tcg_gen_st_ptr(tcg_constant_ptr(NULL), tcg_env,
offsetof(CPUState, plugin_mem_cbs) - offsetof(ArchCPU, env));
} }
static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb, static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb,
@ -673,14 +663,11 @@ static void plugin_gen_enable_mem_helper(struct qemu_plugin_tb *ptb,
inject_mem_enable_helper(ptb, insn, begin_op); inject_mem_enable_helper(ptb, insn, begin_op);
} }
static void gen_disable_mem_helper(struct qemu_plugin_tb *ptb, static void gen_disable_mem_helper(void)
struct qemu_plugin_insn *insn)
{ {
if (insn->mem_helper) {
tcg_gen_st_ptr(tcg_constant_ptr(0), tcg_env, tcg_gen_st_ptr(tcg_constant_ptr(0), tcg_env,
offsetof(CPUState, plugin_mem_cbs) - offsetof(CPUState, plugin_mem_cbs) -
offsetof(ArchCPU, env)); offsetof(ArchCPU, env));
}
} }
static void gen_udata_cb(struct qemu_plugin_dyn_cb *cb) static void gen_udata_cb(struct qemu_plugin_dyn_cb *cb)
@ -806,9 +793,17 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb)
tcg_ctx->emit_before_op = op; tcg_ctx->emit_before_op = op;
switch (from) { switch (from) {
case PLUGIN_GEN_AFTER_TB:
if (plugin_tb->mem_helper) {
gen_disable_mem_helper();
}
break;
case PLUGIN_GEN_AFTER_INSN: case PLUGIN_GEN_AFTER_INSN:
assert(insn != NULL); assert(insn != NULL);
gen_disable_mem_helper(plugin_tb, insn); if (insn->mem_helper) {
gen_disable_mem_helper();
}
break; break;
case PLUGIN_GEN_FROM_TB: case PLUGIN_GEN_FROM_TB: