Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

32bit booting working

Browse Source
This commit is contained in:
Alex 2022-10-18 00:19:44 +03:00
parent 3df98c7c8e
commit 348aa69dcb
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
4 changed files with 89 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Architecture/i686/MultibootInit.cpp
View File

@ -1,43 +0,0 @@
#include <types.h>
#include <boot/protocols/multiboot2.h>
struct multiboot_info
{
multiboot_uint32_t Size;
multiboot_uint32_t Reserved;
struct multiboot_tag *Tag;
};
EXTERNC __attribute__((no_stack_protector, section(".mb2bootcode.text"))) void Multiboot2Initializator(multiboot_info *Info, unsigned int Magic)
{
if (Info == NULL || Magic == NULL)
{
if (Magic == NULL)
{
((unsigned char *)0xb8000)[2 * (80) * (25) - 4] = 'E';
((unsigned char *)0xb8000)[2 * (80) * (25) - 3] = 4;
}
if (Info == NULL)
{
((unsigned char *)0xb8000)[2 * (80) * (25) - 2] = 'R';
((unsigned char *)0xb8000)[2 * (80) * (25) - 1] = 4;
}
while (1)
asmv("hlt");
}
else if (Magic != MULTIBOOT2_BOOTLOADER_MAGIC)
{
((unsigned char *)0xb8000)[2 * (80) * (25) - 2] = 'M';
((unsigned char *)0xb8000)[2 * (80) * (25) - 1] = 4;
while (1)
asmv("hlt");
}
/* TODO */
((unsigned char *)0xb8000)[2 * (80) * (25) - 2] = 'Y';
((unsigned char *)0xb8000)[2 * (80) * (25) - 1] = 2;
while (1)
asmv("hlt");
}

73
Architecture/i686/boot.asm
View File

@ -1,33 +1,60 @@
KERNEL_VIRTUAL_BASE EQU 0xE0000000 ; Inspired From: https://github.com/MQuy/mos/blob/master/src/kernel/boot.asm
section .multiboot2 section .multiboot2
align 8 align 4096
HEADER_START: HEADER_START:
dd 0xE85250D6 dd 0xE85250D6
dd 0 dd 0
dd (HEADER_END - HEADER_START) dd (HEADER_END - HEADER_START)
dd -(0xE85250D6 + 0 + (HEADER_END - HEADER_START)) dd 0x100000000 - (HEADER_END - HEADER_START) - 0 - 0xE85250D6
align 8 align 8
MB2_TAG_START: MB2_TAG_START:
dw 0 dw 0
dw 0 dw 0
dd MB2_TAG_END - MB2_TAG_START dd MB2_TAG_END - MB2_TAG_START
MB2_TAG_END: MB2_TAG_END:
HEADER_END: HEADER_END:
extern Multiboot2Initializator KERNEL_VIRTUAL_BASE equ 0xC0000000 ; 3GB
KERNEL_PAGE_NUMBER equ (KERNEL_VIRTUAL_BASE >> 22) ; 768
KERNEL_STACK_SIZE equ 0x4000 ; 16KB
extern x32Entry
global _start global _start
_start: section .data
cli align 0x1000
mov esp, STACK_TOP BootPageTable:
push eax dd 0x00000083
push ebx times (KERNEL_PAGE_NUMBER - 1) dd 0
call Multiboot2Initializator dd 0x00000083
.Hang: times (1024 - KERNEL_PAGE_NUMBER - 1) dd 0
hlt
jmp .Hang
section .mb2bootcode.bss section .text
STACK_BOTTOM: resb 16384 _start:
STACK_TOP: mov ecx, (BootPageTable - KERNEL_VIRTUAL_BASE)
mov cr3, ecx
mov ecx, cr4
or ecx, 0x00000010 ; Set PSE in CR4
mov cr4, ecx
mov ecx, cr0
or ecx, 0x80000000 ; Set PG in CR0
mov cr0, ecx
lea ecx, [HigherHalfStart]
jmp ecx
HigherHalfStart:
mov esp, KernelStack + KERNEL_STACK_SIZE
push eax ; Multiboot2 Magic
add ebx, KERNEL_VIRTUAL_BASE
push ebx ; Multiboot2 Header
call x32Entry
Loop:
hlt
jmp Loop
section .bss
align 16
KernelStack :
resb KERNEL_STACK_SIZE

