Merge branch 'master' into rhelmot-feat/setup_stuff

2016-09-20 21:00:38 +08:00
parent ac99b5bd14 95e8dc0fb8
commit 4188c4cbca
5 changed files with 7 additions and 5 deletions
--- a/bindings/python/sample_arm.py
+++ b/bindings/python/sample_arm.py
@ -85,7 +85,8 @@ def test_thumb():
        mu.hook_add(UC_HOOK_CODE, hook_code)

        # emulate machine code in infinite time
-        mu.emu_start(ADDRESS, ADDRESS + len(THUMB_CODE))
+        # Note we start at ADDRESS | 1 to indicate THUMB mode.
+        mu.emu_start(ADDRESS | 1, ADDRESS + len(THUMB_CODE))

        # now print out some registers
        print(">>> Emulation done. Below is the CPU context")