mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-07 16:30:40 +00:00
Merge branch 'master' of https://github.com/unicorn-engine/unicorn
This commit is contained in:
Nguyen Anh Quynh
commit
9cd7e2fbf6
|
|
@ -260,22 +260,22 @@ int x86_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
|
||||||
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
|
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_CS:
|
case UC_X86_REG_CS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_CS].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_CS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_DS:
|
case UC_X86_REG_DS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_DS].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_DS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_SS:
|
case UC_X86_REG_SS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_SS].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_SS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_ES:
|
case UC_X86_REG_ES:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_ES].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_ES].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_FS:
|
case UC_X86_REG_FS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_FS].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_FS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_GS:
|
case UC_X86_REG_GS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_GS].base;
|
*(int32_t *)value = X86_CPU(uc, mycpu)->env.segs[R_GS].base;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -412,22 +412,22 @@ int x86_reg_read(struct uc_struct *uc, unsigned int regid, void *value)
|
||||||
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
|
*(int16_t *)value = READ_WORD(X86_CPU(uc, mycpu)->env.eip);
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_CS:
|
case UC_X86_REG_CS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_CS].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_CS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_DS:
|
case UC_X86_REG_DS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_DS].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_DS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_SS:
|
case UC_X86_REG_SS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_SS].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_SS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_ES:
|
case UC_X86_REG_ES:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_ES].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_ES].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_FS:
|
case UC_X86_REG_FS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_FS].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_FS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_GS:
|
case UC_X86_REG_GS:
|
||||||
*(int16_t *)value = X86_CPU(uc, mycpu)->env.segs[R_GS].base;
|
*(int64_t *)value = X86_CPU(uc, mycpu)->env.segs[R_GS].base;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_R8:
|
case UC_X86_REG_R8:
|
||||||
*(int64_t *)value = READ_QWORD(X86_CPU(uc, mycpu)->env.regs[8]);
|
*(int64_t *)value = READ_QWORD(X86_CPU(uc, mycpu)->env.regs[8]);
|
||||||
|
|
@ -660,22 +660,22 @@ int x86_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
|
||||||
WRITE_WORD(X86_CPU(uc, mycpu)->env.eip, *(uint16_t *)value);
|
WRITE_WORD(X86_CPU(uc, mycpu)->env.eip, *(uint16_t *)value);
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_CS:
|
case UC_X86_REG_CS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_CS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_CS].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_DS:
|
case UC_X86_REG_DS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_DS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_DS].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_SS:
|
case UC_X86_REG_SS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_SS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_SS].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_ES:
|
case UC_X86_REG_ES:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_ES].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_ES].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_FS:
|
case UC_X86_REG_FS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_FS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_FS].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_GS:
|
case UC_X86_REG_GS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_GS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_GS].base = *(uint32_t *)value;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -812,22 +812,22 @@ int x86_reg_write(struct uc_struct *uc, unsigned int regid, const void *value)
|
||||||
WRITE_WORD(X86_CPU(uc, mycpu)->env.eip, *(uint16_t *)value);
|
WRITE_WORD(X86_CPU(uc, mycpu)->env.eip, *(uint16_t *)value);
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_CS:
|
case UC_X86_REG_CS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_CS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_CS].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_DS:
|
case UC_X86_REG_DS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_DS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_DS].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_SS:
|
case UC_X86_REG_SS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_SS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_SS].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_ES:
|
case UC_X86_REG_ES:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_ES].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_ES].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_FS:
|
case UC_X86_REG_FS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_FS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_FS].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_GS:
|
case UC_X86_REG_GS:
|
||||||
X86_CPU(uc, mycpu)->env.segs[R_GS].base = *(uint16_t *)value;
|
X86_CPU(uc, mycpu)->env.segs[R_GS].base = *(uint64_t *)value;
|
||||||
break;
|
break;
|
||||||
case UC_X86_REG_R8:
|
case UC_X86_REG_R8:
|
||||||
X86_CPU(uc, mycpu)->env.regs[8] = *(uint64_t *)value;
|
X86_CPU(uc, mycpu)->env.regs[8] = *(uint64_t *)value;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
# reg_write() can't modify PC from within trace callbacks
|
# reg_write() can't modify PC from within trace callbacks
|
||||||
# Pull Request #4
|
# issue #210
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
from unicorn import *
|
from unicorn import *
|
||||||
|
|
@ -30,11 +30,7 @@ def hook_block(uc, address, size, user_data):
|
||||||
|
|
||||||
class CallBackPCTest(regress.RegressTest):
|
class CallBackPCTest(regress.RegressTest):
|
||||||
|
|
||||||
def runTest(self):
|
def test_instruction_trace(self):
|
||||||
self.instruction_trace_test()
|
|
||||||
|
|
||||||
# set up emulation
|
|
||||||
def instruction_trace_test(self):
|
|
||||||
try:
|
try:
|
||||||
# initialize emulator in ARM's Thumb mode
|
# initialize emulator in ARM's Thumb mode
|
||||||
mu = Uc(UC_ARCH_ARM, UC_MODE_THUMB)
|
mu = Uc(UC_ARCH_ARM, UC_MODE_THUMB)
|
||||||
|
|
@ -51,14 +47,44 @@ class CallBackPCTest(regress.RegressTest):
|
||||||
# tracing all instructions with customized callback
|
# tracing all instructions with customized callback
|
||||||
mu.hook_add(UC_HOOK_CODE, hook_code, user_data=mu)
|
mu.hook_add(UC_HOOK_CODE, hook_code, user_data=mu)
|
||||||
|
|
||||||
# tracing all basic blocks with customized callback
|
# emulate one instruction
|
||||||
mu.hook_add(UC_HOOK_BLOCK, hook_block, user_data=mu)
|
mu.emu_start(BASE_ADDRESS, BASE_ADDRESS + len(THUMB_CODE), count=1)
|
||||||
|
|
||||||
# emulate machine code in infinite time
|
# the instruction trace callback set PC to 0xffffffff, so at this
|
||||||
mu.emu_start(BASE_ADDRESS, BASE_ADDRESS + len(THUMB_CODE))
|
# point, the PC value should be 0xffffffff.
|
||||||
|
pc = mu.reg_read(UC_ARM_REG_PC)
|
||||||
|
self.assertEqual(pc, 0xffffffff, "PC not set to 0xffffffff by instruction trace callback")
|
||||||
|
|
||||||
except UcError as e:
|
except UcError as e:
|
||||||
assertFalse(0, "ERROR: %s" % e)
|
self.assertFalse(0, "ERROR: %s" % e)
|
||||||
|
|
||||||
|
def test_block_trace(self):
|
||||||
|
try:
|
||||||
|
# initialize emulator in ARM's Thumb mode
|
||||||
|
mu = Uc(UC_ARCH_ARM, UC_MODE_THUMB)
|
||||||
|
|
||||||
|
# map some memory
|
||||||
|
mu.mem_map(BASE_ADDRESS, 2 * 1024 * 1024)
|
||||||
|
|
||||||
|
# write machine code to be emulated to memory
|
||||||
|
mu.mem_write(BASE_ADDRESS, THUMB_CODE)
|
||||||
|
|
||||||
|
# setup stack
|
||||||
|
mu.reg_write(UC_ARM_REG_SP, BASE_ADDRESS + 2 * 1024 * 1024)
|
||||||
|
|
||||||
|
# trace blocks with customized callback
|
||||||
|
mu.hook_add(UC_HOOK_BLOCK, hook_block, user_data=mu)
|
||||||
|
|
||||||
|
# emulate one instruction
|
||||||
|
mu.emu_start(BASE_ADDRESS, BASE_ADDRESS + len(THUMB_CODE), count=1)
|
||||||
|
|
||||||
|
# the block callback set PC to 0xffffffff, so at this point, the PC
|
||||||
|
# value should be 0xffffffff.
|
||||||
|
pc = mu.reg_read(UC_ARM_REG_PC)
|
||||||
|
self.assertEqual(pc, 0xffffffff, "PC not set to 0xffffffff by block callback")
|
||||||
|
|
||||||
|
except UcError as e:
|
||||||
|
self.assertFalse(0, "ERROR: %s" % e)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
regress.main()
|
regress.main()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue