Merge branch 'master' into mem_map_ex_cse

regress/fpu_ip.py

@@ -0,0 +1,61 @@
+#!/usr/bin/python
+from unicorn import *
+from unicorn.x86_const import *
+from capstone import *
+
+ESP = 0x2000
+PAGE_SIZE = 2 * 1024 * 1024
+
+#	mov [esp], DWORD 0x37f
+#	fldcw [esp]
+#	fnop
+#	fnstenv [esp + 8]
+#	pop ecx
+CODE = b'\xc7\x04\x24\x7f\x03\x00\x00\xd9\x2c\x24\xd9\xd0\xd9\x74\x24\x08\x59'
+
+class SimpleEngine:
+	def __init__(self):
+		self.capmd = Cs(CS_ARCH_X86, CS_MODE_32)
+
+	def disas_single(self, data):
+		for i in self.capmd.disasm(data, 16):
+			print("\t%s\t%s" % (i.mnemonic, i.op_str))
+			break
+
+disasm = SimpleEngine()
+
+def hook_code(uc, addr, size, user_data):
+	mem = uc.mem_read(addr, size)
+	print("  0x%X:" % (addr)),
+	disasm.disas_single(str(mem))
+
+def mem_reader(addr, size):
+	tmp = mu.mem_read(addr, size)
+
+	for i in tmp:
+		print(" 0x%x" % i),
+	print("")
+
+
+mu = Uc(UC_ARCH_X86, UC_MODE_32)
+
+mu.mem_map(0x0, PAGE_SIZE)
+mu.mem_write(0x4000, CODE)
+mu.reg_write(UC_X86_REG_ESP, ESP)
+mu.hook_add(UC_HOOK_CODE, hook_code)
+
+
+mu.emu_start(0x4000, 0, 0, 5)
+esp = mu.reg_read(UC_X86_REG_ESP)
+print("value at ESP [0x%X - 4]: " % esp)
+mem_reader(esp +  14, 4)
+
+# EXPECTED OUTPUT:
+#   0x4000: 	mov	dword ptr [esp], 0x37f
+#   0x4007: 	fldcw	word ptr [esp]
+#   0x400A: 	fnop	
+#   0x400C: 	fnstenv	dword ptr [esp + 8]
+#   0x4010: 	pop	ecx
+# value at ESP [0x2004 - 4]: 
+#  0x0  0x0  0xa  0x40 
+#  ^ this value should match the fnop instuction addr

regress/fpu_ip64.py

@@ -0,0 +1,62 @@
+#!/usr/bin/python
+from unicorn import *
+from unicorn.x86_const import *
+from capstone import *
+
+ESP = 0x2000
+PAGE_SIZE = 2 * 1024 * 1024
+
+#	mov [esp], DWORD 0x37f
+#	fldcw [esp]
+#	fnop
+#	fnstenv [esp + 8]
+#	pop ecx
+CODE = "C704247F030000D92C24D9D0D974240859".decode('hex')
+
+class SimpleEngine:
+	def __init__(self):
+		self.capmd = Cs(CS_ARCH_X86, CS_MODE_64)
+
+	def disas_single(self, data):
+		for i in self.capmd.disasm(data, 16):
+			print("\t%s\t%s" % (i.mnemonic, i.op_str))
+			break
+
+disasm = SimpleEngine()
+
+def hook_code(uc, addr, size, user_data):
+	mem = uc.mem_read(addr, size)
+	print("  0x%X:" % (addr)),
+	disasm.disas_single(str(mem))
+
+def mem_reader(addr, size):
+	tmp = mu.mem_read(addr, size)
+
+	for i in tmp:
+		print(" 0x%x" % i),
+	print("")
+
+
+mu = Uc(UC_ARCH_X86, UC_MODE_64)
+
+mu.mem_map(0x0, PAGE_SIZE)
+mu.mem_write(0x4000, CODE)
+mu.reg_write(UC_X86_REG_RSP, ESP)
+mu.hook_add(UC_HOOK_CODE, hook_code)
+
+
+mu.emu_start(0x4000, 0, 0, 5)
+rsp = mu.reg_read(UC_X86_REG_RSP)
+print("Value of FPIP: [0x%X]" % (rsp + 10))
+mem_reader(rsp + 10, 8)
+# EXPECTED OUTPUT:
+
+#   0x4000: 	mov	dword ptr [rsp], 0x37f
+#   0x4007: 	fldcw	word ptr [rsp]
+#   0x400A: 	fnop	
+#   0x400C: 	fnstenv	dword ptr [rsp + 8]
+#   0x4010: 	pop	rcx
+# Value of FPIP: [0x2012]
+#  0x0  0x0  0xa  0x40  0x0  0x0  0x0  0x0 
+
+# WHERE: the value of FPIP should be the address of fnop

regress/jmp_ebx_hang.py

@@ -4,20 +4,23 @@
 
 import unicorn
 CODE_ADDR = 0x10101000
-CODE = b'\xff\xe3'
+CODE = b'\xff\xe3'  # jmp ebx
 mu = unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_32)
 mu.mem_map(CODE_ADDR, 1024 * 4)
 mu.mem_write(CODE_ADDR, CODE)
 # If EBX is zero then an exception is raised, as expected
 mu.reg_write(unicorn.x86_const.UC_X86_REG_EBX, 0x0)
 
+print(">>> jmp ebx (ebx = 0)");
 try:
     mu.emu_start(CODE_ADDR, CODE_ADDR + 2, count=1)
 except unicorn.UcError as e:
+    print("ERROR: %s" % e)
     assert(e.errno == unicorn.UC_ERR_CODE_INVALID)
 else:
     assert(False)
 
+print(">>> jmp ebx (ebx = 0xaa96a47f)");
 mu = unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_32)
 mu.mem_map(CODE_ADDR, 1024 * 4)
 # If we write this address to EBX then the emulator hangs on emu_start
@@ -26,6 +29,7 @@ mu.mem_write(CODE_ADDR, CODE)
 try:
     mu.emu_start(CODE_ADDR, CODE_ADDR + 2, count=1)
 except unicorn.UcError as e:
+    print("ERROR: %s" % e)
     assert(e.errno == unicorn.UC_ERR_CODE_INVALID)
 else:
     assert(False)

regress/pshufb.py

@@ -0,0 +1,12 @@
+#!/usr/bin/python
+# By Ryan Hileman, issue #91
+
+# Invalid instruction = test failed
+
+from unicorn import *
+from unicorn.x86_const import *
+uc = Uc(UC_ARCH_X86, UC_MODE_64)
+uc.mem_map(0x2000, 0x1000)
+# pshufb xmm0, xmm1
+uc.mem_write(0x2000, '660f3800c1'.decode('hex'))
+uc.emu_start(0x2000, 0)