From c8569d8128ca2f90956576aa88a9fc7e574bedc6 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Thu, 28 Jan 2016 16:03:19 +0800 Subject: [PATCH] arm: fix change PC feature. now tests/regress/callback-pc.py passes --- qemu/cpu-exec.c | 6 ++++-- qemu/target-arm/unicorn_arm.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qemu/cpu-exec.c b/qemu/cpu-exec.c index 6fd497bf..b9eb9067 100644 --- a/qemu/cpu-exec.c +++ b/qemu/cpu-exec.c @@ -236,6 +236,7 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env) // qq tc_ptr = tb->tc_ptr; /* execute the generated code */ next_tb = cpu_tb_exec(cpu, tc_ptr); // qq + switch (next_tb & TB_EXIT_MASK) { case TB_EXIT_REQUESTED: /* Something asked us to stop executing @@ -302,12 +303,13 @@ static tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr) TranslationBlock *tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK); if (cc->synchronize_from_tb) { // avoid sync twice when helper_uc_tracecode() already did this. - if (env->uc->emu_counter <= env->uc->emu_count && !env->uc->stop_request) + if (env->uc->emu_counter <= env->uc->emu_count && + !env->uc->stop_request && !env->uc->quit_request) cc->synchronize_from_tb(cpu, tb); } else { assert(cc->set_pc); // avoid sync twice when helper_uc_tracecode() already did this. - if (env->uc->emu_counter <= env->uc->emu_count) + if (env->uc->emu_counter <= env->uc->emu_count && !env->uc->quit_request) cc->set_pc(cpu, tb->pc); } } diff --git a/qemu/target-arm/unicorn_arm.c b/qemu/target-arm/unicorn_arm.c index 63f2c3f5..c8349806 100644 --- a/qemu/target-arm/unicorn_arm.c +++ b/qemu/target-arm/unicorn_arm.c @@ -90,10 +90,12 @@ int arm_reg_write(struct uc_struct *uc, unsigned int regid, const void *value) break; //case UC_ARM_REG_PC: case UC_ARM_REG_R15: + ARM_CPU(uc, mycpu)->env.pc = *(uint32_t *)value; ARM_CPU(uc, mycpu)->env.regs[15] = *(uint32_t *)value; // force to quit execution and flush TB uc->quit_request = true; uc_emu_stop(uc); + break; } }