Added semi-working bootloader

5 files changed, 54 insertions, 102 deletions

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 0f967b7..b1f6018 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -1,63 +1,60 @@
-; The first section of the ELF will be used to locate the entry point.
-section .ezlocation
-dd _start
+section .start_location
+    dd _start
 
-; Set stack
+; Initialize stack
 section .bss
-align 16
-global STACK_BOTTOM
-global STACK_TOP
-
-STACK_BOTTOM:
-resb 0x4000
-STACK_TOP:
+    align 16
+    global STACK_BOTTOM
+    global STACK_TOP
 
+    STACK_BOTTOM:
+        resb 0x4000
+    STACK_TOP:
 
 section .text
+    global _start
+    extern kernel_main
+    _start:
+        mov esp, STACK_TOP
+        push ebx
+        push eax
 
-global _start
-extern kernel_main
-_start:
-	mov esp, STACK_TOP
-	push ebx
-	push eax
-
-	call kernel_main
-	cli
+        call kernel_main
+        cli
 
-hlt_L:
-	hlt
-	jmp hlt_L
+    hlt_L:
+        hlt
+        jmp hlt_L
 
-%include "src/kernel/gdt/gdt.asm"
+    %include "src/kernel/gdt/gdt.asm"
 
-%include "src/kernel/interrupts/idt.asm"
+    %include "src/kernel/interrupts/idt.asm"
 
-%include "src/kernel/interrupts/isr.asm"
+    %include "src/kernel/interrupts/isr.asm"
 
-%include "src/kernel/interrupts/irq.asm"
+    %include "src/kernel/interrupts/irq.asm"
 
-%include "src/kernel/interact.asm"
+    %include "src/kernel/interact.asm"
 
-global switch_to_user
-extern test_user
-switch_to_user:
-    sti
-    mov ax, 0x23
-    mov ds, ax
-    mov es, ax
-    mov fs, ax
-    mov gs, ax
+    global switch_to_user
+    extern test_user
+    switch_to_user:
+        sti
+        mov ax, 0x23
+        mov ds, ax
+        mov es, ax
+        mov fs, ax
+        mov gs, ax
 
-    mov eax, esp
-    push 0x23
-    push eax
-    pushf
-    push 0x1B
-    push test_user
-    iret
+        mov eax, esp
+        push 0x23
+        push eax
+        pushf
+        push 0x1B
+        push test_user
+        iret
 
 section .sizedetect
-global ASM_KERNEL_END
-ASM_KERNEL_END:
-	; Kernel size detection
+    global ASM_KERNEL_END
+    ASM_KERNEL_END:
+        ; Kernel size detection
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 214ecf0..70f9d60 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -6,14 +6,13 @@
 #include <kernel/paging/paging.h>
 #include <kernel/input/input.h>
 #include <kernel/acpi/acpi.h>
-#include <kernel/mutliboot.h>
 #include <kernel/fs/initrd.h>
 #include <kernel/syscall/syscall.h>
 #include <kernel/smbios/smbios.h>
 
 extern void switch_to_user();
 
-void kernel_main(struct multiboot *mboot_ptr) {
+void kernel_main() {
     vga_log("Installing basic features of Melvix...", 0);
     // Install features
     timer_install();
diff --git a/src/kernel/linker.ld b/src/kernel/linker.ld
index 9062b27..8ca4406 100644
--- a/src/kernel/linker.ld
+++ b/src/kernel/linker.ld
@@ -1,27 +1,22 @@
 ENTRY(_start)
 
-/* Where the sections of the object files will be put in the final image */
 SECTIONS {
 	/* Begin @ 1 MB */
 	. = 1M;
 
-	/* Put the multiboot header. Next, the .text section. */
 	.text BLOCK(4K) : ALIGN(4K) {
-		*(.ezlocation)
+		*(.start_location)
 		*(.text)
 	}
 
-	/* Read-only data. */
 	.rodata BLOCK(4K) : ALIGN(4K) {
 		*(.rodata)
 	}
 
-	/* Read-write data (initialized) */
 	.data BLOCK(4K) : ALIGN(4K) {
 		*(.data)
 	}
 
-	/* Read-write data (uninitialized) and stack */
 	.bss BLOCK(4K) : ALIGN(4K) {
 		*(COMMON)
 		*(.bss)
diff --git a/src/kernel/mutliboot.h b/src/kernel/mutliboot.h
deleted file mode 100644
index 683f95f..0000000
--- a/src/kernel/mutliboot.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef MELVIX_MUTLIBOOT_H
-#define MELVIX_MUTLIBOOT_H
-
-#include <stdint.h>
-
-#define MULTIBOOT_FLAG_MEM     0x001
-#define MULTIBOOT_FLAG_DEVICE  0x002
-#define MULTIBOOT_FLAG_CMDLINE 0x004
-#define MULTIBOOT_FLAG_MODS    0x008
-#define MULTIBOOT_FLAG_AOUT    0x010
-#define MULTIBOOT_FLAG_ELF     0x020
-#define MULTIBOOT_FLAG_MMAP    0x040
-#define MULTIBOOT_FLAG_CONFIG  0x080
-#define MULTIBOOT_FLAG_LOADER  0x100
-#define MULTIBOOT_FLAG_APM     0x200
-#define MULTIBOOT_FLAG_VBE     0x400
-
-struct multiboot {
-    uint32_t flags;
-    uint32_t mem_lower;
-    uint32_t mem_upper;
-    uint32_t boot_device;
-    uint32_t cmdline;
-    uint32_t mods_count;
-    uint32_t mods_addr;
-    uint32_t num;
-    uint32_t size;
-    uint32_t addr;
-    uint32_t shndx;
-    uint32_t mmap_length;
-    uint32_t mmap_addr;
-    uint32_t drives_length;
-    uint32_t drives_addr;
-    uint32_t config_table;
-    uint32_t boot_loader_name;
-    uint32_t apm_table;
-    uint32_t vbe_control_info;
-    uint32_t vbe_mode_info;
-    uint32_t vbe_mode;
-    uint32_t vbe_interface_seg;
-    uint32_t vbe_interface_off;
-    uint32_t vbe_interface_len;
-}  __attribute__((packed));
-
-typedef struct multiboot_header multiboot_header_t;
-
-#endif
diff --git a/src/kernel/system.c b/src/kernel/system.c
index 688b0b1..303fc83 100644
--- a/src/kernel/system.c
+++ b/src/kernel/system.c
@@ -5,7 +5,15 @@
 
 char *vga_buffer = (char *) 0x500;
 
+void vga_clear() {
+    uint16_t *terminal_buffer = (uint16_t *) 0xB8000;
+    for (size_t y = 0; y < 25; y++)
+        for (size_t x = 0; x < 80; x++)
+            terminal_buffer[y * 80 + x] = 0 | (uint16_t) 0x700;
+}
+
 void vga_log(char *msg, int line) {
+    if (line == 0) vga_clear();
     uint16_t *terminal_buffer = (uint16_t *) 0xB8000;
     for (size_t i = 0; i < strlen(msg); i++)
         terminal_buffer[line * 80 + i] = (uint16_t) msg[i] | (uint16_t) 0x700;