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

Revert "LONG MODE MULTIBOOT WORKS gsp!" 

This reverts commit 641bfe6db892f94711354fc2b60f6c037e9c37f3.
This commit is contained in:
Adrien Bourmault 2019-03-06 09:05:24 +01:00
parent 57260ebb62
commit e7586f635e
3 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
boot/loader/loader.asm
View File

@ -38,7 +38,7 @@ _start:
mov es, ax ; And es because it is jealous mov es, ax ; And es because it is jealous
;mov [Bootdrv], dl ;mov [Bootdrv], dl
xor dl, dl xor dl, dl
jmp 0x0000:_loader ; pas sûr jmp 0x0000:main ; pas sûr
;; Magnificent multiboot header for GRUB ------------------------------------ ;; ;; Magnificent multiboot header for GRUB ------------------------------------ ;;
MB_header: MB_header:
@ -60,7 +60,7 @@ MB_start:
push eax ; 2nd argument is magic number push eax ; 2nd argument is magic number
push ebx ; 1st argument multiboot info pointer push ebx ; 1st argument multiboot info pointer
mov ecx, eax mov ecx, eax
call _loader call main
add esp, 8 ; Cleanup arguments "A la MIPS" add esp, 8 ; Cleanup arguments "A la MIPS"
jmp Die ; Aufwiedersehen jmp Die ; Aufwiedersehen
@ -79,39 +79,42 @@ Die:
jmp $ jmp $
;; THE CODE ----------------------------------------------------------------- ;; ;; THE CODE ----------------------------------------------------------------- ;;
main:
; ---------------------------------------------------------------------------- ;
; _loader ;
; ;
; This is the function that initiates the launch of OS/K. It verifies that ;
; Grub has properly loaded this loader and makes the appropriate setup so ;
; that the kernel will work properly ;
; ;
; Why this original design ? Because it works well and prevent us to cause ;
; triple faults by aligment error or too long jumps (yup, it can be a problem);
; ;
; ---------------------------------------------------------------------------- ;
_loader:
jmp lbegin
%include "boot/loader/multiboot/check.inc"
lbegin:
call MB_check call MB_check
jmp lnext
%include "boot/loader/cpu/cpuid.inc"
lnext:
call Check_cpuid call Check_cpuid
call Is64Bits call Is64Bits
jmp lnext2
%include "boot/loader/mem/structures.inc"
lnext2:
call Setup_paging call Setup_paging
jmp lnext3
%include "boot/loader/mem/management.inc"
lnext3: ;; Registering paging
mov eax, PML4_table
mov cr3, eax ; Load PML4 to cr3
mov eax, cr4
or eax, 1 << 5
mov cr4, eax ; Enable PAE
;; Activate long mode
mov ecx, 0xC0000080 ; address of MSR
rdmsr ; read MSR
or eax, 1 << 8 ; LME = 1. (Long Mode Enable)
wrmsr ; write MSR
;; Enable paging
mov eax, cr0
or eax, 1 << 31 ; make MSR bit 31 (PG = Paging) to 1 :
; |1|000000000000000000000000000000
; |
; `------ Paging bit
mov cr0, eax
mov dword [0xb8000], 0x2f4b2f4f mov dword [0xb8000], 0x2f4b2f4f
ret ret
;; INCLUDES ----------------------------------------------------------------- ;;
%include "boot/loader/cpu/cpuid.inc"
%include "boot/loader/multiboot/check.inc"
%include "boot/loader/mem/structures.inc"
%include "boot/loader/mem/management.inc"

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

@ -52,31 +52,3 @@ Setup_paging:
jne .map_p2_table ; else map the next entry jne .map_p2_table ; else map the next entry
ret ret
; ---------------------------------------------------------------------------- ;
; Enable long mode and paging ;
; ---------------------------------------------------------------------------- ;
Go64:
;; Registering paging
mov eax, PML4_table
mov cr3, eax ; Load PML4 to cr3
mov eax, cr4
or eax, 1 << 5
mov cr4, eax ; Enable PAE
;; Activate long mode
mov ecx, 0xC0000080 ; address of MSR
rdmsr ; read MSR
or eax, 1 << 8 ; LME = 1. (Long Mode Enable)
wrmsr ; write MSR
;; Enable paging
mov eax, cr0
or eax, 1 << 31 ; make MSR bit 31 (PG = Paging) to 1 :
; |1|000000000000000000000000000000
; |
; `------ Paging bit
mov cr0, eax
ret

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

Binary file not shown.