Skip to content

Commit 904efc1

Browse files
committedFeb 10, 2025··
Should use tcg_ctx->pc_start as pc
1 parent 0c7017a commit 904efc1

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed
 

‎qemu/target/arm/translate.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -454,17 +454,15 @@ static void gen_sub_carry(TCGContext *tcg_ctx, TCGv_i32 dest, TCGv_i32 t0, TCGv_
454454

455455
static inline void mb_tcg_opcode_cmp_hook(TCGContext *tcg_ctx, TCGv_i64 v0, TCGv_i64 v1, uint32_t size)
456456
{
457-
CPUARMState *cpuarm = (CPUARMState *)(tcg_ctx->cpu->env_ptr);
458-
uint64_t pc = cpuarm->regs[15] + (cpuarm->thumb ? 1 : 0);
459457
uc_engine *uc = tcg_ctx->uc;
460-
if (HOOK_EXISTS_BOUNDED(uc, UC_HOOK_TCG_OPCODE, pc)) {
458+
if (HOOK_EXISTS_BOUNDED(uc, UC_HOOK_TCG_OPCODE, tcg_ctx->pc_start)) {
461459
struct hook *hook;
462460
HOOK_FOREACH_VAR_DECLARE;
463461
HOOK_FOREACH(uc, hook, UC_HOOK_TCG_OPCODE) {
464462
if (hook->to_delete)
465463
continue;
466464
if (hook->op == UC_TCG_OP_SUB && (hook->op_flags & UC_TCG_OP_FLAG_CMP)) {
467-
gen_uc_traceopcode(tcg_ctx, hook, v0, v1, size, uc, pc);
465+
gen_uc_traceopcode(tcg_ctx, hook, v0, v1, size, uc, tcg_ctx->pc_start);
468466
}
469467
}
470468
}

0 commit comments

Comments
 (0)
Please sign in to comment.