yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 12:26:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Go: update test hooks

Browse source
This commit is contained in:
Ryan Hileman 2016-02-27 10:55:40 -08:00
parent 693719e732
commit 475c8de3de
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/go/unicorn/hook.go
View file

@ -100,9 +100,9 @@ func (u *uc) HookAdd(htype int, cb interface{}, begin, end uint64, extra ...int)
data := &HookData{u, cb} data := &HookData{u, cb}
uptr := uintptr(unsafe.Pointer(data)) uptr := uintptr(unsafe.Pointer(data))
if insnMode { if insnMode {
C.uc_hook_add_wrap(u.handle, &h2, C.uc_hook_type(htype), callback, C.uintptr_t(uptr), C.uint64_t(begin), C.uint64_t(end))
} else {
C.uc_hook_add_insn(u.handle, &h2, C.uc_hook_type(htype), callback, C.uintptr_t(uptr), C.uint64_t(begin), C.uint64_t(end), insn) C.uc_hook_add_insn(u.handle, &h2, C.uc_hook_type(htype), callback, C.uintptr_t(uptr), C.uint64_t(begin), C.uint64_t(end), insn)
} else {
C.uc_hook_add_wrap(u.handle, &h2, C.uc_hook_type(htype), callback, C.uintptr_t(uptr), C.uint64_t(begin), C.uint64_t(end))
} }
hookDataMap[uptr] = data hookDataMap[uptr] = data
hookToUintptr[Hook(h2)] = uptr hookToUintptr[Hook(h2)] = uptr

6
bindings/go/unicorn/x86_test.go
View file

@ -96,7 +96,7 @@ func TestX86InOut(t *testing.T) {
default: default:
return 0 return 0
} }
}, X86_INS_IN) }, 1, 0, X86_INS_IN)
mu.HookAdd(HOOK_INSN, func(_ Unicorn, port, size, value uint32) { mu.HookAdd(HOOK_INSN, func(_ Unicorn, port, size, value uint32) {
outCalled = true outCalled = true
var err error var err error
@ -111,7 +111,7 @@ func TestX86InOut(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
}, X86_INS_OUT) }, 1, 0, X86_INS_OUT)
if err := mu.Start(ADDRESS, ADDRESS+uint64(len(code))); err != nil { if err := mu.Start(ADDRESS, ADDRESS+uint64(len(code))); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -132,7 +132,7 @@ func TestX86Syscall(t *testing.T) {
mu.HookAdd(HOOK_INSN, func(_ Unicorn) { mu.HookAdd(HOOK_INSN, func(_ Unicorn) {
rax, _ := mu.RegRead(X86_REG_RAX) rax, _ := mu.RegRead(X86_REG_RAX)
mu.RegWrite(X86_REG_RAX, rax+1) mu.RegWrite(X86_REG_RAX, rax+1)
}, X86_INS_SYSCALL) }, 1, 0, X86_INS_SYSCALL)
mu.RegWrite(X86_REG_RAX, 0x100) mu.RegWrite(X86_REG_RAX, 0x100)
err = mu.Start(ADDRESS, ADDRESS+uint64(len(code))) err = mu.Start(ADDRESS, ADDRESS+uint64(len(code)))
if err != nil { if err != nil {