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

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",