From b11a2a876e7bd14078d26e12eab62db997a4dc76 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 14 Apr 2020 23:42:03 +0200
Subject: Switched to grub

This really isn't what I wanted because grub is very big and bloaty but
my own bootloader was very poorly written and I really want to implement
a filesystem like ext2 which wouldn't work with my own bootloader.
Furthermore this commit fixes many small issues including the one
occurring due to the statically linked user binary (I just removed
the linking for now).
---
 src/kernel/boot.asm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/kernel/boot.asm')

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 06411ea..968a824 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -1,3 +1,15 @@
+%define ALIGN    1 ; Align loaded modules on page boundaries
+%define MEMINFO  2 ; Provide memory map
+%define FLAGS    3 ; Flags (ALIGN | MEMINFO)
+%define MAGIC    0x1BADB002
+%define CHECKSUM -(MAGIC + FLAGS)
+
+section .multiboot
+    align 4
+    dd MAGIC
+    dd FLAGS
+    dd CHECKSUM
+
 section .start_section
     dd _start
 
@@ -15,7 +27,9 @@ section .text
     global _start
     extern kernel_main
     _start:
-        push esp
+        mov esp, STACK_TOP
+        push ebx
+        push eax
         cli
         call kernel_main
         cli
-- 
cgit v1.2.3