yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UC_HOOK_EDGE_GENERATED to work with indirect jump

Browse Source 
For an indirect jump (lookup_tb_ptr), last_tb would be NULL
This commit is contained in:
lazymio
2021-11-23 00:25:55 +01:00
parent 083ccf160b
commit 7a1de17f37
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uc_priv.h
View File

@ -357,6 +357,8 @@ struct uc_struct {
sigjmp_buf jmp_bufs[UC_MAX_NESTED_LEVEL]; // To support nested uc_emu_start sigjmp_buf jmp_bufs[UC_MAX_NESTED_LEVEL]; // To support nested uc_emu_start
int nested_level; // Current nested_level int nested_level; // Current nested_level
struct TranslationBlock* last_tb; // The real last tb we executed.
}; };
// Metadata stub for the variable-size cpu context used with uc_context_*() // Metadata stub for the variable-size cpu context used with uc_context_*()

8
qemu/accel/tcg/cpu-exec.c
View File

@ -258,10 +258,9 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
/* We add the TB in the virtual pc hash table for the fast lookup */ /* We add the TB in the virtual pc hash table for the fast lookup */
cpu->tb_jmp_cache[tb_jmp_cache_hash_func(cpu->uc, pc)] = tb; cpu->tb_jmp_cache[tb_jmp_cache_hash_func(cpu->uc, pc)] = tb;
UC_TB_COPY(&cur_tb, tb); if (uc->last_tb) {
UC_TB_COPY(&cur_tb, tb);
if (last_tb) { UC_TB_COPY(&prev_tb, uc->last_tb);
UC_TB_COPY(&prev_tb, last_tb);
for (cur = uc->hook[UC_HOOK_EDGE_GENERATED_IDX].head; for (cur = uc->hook[UC_HOOK_EDGE_GENERATED_IDX].head;
cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next) { cur != NULL && (hook = (struct hook *)cur->data); cur = cur->next) {
if (hook->to_delete) { if (hook->to_delete) {
@ -494,6 +493,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,
// trace_exec_tb(tb, tb->pc); // trace_exec_tb(tb, tb->pc);
ret = cpu_tb_exec(cpu, tb); ret = cpu_tb_exec(cpu, tb);
cpu->uc->last_tb = tb; // Trace the last tb we executed.
tb = (TranslationBlock *)(ret & ~TB_EXIT_MASK); tb = (TranslationBlock *)(ret & ~TB_EXIT_MASK);
*tb_exit = ret & TB_EXIT_MASK; *tb_exit = ret & TB_EXIT_MASK;
if (*tb_exit != TB_EXIT_REQUESTED) { if (*tb_exit != TB_EXIT_REQUESTED) {