os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

LONG MODE MULTIBOOT WORKS gsp!

This commit is contained in:
Adrien Bourmault 2019-03-05 20:40:34 +01:00
parent 530475e5f5
commit 703a5fc067
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot/loader/loader.asm
View File

@ -108,6 +108,7 @@ lnext:
%include "boot/loader/mem/structures.inc" %include "boot/loader/mem/structures.inc"
lnext2: lnext2:
call Setup_paging call Setup_paging
call Go64
jmp lnext3 jmp lnext3
%include "boot/loader/mem/management.inc" %include "boot/loader/mem/management.inc"

7
boot/loader/mem/management.inc
View File

@ -57,6 +57,8 @@ Setup_paging:
; Enable long mode and paging ; ; Enable long mode and paging ;
; ---------------------------------------------------------------------------- ; ; ---------------------------------------------------------------------------- ;
Go64: Go64:
pusha
;; Registering paging ;; Registering paging
mov eax, PML4_table mov eax, PML4_table
mov cr3, eax ; Load PML4 to cr3 mov cr3, eax ; Load PML4 to cr3
@ -78,5 +80,10 @@ Go64:
; | ; |
; `------ Paging bit ; `------ Paging bit
mov cr0, eax mov cr0, eax
jmp .end
nop
nop
.end:
popa
ret ret

4
boot/loader/mem/structures.inc
View File

@ -26,7 +26,7 @@
[BITS 32] [BITS 32]
;; GDT WITH DOC ;; GDT WITH DOC
ALIGN 4 ALIGN 4096
GDT64: GDT64:
NULL_SELECTOR: ;; null selector within 64 bits NULL_SELECTOR: ;; null selector within 64 bits
dw GDT_LENGTH ; limit of GDT dw GDT_LENGTH ; limit of GDT
@ -104,7 +104,7 @@ GDT64:
GDT_LENGTH: GDT_LENGTH:
;; EMPTY PAGE TABLES (identity of the first 1GiB) ;; EMPTY PAGE TABLES (identity of the first 1GiB)
ALIGN 4 ALIGN 4096
PML4_table: PML4_table:
resb 4096 resb 4096
PDP_table: PDP_table:

BIN
build/obj/boot/loader.bin
View File

Binary file not shown.