:: commit 94a20e649b919d0e451ea4118d84b9e313174527

mintsuki <mintsuki@protonmail.com> — 2022-06-29 10:41

parents: 3d65bfb9b9

multiboot: Fix relocator assembly issues

diff --git a/common/protos/multiboot_reloc.asm_x86 b/common/protos/multiboot_reloc.asm_x86
index 0ad42b76..c16946df 100644
--- a/common/protos/multiboot_reloc.asm_x86
+++ b/common/protos/multiboot_reloc.asm_x86
@@ -16,7 +16,8 @@ multiboot_reloc_stub:
     ; EDX = ranges count
 
   .code:
-    mov esp, .mini_stack_top
+    mov esp, ebx
+    add esp, .mini_stack_top - multiboot_reloc_stub
 
     push edi
     push esi
@@ -54,6 +55,7 @@ multiboot_reloc_stub:
 
     ret
 
+    align 16
  .mini_stack:
     times 3 dq 0
  .mini_stack_top:
tab: 248 wrap: offon