Merge remote-tracking branch 'upstream/master' into change-handle-based-api

regress/reg_write_sign_extension.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+
+"""See https://github.com/unicorn-engine/unicorn/issues/98"""
+
+import unicorn
+ADDR = 0xffaabbcc
+
+def hook_mem_invalid(mu, access, address, size, value, user_data):
+    print ">>> Expected value: 0x%x, actual value: 0x%x" % (ADDR, address)
+    assert(address == ADDR)
+    mu.mem_map(address & 0xfffff000, 4 * 1024)
+    mu.mem_write(address, b'\xcc')
+    return True
+
+mu = unicorn.Uc(unicorn.UC_ARCH_X86, unicorn.UC_MODE_32)
+mu.reg_write(unicorn.x86_const.UC_X86_REG_EBX, ADDR)
+
+mu.mem_map(0x10000000, 1024 * 4)
+# jmp ebx
+mu.mem_write(0x10000000, b'\xff\xe3')
+
+mu.hook_add(unicorn.UC_HOOK_MEM_INVALID, hook_mem_invalid)
+mu.emu_start(0x10000000, 0x10000000 + 2, count=1)

regress/ro_mem_test.c

@@ -157,8 +157,11 @@ int main(int argc, char **argv, char **envp)
 
     // emulate machine code in infinite time
     printf("BEGIN execution - 2\n");
+    //update eax to point to aligned memory (same as add eax,7 above)
     uint32_t eax = 0x40002C;
     uc_reg_write(uc, UC_X86_REG_EAX, &eax); 
+    //resume execution at the mov dword [eax], 0x87654321
+    //to test an aligned write as well
     err = uc_emu_start(uc, 0x400015, 0x400000 + sizeof(PROGRAM), 0, 2);
     if (err) {
         printf("Expected failure on uc_emu_start() with error returned %u: %s\n",