fix conflicts when merging no-thread to master

2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
--- a/uc.c
+++ b/uc.c
@ -566,14 +566,13 @@ uc_err uc_emu_start(uc_engine* uc, uint64_t begin, uint64_t until, uint64_t time

    uc->addr_end = until;

+    if (timeout)
+        enable_emu_timer(uc, timeout * 1000);   // microseconds -> nanoseconds
+
    if (uc->vm_start(uc)) {
        return UC_ERR_RESOURCE;
    }

-    if (timeout)
-        enable_emu_timer(uc, timeout * 1000);   // microseconds -> nanoseconds
-
-    uc->pause_all_vcpus(uc);
    // emulation is done
    uc->emulation_done = true;