fix merge conflict

2016-02-01 12:08:38 +08:00
parent cfaac6921b dad2baa92f
commit 20b01a6933
83 changed files with 2074 additions and 1081 deletions
--- a/qemu/target-arm/unicorn_aarch64.c
+++ b/qemu/target-arm/unicorn_aarch64.c
@ -99,6 +99,9 @@ int arm64_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
                     break;
            case UC_ARM64_REG_PC:
                     ARM_CPU(uc, mycpu)->env.pc = *(uint64_t *)value;
+                     // force to quit execution and flush TB
+                     uc->quit_request = true;
+                     uc_emu_stop(uc);
                     break;
            case UC_ARM64_REG_SP:
                     ARM_CPU(uc, mycpu)->env.xregs[31] = *(uint64_t *)value;