diff options
Diffstat (limited to 'src/bootloader')
| -rw-r--r-- | src/bootloader/enter_kernel.asm | 6 | ||||
| -rw-r--r-- | src/bootloader/gdt.asm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bootloader/enter_kernel.asm b/src/bootloader/enter_kernel.asm index bdf0a71..475e288 100644 --- a/src/bootloader/enter_kernel.asm +++ b/src/bootloader/enter_kernel.asm @@ -92,7 +92,9 @@ bits 64 mov rbp, 0 mov rsp, _kernel_stack_loc mov rax, QWORD kernel_init -;push QWORD 0 jmp rax -jmp $ +full_stop: +cli +hlt +jmp full_stop ret diff --git a/src/bootloader/gdt.asm b/src/bootloader/gdt.asm index 0e6d89b..a1d61e2 100644 --- a/src/bootloader/gdt.asm +++ b/src/bootloader/gdt.asm @@ -29,7 +29,7 @@ dq .gdt_start PROTECTED_CODE_SEGMENT equ .gdt_code - .gdt_start PROTECTED_DATA_SEGMENT equ .gdt_data - .gdt_start - +align 8 long_gdt: .gdt_start: ;and now we set up a temporary GDT creating a 1:1 mapping |