From 14b109ea24dc5cb1db948de57a2a44c80ef4622e Mon Sep 17 00:00:00 2001 From: Brett Weiland Date: Wed, 24 Mar 2021 15:36:54 -0500 Subject: modified: README.md modified: compiler/create_crosscompiler.sh deleted: notes modified: src/.gdb_history deleted: src/amd64_vol2.pdf modified: src/bootloader/bios_functions/bios_disk.asm modified: src/bootloader/bios_functions/print.asm modified: src/bootloader/bootloader.asm modified: src/bootloader/cpu_check.asm modified: src/bootloader/enter_kernel.asm deleted: src/bootloader/enter_kernel_backup modified: src/bootloader/gdt.asm deleted: src/bootloader/multicore.asm deleted: src/bootloader/notes new file: src/debug/gdbinit.gdb deleted: src/indigo_os modified: src/kernel/include/libc.h modified: src/kernel/include/paging.h modified: src/kernel/include/video.h modified: src/kernel/kernel.c modified: src/kernel/libs/acpi.c modified: src/kernel/libs/drivers/serial.c modified: src/kernel/libs/drivers/video.c modified: src/kernel/libs/libc.c modified: src/kernel/libs/page.c modified: src/link.ld modified: src/makefile new file: tools/README.md modified: tools/page/page.py --- src/bootloader/bootloader.asm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/bootloader/bootloader.asm') 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 -- cgit v1.2.3