Merge remote-tracking branch 'upstream/master' into change-handle-based-api

# Conflicts: # qemu/target-i386/unicorn.c
2015-09-01 13:17:03 -04:00
parent 3bd705a060 90fc201f8d
commit 2c802a3e4b
17 changed files with 504 additions and 77 deletions
--- a/qemu/cpu-exec.c
+++ b/qemu/cpu-exec.c
@ -205,6 +205,8 @@ int cpu_exec(struct uc_struct *uc, CPUArchState *env)   // qq
                have_tb_lock = true;
                tb = tb_find_fast(env);	// qq
                if (!tb) {   // invalid TB due to invalid code?
+                    uc->invalid_error = UC_ERR_CODE_INVALID;
+                    ret = EXCP_HLT;
                    break;
                }
                /* Note: we do it here to avoid a gcc bug on Mac OS X when