mirror of
https://github.com/Fennix-Project/Kernel.git
synced 2025-07-10 23:09:18 +00:00
Make kernel to boot in x32
This commit is contained in:
Alex
@ -23,7 +23,7 @@
|
||||
#include "multiboot2.h"
|
||||
#include "../../../../../kernel.h"
|
||||
|
||||
EXTERNC void multiboot_main(uint32_t Magic, uint32_t Info)
|
||||
EXTERNC void multiboot_main(uintptr_t Magic, uintptr_t Info)
|
||||
{
|
||||
if (Info == NULL || Magic == NULL)
|
||||
{
|
||||
@ -217,8 +217,10 @@ EXTERNC void multiboot_main(uint32_t Magic, uint32_t Info)
|
||||
case MULTIBOOT_TAG_TYPE_ELF_SECTIONS:
|
||||
{
|
||||
multiboot_tag_elf_sections *elf = (multiboot_tag_elf_sections *)Tag;
|
||||
fixme("elf_sections->[num=%d, size=%d, entsize=%d, shndx=%d]",
|
||||
elf->num, elf->size, elf->entsize, elf->shndx);
|
||||
mb2binfo.Kernel.Symbols.Num = elf->num;
|
||||
mb2binfo.Kernel.Symbols.EntSize = elf->entsize;
|
||||
mb2binfo.Kernel.Symbols.Shndx = elf->shndx;
|
||||
mb2binfo.Kernel.Symbols.Sections = (uintptr_t)&elf->sections;
|
||||
break;
|
||||
}
|
||||
case MULTIBOOT_TAG_TYPE_APM:
|
||||
|
||||
@ -23,8 +23,24 @@ align 0x1000
|
||||
global BootPageTable
|
||||
BootPageTable:
|
||||
dd 0x00000083
|
||||
dd 0x00400083
|
||||
dd 0x00800083
|
||||
dd 0x00C00083
|
||||
dd 0x01000083
|
||||
dd 0x01400083
|
||||
dd 0x01800083
|
||||
dd 0x01C00083
|
||||
dd 0x02000083
|
||||
dd 0x02400083
|
||||
times (KERNEL_PAGE_NUMBER - 10) dd 0
|
||||
dd 0x00000083
|
||||
times (KERNEL_PAGE_NUMBER - 2) dd 0
|
||||
dd 0x00000083
|
||||
dd 0x00000083
|
||||
times (1024 - KERNEL_PAGE_NUMBER - 2) dd 0
|
||||
dd 0x00400083
|
||||
dd 0x00800083
|
||||
dd 0x00C00083
|
||||
dd 0x01000083
|
||||
dd 0x01400083
|
||||
dd 0x01800083
|
||||
dd 0x01C00083
|
||||
dd 0x02000083
|
||||
dd 0x02400083
|
||||
times (1024 - KERNEL_PAGE_NUMBER - 10) dd 0
|
||||
|
||||
@ -18,50 +18,3 @@
|
||||
.intel_syntax noprefix
|
||||
|
||||
.code32
|
||||
|
||||
.equ PAGE_TABLE_SIZE, 0x4
|
||||
|
||||
.section .bootstrap.data
|
||||
.align 0x1000
|
||||
.global BootPageTable
|
||||
BootPageTable:
|
||||
.rept 0x10000 /* 0x4000 bytes will be used in UpdatePageTable */
|
||||
.long 0
|
||||
.endr
|
||||
|
||||
.section .bootstrap.text
|
||||
.global UpdatePageTable
|
||||
UpdatePageTable:
|
||||
mov edi, (BootPageTable + 0x0000) /* First PML4E */
|
||||
mov eax, (BootPageTable + 0x1000) /* First PDPTE */
|
||||
or eax, 0b11 /* Bitwise OR on rax (PDPTE) with 11b (Present, Write) */
|
||||
mov dword [edi], eax /* Write 11b to PML4E */
|
||||
|
||||
mov edi, (BootPageTable + 0x1000) /* First PDPTE */
|
||||
mov eax, (BootPageTable + 0x2000) /* First PDE */
|
||||
or eax, 0b11 /* Bitwise OR on rax (PDE) with 11b (Present, Write) */
|
||||
|
||||
mov ecx, PAGE_TABLE_SIZE /* For loop instruction */
|
||||
mov ebx, 0x0 /* Value to store in the next 4 bytes */
|
||||
.FillPageTableLevel3:
|
||||
mov dword [edi], eax /* Store modified PDE in PDPTE */
|
||||
mov dword [edi + 4], ebx /* Store the rbx value in the next 4 bytes */
|
||||
add eax, 0x1000 /* Increment (page size) */
|
||||
adc ebx, 0 /* Add 0 to carry flag */
|
||||
add edi, 8 /* Add 8 to rdi (next PDE) */
|
||||
loop .FillPageTableLevel3 /* Loop until rcx is 0 */
|
||||
|
||||
mov edi, (BootPageTable + 0x2000) /* First PDE */
|
||||
mov eax, 0b10000011 /* Present, Write, Large Page */
|
||||
|
||||
mov ecx, (512 * PAGE_TABLE_SIZE) /* For loop instruction */
|
||||
mov ebx, 0x0 /* Value to store in the next 4 bytes */
|
||||
.FillPageTableLevel2:
|
||||
mov dword [edi], eax /* Store modified PDE in PDPTE */
|
||||
mov dword [edi + 4], ebx /* Store the rbx value in the next 4 bytes */
|
||||
add eax, 1 << 21 /* Increment (page size) */
|
||||
adc ebx, 0 /* Add 0 (carry flag) to rbx to increment if there was a carry */
|
||||
add edi, 8 /* Add 8 to rdi (next PDE) */
|
||||
loop .FillPageTableLevel2 /* Loop until rcx is 0 */
|
||||
|
||||
ret
|
||||
|
||||
@ -18,100 +18,3 @@
|
||||
.intel_syntax noprefix
|
||||
|
||||
.code32
|
||||
.equ KERNEL_STACK_SIZE, 0x4000 /* 16KB */
|
||||
|
||||
.extern DetectCPUID
|
||||
.extern Detect64Bit
|
||||
.extern DetectPSE
|
||||
.extern DetectPAE
|
||||
.extern multiboot_main
|
||||
.extern LoadGDT32
|
||||
.extern BootPageTable
|
||||
.extern UpdatePageTable
|
||||
.extern GDT64.Ptr
|
||||
.extern GDT64.Code
|
||||
.extern GDT64.Data
|
||||
|
||||
.section .bootstrap.data
|
||||
MB_HeaderMagic:
|
||||
.quad 0
|
||||
|
||||
MB_HeaderInfo:
|
||||
.quad 0
|
||||
|
||||
.section .bootstrap.text
|
||||
|
||||
.global Multiboot2_start
|
||||
Multiboot2_start:
|
||||
cli
|
||||
|
||||
mov [MB_HeaderMagic], eax
|
||||
mov [MB_HeaderInfo], ebx
|
||||
|
||||
call DetectCPUID
|
||||
cmp eax, 0
|
||||
je $
|
||||
|
||||
call Detect64Bit
|
||||
cmp eax, 0
|
||||
je $
|
||||
|
||||
call DetectPSE
|
||||
cmp eax, 0
|
||||
je $
|
||||
|
||||
call DetectPAE
|
||||
cmp eax, 0
|
||||
je $
|
||||
|
||||
mov ecx, cr4
|
||||
or ecx, 0x00000010 /* Set PSE in CR4 */
|
||||
or ecx, 0x00000020 /* Set PAE in CR4 */
|
||||
mov cr4, ecx
|
||||
|
||||
call LoadGDT32
|
||||
call UpdatePageTable
|
||||
|
||||
mov ecx, BootPageTable
|
||||
mov cr3, ecx
|
||||
|
||||
mov ecx, 0xC0000080 /* EFER */
|
||||
rdmsr
|
||||
or eax, 0x800 | 0x100 | 0x1 /* Set LME, LMA, SCE */
|
||||
wrmsr
|
||||
|
||||
mov ecx, cr0
|
||||
or ecx, 0x80000001 /* Set PG and PE in CR0 */
|
||||
mov cr0, ecx
|
||||
|
||||
lgdt [GDT64.Ptr]
|
||||
jmp GDT64.Code:HigherHalfStart
|
||||
|
||||
.extern UpdatePageTable64
|
||||
|
||||
.code64
|
||||
HigherHalfStart:
|
||||
mov ax, GDT64.Data
|
||||
mov ds, ax
|
||||
mov es, ax
|
||||
mov fs, ax
|
||||
mov gs, ax
|
||||
mov ss, ax
|
||||
|
||||
call UpdatePageTable64
|
||||
|
||||
mov rsp, KernelStack + KERNEL_STACK_SIZE
|
||||
mov rbp, 0
|
||||
mov rdi, [MB_HeaderMagic]
|
||||
mov rsi, [MB_HeaderInfo]
|
||||
push rsi
|
||||
push rdi
|
||||
call multiboot_main
|
||||
.Hang:
|
||||
hlt
|
||||
jmp .Hang
|
||||
|
||||
.section .bootstrap.bss
|
||||
.align 16
|
||||
KernelStack:
|
||||
.space KERNEL_STACK_SIZE
|
||||
|
||||
Reference in New Issue
Block a user