Fixes: I think it works now?!

JayFoxRox · Nov 8, 2018 · 6f8e1f0 · 6f8e1f0
1 parent f4b4d0f
commit 6f8e1f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/emulation.c b/emulation.c
@@ -379,6 +379,7 @@ Address CreateHlt() {
 
       // Fill guest_registers
       "mov guest_registers, %%esp\n"
+      "add $32, %%esp\n"
       "pusha\n"
 
       // Move to host space
@@ -395,15 +396,15 @@ Address CreateHlt() {
 
   *code++ = 0xc7; // mov code_address, [guest_eip]
   *code++ = 0x05;
-  *(uint32_t*)code = &host_eip;
+  *(uint32_t*)code = (uintptr_t)&host_eip;
   code += 4;
   *(uint32_t*)code = code_address + 1;
   code += 4;
 
   //FIXME: Use another ESP
   //FIXME: Keep copy of EIP
-  *code++ = 0xE8; // call __return_to_host
-  *(uint32_t*)code = __return_to_host - (uintptr_t)code - 4; //((uintptr_t)__return_to_host - (uintptr_t)code) - 5;
+  *code++ = 0xE9; // jmp __return_to_host
+  *(uint32_t*)code = (uintptr_t)__return_to_host - (uintptr_t)code - 4;
   code += 4;
 #else
   Address code_address = Allocate(2);

diff --git a/uc_native.c b/uc_native.c
@@ -361,9 +361,8 @@ uc_err uc_emu_start(uc_engine *uc, uint64_t begin, uint64_t until, uint64_t time
                  "pusha\n"
                  "mov %%esp, host_esp\n"
 
-                 // Load all registers, except ESP
+                 // Load all registers
                  "mov guest_registers, %%esp\n"
-                 "add $32, %%esp\n"
                  "popa\n"
                  "mov guest_registers_esp, %%esp\n"
                  //FIXME: Fixup ESP too