lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid overwriting tmp0

Browse Source
This commit is contained in:
lazymio
2023-08-06 21:25:37 +08:00
parent 0619deeafd
commit c889258d8e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
qemu/target/i386/translate.c
View File

@@ -532,12 +532,21 @@ static inline void gen_op_add_reg_T0(DisasContext *s, MemOp size, int reg)
gen_op_mov_reg_v(s, size, reg, s->tmp0); gen_op_mov_reg_v(s, size, reg, s->tmp0);
} }
static inline void gen_sync_pc(TCGContext *ctx, uint64_t pc) {
TCGv v = tcg_temp_new(ctx);
tcg_gen_movi_tl(ctx, v, pc);
gen_op_jmp_v(ctx, v);
tcg_temp_free(ctx, v);
}
static inline void gen_op_ld_v(DisasContext *s, int idx, TCGv t0, TCGv a0) static inline void gen_op_ld_v(DisasContext *s, int idx, TCGv t0, TCGv a0)
{ {
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
if (HOOK_EXISTS(s->uc, UC_HOOK_MEM_READ)) if (HOOK_EXISTS(s->uc, UC_HOOK_MEM_READ))
gen_jmp_im(s, s->prev_pc); // Unicorn: sync EIP gen_sync_pc(tcg_ctx, s->prev_pc); // Unicorn: sync EIP
tcg_gen_qemu_ld_tl(tcg_ctx, t0, a0, s->mem_index, idx | MO_LE); tcg_gen_qemu_ld_tl(tcg_ctx, t0, a0, s->mem_index, idx | MO_LE);
} }
@@ -547,7 +556,7 @@ static inline void gen_op_st_v(DisasContext *s, int idx, TCGv t0, TCGv a0)
TCGContext *tcg_ctx = s->uc->tcg_ctx; TCGContext *tcg_ctx = s->uc->tcg_ctx;
if (HOOK_EXISTS(s->uc, UC_HOOK_MEM_WRITE)) if (HOOK_EXISTS(s->uc, UC_HOOK_MEM_WRITE))
gen_jmp_im(s, s->prev_pc); // Unicorn: sync EIP gen_sync_pc(tcg_ctx, s->prev_pc); // Unicorn: sync EIP
tcg_gen_qemu_st_tl(tcg_ctx, t0, a0, s->mem_index, idx | MO_LE); tcg_gen_qemu_st_tl(tcg_ctx, t0, a0, s->mem_index, idx | MO_LE);
} }
@@ -4801,7 +4810,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
if (uc_addr_is_exit(env->uc, s->pc)) { if (uc_addr_is_exit(env->uc, s->pc)) {
// imitate the HLT instruction // imitate the HLT instruction
gen_update_cc_op(s); gen_update_cc_op(s);
gen_jmp_im(s, pc_start - s->cs_base); gen_sync_pc(tcg_ctx, pc_start - s->cs_base);
gen_helper_hlt(tcg_ctx, tcg_ctx->cpu_env, tcg_const_i32(tcg_ctx, s->pc - pc_start)); gen_helper_hlt(tcg_ctx, tcg_ctx->cpu_env, tcg_const_i32(tcg_ctx, s->pc - pc_start));
s->base.is_jmp = DISAS_NORETURN; s->base.is_jmp = DISAS_NORETURN;
return s->pc; return s->pc;
@@ -4816,7 +4825,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
} }
// Sync PC in advance // Sync PC in advance
gen_jmp_im(s, pc_start - s->cs_base); gen_sync_pc(tcg_ctx, pc_start - s->cs_base);
// save the last operand // save the last operand
prev_op = tcg_last_op(tcg_ctx); prev_op = tcg_last_op(tcg_ctx);