aboutsummaryrefslogtreecommitdiff
path: root/kernel/entry.asm
diff options
context:
space:
mode:
authorMarvin Borner2021-04-29 23:59:48 +0200
committerMarvin Borner2021-04-29 23:59:48 +0200
commit3a3d50d7eb0f4fdbb9beaf16bacfa98689cc448c (patch)
treed837ed9ed9470a20b66b28b6083d30865d7e6016 /kernel/entry.asm
parentf8e47b6b0c0578c52d82c0e243620361b87a4abe (diff)
Alright!
Diffstat (limited to 'kernel/entry.asm')
-rw-r--r--kernel/entry.asm15
1 files changed, 10 insertions, 5 deletions
diff --git a/kernel/entry.asm b/kernel/entry.asm
index 10b6b25..a06b6ab 100644
--- a/kernel/entry.asm
+++ b/kernel/entry.asm
@@ -1,6 +1,5 @@
bits 32
-%define STACK_POINTER 0x00500000 ; The initial stack pointer in kernel mode
%define MULTIBOOT_MAGIC 0x1badb002
%define MULTIBOOT_PAGE_ALIGN 0x1
%define MULTIBOOT_MEMORY_INFO 0x2
@@ -24,18 +23,24 @@ dd 0x00000000
; MULTIBOOT_VIDEO_MODE
dd 0x00000000
-dd 1280
-dd 1024
+dd 1920
+dd 1200
dd 32
global boot_entry
extern kernel_main
boot_entry:
- mov esp, STACK_POINTER
+ mov esp, stack_top
+ push esp
push ebx
push eax
-
cli
call kernel_main
hlt
jmp $
+
+section .bss
+align 32
+stack_bottom:
+ resb 0x4000
+stack_top: