summaryrefslogtreecommitdiff
path: root/kernel/entry.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/entry.c')
-rw-r--r--kernel/entry.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/kernel/entry.c b/kernel/entry.c
index 1596429..6058910 100644
--- a/kernel/entry.c
+++ b/kernel/entry.c
@@ -1,18 +1,4 @@
-#include "types.h"
-#include "multiboot.h"
-
-extern void addr_phys;
-extern void addr_virt;
-extern void addr_virt_end;
-extern void addr_load_virt;
-extern void addr_load_virt_end;
-
-extern void entry_stack;
-extern multiboot_info_t entry_multiboot;
-
-extern uint32_t entry_pagedir[];
-extern uint32_t entry_pagetable_low[];
-extern uint32_t entry_pagetable_high[];
+#include "kernel.h"
extern void main();
@@ -92,7 +78,7 @@ void entry_main(uint32_t mb_magic, multiboot_info_t* mb_info) {
// TODO: Check that segments are loaded and mapped right.
// Call main() in virtual memory.
- asm volatile("mov $0, %esp");
+ asm volatile("mov $stack_top, %esp");
main();
stop: