yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename uc_regstate_restore to uc_context_restore, uc_context_save to uc_context_save

Browse Source
This commit is contained in:
Nguyen Anh Quynh
2016-10-07 10:03:19 +08:00
parent b7cdbe7a88
commit 73577cbcd1
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/python/sample_x86.py
View File

@ -333,7 +333,7 @@ def test_i386_reg_save():
mu.emu_start(address, address+1)
print(">>> save the register state")
saved_regs = mu.regstate_save()
saved_regs = mu.context_save()
print(">>> execute 'inc eax'")
mu.emu_start(address, address+1)
@ -342,7 +342,7 @@ def test_i386_reg_save():
assert mu.reg_read(UC_X86_REG_EAX) == 3
print(">>> restore the register state")
mu.regstate_restore(saved_regs)
mu.context_restore(saved_regs)
print(">>> assert eax == 2")
assert mu.reg_read(UC_X86_REG_EAX) == 2
@ -354,7 +354,7 @@ def test_i386_reg_save():
assert mu.reg_read(UC_X86_REG_EAX) == 3
print(">>> restore the register state")
mu.regstate_restore(saved_regs)
mu.context_restore(saved_regs)
print(">>> assert eax == 2")
assert mu.reg_read(UC_X86_REG_EAX) == 2

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

@ -100,8 +100,8 @@ _setup_prototype(_uc, "uc_mem_map_ptr", ucerr, uc_engine, ctypes.c_uint64, ctype
_setup_prototype(_uc, "uc_mem_unmap", ucerr, uc_engine, ctypes.c_uint64, ctypes.c_size_t)
_setup_prototype(_uc, "uc_mem_protect", ucerr, uc_engine, ctypes.c_uint64, ctypes.c_size_t, ctypes.c_uint32)
_setup_prototype(_uc, "uc_query", ucerr, uc_engine, ctypes.c_uint32, ctypes.POINTER(ctypes.c_size_t))
_setup_prototype(_uc, "uc_regstate_save", ctypes.c_voidp, uc_engine, ctypes.c_voidp)
_setup_prototype(_uc, "uc_regstate_restore", None, uc_engine, ctypes.c_voidp)
_setup_prototype(_uc, "uc_context_save", ctypes.c_voidp, uc_engine, ctypes.c_voidp)
_setup_prototype(_uc, "uc_context_restore", None, uc_engine, ctypes.c_voidp)
_setup_prototype(_uc, "free", None, ctypes.c_voidp)
# uc_hook_add is special due to variable number of arguments
@ -443,20 +443,20 @@ class Uc(object):
raise UcError(status)
h = 0
def regstate_save(self, store=None):
def context_save(self, store=None):
if store is None:
ptr = ctypes.cast(0, ctypes.c_voidp)
return _ActivePointer(_uc.uc_regstate_save(self._uch, ptr))
return _ActivePointer(_uc.uc_context_save(self._uch, ptr))
elif type(store) is _ActivePointer:
_uc.uc_regstate_save(self._uch, store.pointer)
_uc.uc_context_save(self._uch, store.pointer)
return store
else:
raise TypeError("Bad register store %s" % repr(store))
def regstate_restore(self, store):
def context_restore(self, store):
if type(store) is not _ActivePointer:
raise TYpeError("Bad register store %s" % repr(store))
_uc.uc_regstate_restore(self._uch, store.pointer)
_uc.uc_context_restore(self._uch, store.pointer)
class _ActivePointer(object):
def __init__(self, pointer):