36
Architecture/i686/linker.ld
View File

@ -3,55 +3,31 @@ OUTPUT_ARCH(i386)
ENTRY(_start) ENTRY(_start)
KERNEL_VIRTUAL_BASE = 0xC0000000;
SECTIONS SECTIONS
{ {
. = 1M; . = 0xC0100000;
.boot :
{
*(.multiboot2 .multiboot2.*)
}
.mb2bootcode.text :
{
*(.mb2bootcode.text)
}
.mb2bootcode.data :
{
*(.mb2bootcode.data)
}
.mb2bootcode.bss :
{
*(.mb2bootcode.bss)
}
. += ALIGN(4096);
. += KERNEL_VIRTUAL_BASE;
_kernel_start = .; _kernel_start = .;
.text ALIGN(4096) : AT(ADDR(.text) - KERNEL_VIRTUAL_BASE) .text ALIGN(4096) : AT(ADDR(.text) - 0xC0000000)
{ {
*(.multiboot2)
*(.text .text.*) *(.text .text.*)
} }
_kernel_text_end = .; _kernel_text_end = .;
.data ALIGN (4096) : AT(ADDR(.data) - KERNEL_VIRTUAL_BASE) .data ALIGN (4096) : AT(ADDR(.data) - 0xC0000000)
{ {
*(.data .data.*) *(.data .data.*)
} }
_kernel_data_end = .; _kernel_data_end = .;
.rodata ALIGN (4096) : AT(ADDR(.rodata) - KERNEL_VIRTUAL_BASE) .rodata ALIGN (4096) : AT(ADDR(.rodata) - 0xC0000000)
{ {
*(.rodata .rodata.*) *(.rodata .rodata.*)
} }
_kernel_rodata_end = .; _kernel_rodata_end = .;
.bss ALIGN (4096) : AT(ADDR(.bss) - KERNEL_VIRTUAL_BASE) .bss ALIGN (4096) : AT(ADDR(.bss) - 0xC0000000)
{ {
*(COMMON) *(COMMON)
*(.bss .bss.*) *(.bss .bss.*)

36
Kernel.cpp
View File

@ -1,5 +1,6 @@
#include "kernel.h" #include "kernel.h"
#include <boot/protocols/multiboot2.h>
#include <interrupts.hpp> #include <interrupts.hpp>
#include <memory.hpp> #include <memory.hpp>
#include <string.h> #include <string.h>
@ -91,9 +92,38 @@ EXTERNC void arm64Entry(uint64_t dtb_ptr32, uint64_t x1, uint64_t x2, uint64_t x
CPU::Halt(); CPU::Halt();
} }
EXTERNC void x32Entry(uint64_t Data) struct multiboot_info
{
multiboot_uint32_t Size;
multiboot_uint32_t Reserved;
struct multiboot_tag *Tag;
};
EXTERNC void x32Entry(multiboot_info *Info, unsigned int Magic)
{ {
trace("Hello, World!"); trace("Hello, World!");
while (1)
CPU::Halt(); if (Info == NULL || Magic == NULL)
{
if (Magic == NULL)
{
error("Multiboot magic is NULL");
}
if (Info == NULL)
{
error("Multiboot info is NULL");
}
CPU::Stop();
}
else if (Magic != MULTIBOOT2_BOOTLOADER_MAGIC)
{
error("Multiboot magic is invalid (%#x != %#x)", Magic, MULTIBOOT2_BOOTLOADER_MAGIC);
trace("Hello, World!");
CPU::Stop();
}
((unsigned char *)0xb8000)[2 * (80) * (25) - 2] = 'M';
((unsigned char *)0xb8000)[2 * (80) * (25) - 1] = 4;
CPU::Stop();
} }