Merge branch 'master' into mem_map_ex_cse

This commit is contained in:
Chris Eagle
2015-08-28 19:00:39 -07:00
28 changed files with 2915 additions and 2826 deletions

4
uc.c Executable file → Normal file
View File

@ -429,6 +429,7 @@ uc_err uc_emu_start(uch handle, uint64_t begin, uint64_t until, uint64_t timeout
uc->stop_request = false;
uc->invalid_error = UC_ERR_OK;
uc->block_full = false;
uc->emulation_done = false;
switch(uc->arch) {
default:
@ -507,6 +508,9 @@ uc_err uc_emu_stop(uch handle)
// invalid handle
return UC_ERR_UCH;
if (uc->emulation_done)
return UC_ERR_OK;
uc->stop_request = true;
// exit the current TB
cpu_exit(uc->current_cpu);