yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-04 22:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rhelmot-feat/setup_stuff

Browse source
This commit is contained in:
Nguyen Anh Quynh 2016-09-20 21:00:38 +08:00
parent ac99b5bd14 95e8dc0fb8
commit 4188c4cbca
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/haskell/unicorn.cabal
View file

@ -31,7 +31,7 @@ library
other-modules: Unicorn.Internal.Util other-modules: Unicorn.Internal.Util
build-depends: base >=4 && <5, build-depends: base >=4 && <5,
bytestring >= 0.9.1, bytestring >= 0.9.1,
transformers <= 0.5, transformers < 0.6,
either >= 4.4 either >= 4.4
hs-source-dirs: src hs-source-dirs: src
c-sources: src/cbits/unicorn_wrapper.c c-sources: src/cbits/unicorn_wrapper.c

2
bindings/java/samples/Sample_arm.java
View file

@ -109,7 +109,7 @@ public class Sample_arm {
// emulate machine code in infinite time (last param = 0), or when // emulate machine code in infinite time (last param = 0), or when
// finishing all the code. // 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 // now print out some registers
System.out.print(">>> Emulation done. Below is the CPU context\n"); System.out.print(">>> Emulation done. Below is the CPU context\n");

3
bindings/python/sample_arm.py
View file

@ -85,7 +85,8 @@ def test_thumb():
mu.hook_add(UC_HOOK_CODE, hook_code) mu.hook_add(UC_HOOK_CODE, hook_code)
# emulate machine code in infinite time # 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 # now print out some registers
print(">>> Emulation done. Below is the CPU context") print(">>> Emulation done. Below is the CPU context")

2
bindings/ruby/sample_arm.rb
View file

@ -87,7 +87,7 @@ def test_thumb()
mu.hook_add(UC_HOOK_CODE, $hook_code) mu.hook_add(UC_HOOK_CODE, $hook_code)
# emulate machine code in infinite time # 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 # now print out some registers
puts(">>> Emulation done. Below is the CPU context") puts(">>> Emulation done. Below is the CPU context")

3
samples/sample_arm.c
View file

@ -135,7 +135,8 @@ static void test_thumb(void)
// emulate machine code in infinite time (last param = 0), or when // emulate machine code in infinite time (last param = 0), or when
// finishing all the code. // 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) { if (err) {
printf("Failed on uc_emu_start() with error returned: %u\n", err); printf("Failed on uc_emu_start() with error returned: %u\n", err);
} }