:: commit 8271c0b8df9970b723084d0605b0b176ecf0d238
32bit stivale was not pushing a return address. (#26)
When trying to boot skift using limine I was still getting an invalid address for the stivale struct. Pushing an additional 0 where the return address should have been fixed the issue.
diff --git a/stage2/protos/stivale.c b/stage2/protos/stivale.c
index 723851a9..29ce4ceb 100644
--- a/stage2/protos/stivale.c
+++ b/stage2/protos/stivale.c
@@ -363,12 +363,13 @@ __attribute__((noreturn)) void stivale_spinup(int bits, bool level5pg,
: "memory"
);
} else if (bits == 32) {
- asm volatile (
+ asm volatile(
"cli\n\t"
"cld\n\t"
"mov esp, dword ptr [esi]\n\t"
"push edi\n\t"
+ "push 0\n\t"
"pushfd\n\t"
"push 0x18\n\t"
@@ -382,10 +383,10 @@ __attribute__((noreturn)) void stivale_spinup(int bits, bool level5pg,
"xor edi, edi\n\t"
"xor ebp, ebp\n\t"
- "iret\n\t" :
- : "b" (&entry_point), "D" (stivale_struct), "S" (&stack)
- : "memory"
- );
+ "iret\n\t"
+ :
+ : "b"(&entry_point), "D"(stivale_struct), "S"(&stack)
+ : "memory");
}
for (;;);
}
