lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sample_ctl.py.

Browse Source 
Commit 640251e1aa added a size parameter to uc_hook_tcg_op_2, but this was not
reflected in the Python bindings.

Commit fbf4078d65 added a len parameter to ctl_remove_cache, but this was not
reflected in sample_ctl.py.
This commit is contained in:
Robert Xiao
2023-05-06 01:42:15 -07:00
parent bde3cd7dae
commit a998231a0e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/python/sample_ctl.py
View File

@@ -57,7 +57,7 @@ def test_uc_ctl_tb_cache():
# Now we clear cache for all TBs. # Now we clear cache for all TBs.
for i in range(8): for i in range(8):
uc.ctl_remove_cache(addr + i * 512) uc.ctl_remove_cache(addr + i * 512, addr + i * 512 + 1)
evicted = time_emulation(uc, addr, addr + len(code)) evicted = time_emulation(uc, addr, addr + len(code))
@@ -66,7 +66,7 @@ def test_uc_ctl_tb_cache():
def trace_new_edge(uc, cur, prev, data): def trace_new_edge(uc, cur, prev, data):
print(f">>> Getting a new edge from {hex(prev.pc + prev.size - 1)} to {hex(cur.pc)}") print(f">>> Getting a new edge from {hex(prev.pc + prev.size - 1)} to {hex(cur.pc)}")
def trace_tcg_sub(uc, address, arg1, arg2, data): def trace_tcg_sub(uc, address, arg1, arg2, size, data):
print(f">>> Get a tcg sub opcode at {hex(address)} with args: {arg1} and {arg2}") print(f">>> Get a tcg sub opcode at {hex(address)} with args: {arg1} and {arg2}")
def test_uc_ctl_exits(): def test_uc_ctl_exits():

6
bindings/python/unicorn/unicorn.py
View File

@@ -210,7 +210,7 @@ UC_HOOK_EDGE_GEN_CB = ctypes.CFUNCTYPE(
None, uc_engine, ctypes.POINTER(uc_tb), ctypes.POINTER(uc_tb), ctypes.c_void_p None, uc_engine, ctypes.POINTER(uc_tb), ctypes.POINTER(uc_tb), ctypes.c_void_p
) )
UC_HOOK_TCG_OPCODE_CB = ctypes.CFUNCTYPE( UC_HOOK_TCG_OPCODE_CB = ctypes.CFUNCTYPE(
None, uc_engine, ctypes.c_uint64, ctypes.c_uint64, ctypes.c_uint64, ctypes.c_void_p None, uc_engine, ctypes.c_uint64, ctypes.c_uint64, ctypes.c_uint64, ctypes.c_uint32, ctypes.c_void_p
) )
# access to error code via @errno of UcError # access to error code via @errno of UcError
@@ -647,9 +647,9 @@ class Uc(object):
return result.value return result.value
@_catch_hook_exception @_catch_hook_exception
def _hook_tcg_op_cb(self, handle, address, arg1, arg2, user_data): def _hook_tcg_op_cb(self, handle, address, arg1, arg2, size, user_data):
(cb, data) = self._callbacks[user_data] (cb, data) = self._callbacks[user_data]
cb(self, address, arg1, arg2, user_data) cb(self, address, arg1, arg2, size, user_data)
@_catch_hook_exception @_catch_hook_exception
def _hook_edge_gen_cb(self, handle, cur, prev, user_data): def _hook_edge_gen_cb(self, handle, cur, prev, user_data):