summaryrefslogtreecommitdiff
path: root/src/bootloader/bootloader.asm
diff options
context:
space:
mode:
Diffstat (limited to 'src/bootloader/bootloader.asm')
-rw-r--r--src/bootloader/bootloader.asm10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/bootloader/bootloader.asm b/src/bootloader/bootloader.asm
index 14116db..947965f 100644
--- a/src/bootloader/bootloader.asm
+++ b/src/bootloader/bootloader.asm
@@ -3,7 +3,6 @@
[extern _bootloader_stage1_size]
[extern _kernel_loc]
-;TODO clean up unreal mode
jmp stage0
times 3-($-$$) db 0x90 ; a temporary dirty fix to emulate a floppy disk insted of a hard risk
times 59 db 0 ; (TODO support hard disks)
@@ -59,7 +58,6 @@ dw 0xaa55
%include "bootloader/gdt.asm"
boot_msg:
-.debugmsg: db "debugeroni", 0
.kernel_loaded: db `Kernel loaded!\r\nBooting to protected, then long mode...`, 0
.stage2_loaded: db `Done loading bootloader!\r\nLoading kernel...`, 0
@@ -94,9 +92,10 @@ mov cr0, eax
pop ds
sti
+
;we are now in unreal mode
-mov cl, 5 ; starting sector TODO automate this
+mov cl, 5
mov edi, _kernel_loc
.loop:
mov al, 0x1 ; sector count
@@ -114,10 +113,6 @@ mov ecx, 512
a32 rep movsb
nop
-mov bx, boot_msg.debugmsg
-mov cx, 0
-call bios_print
-
pop cx
cmp cl, _kernel_size
@@ -142,4 +137,5 @@ jmp $
%include "bootloader/cpu_check.asm"
%include "bootloader/video.asm"
%include "bootloader/enter_kernel.asm"
+
times 2048 - ($ - $$) db 0