mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2024-12-31 22:55:40 +00:00
Merge branch 'master' into rhelmot-feat/setup_stuff
This commit is contained in:
commit
4188c4cbca
|
@ -31,7 +31,7 @@ library
|
|||
other-modules: Unicorn.Internal.Util
|
||||
build-depends: base >=4 && <5,
|
||||
bytestring >= 0.9.1,
|
||||
transformers <= 0.5,
|
||||
transformers < 0.6,
|
||||
either >= 4.4
|
||||
hs-source-dirs: src
|
||||
c-sources: src/cbits/unicorn_wrapper.c
|
||||
|
|
|
@ -109,7 +109,7 @@ public class Sample_arm {
|
|||
|
||||
// emulate machine code in infinite time (last param = 0), or when
|
||||
// finishing all the code.
|
||||
u.emu_start(ADDRESS, ADDRESS + THUMB_CODE.length, 0, 0);
|
||||
u.emu_start(ADDRESS | 1, ADDRESS + THUMB_CODE.length, 0, 0);
|
||||
|
||||
// now print out some registers
|
||||
System.out.print(">>> Emulation done. Below is the CPU context\n");
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -87,7 +87,7 @@ def test_thumb()
|
|||
mu.hook_add(UC_HOOK_CODE, $hook_code)
|
||||
|
||||
# emulate machine code in infinite time
|
||||
mu.emu_start(ADDRESS, ADDRESS + THUMB_CODE.bytesize)
|
||||
mu.emu_start(ADDRESS | 1, ADDRESS + THUMB_CODE.bytesize)
|
||||
|
||||
# now print out some registers
|
||||
puts(">>> Emulation done. Below is the CPU context")
|
||||
|
|
|
@ -135,7 +135,8 @@ static void test_thumb(void)
|
|||
|
||||
// emulate machine code in infinite time (last param = 0), or when
|
||||
// finishing all the code.
|
||||
err = uc_emu_start(uc, ADDRESS, ADDRESS + sizeof(THUMB_CODE) -1, 0, 0);
|
||||
// Note we start at ADDRESS | 1 to indicate THUMB mode.
|
||||
err = uc_emu_start(uc, ADDRESS | 1, ADDRESS + sizeof(THUMB_CODE) -1, 0, 0);
|
||||
if (err) {
|
||||
printf("Failed on uc_emu_start() with error returned: %u\n", err);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue