TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-10 04:52:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update boot 32

Browse Source
This commit is contained in:
Baptiste Wicht 2016-08-05 14:19:31 +02:00
parent 353b8db19b
commit 0f16fae4ce
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
init/src/boot_32.cpp
View File

@ -8,21 +8,27 @@
#define CODE_32 #define CODE_32
#define THOR_INIT #define THOR_INIT
#include <types.hpp>
#include "boot/boot_32.hpp" #include "boot/boot_32.hpp"
#include "kernel.hpp" #include "kernel.hpp"
#include "paging.hpp" #include "early_memory.hpp"
#include "early_logging.hpp"
#include "virtual_debug.hpp" #include "virtual_debug.hpp"
namespace { namespace {
constexpr const uint16_t COM1_PORT = 0x3f8; constexpr const uint16_t COM1_PORT = 0x3f8;
//The size of page in memory
constexpr const size_t PAGE_SIZE = 4096;
void early_log(const char* s){ void early_log(const char* s){
virtual_debug(s); virtual_debug(s);
virtual_debug("\n"); virtual_debug("\n");
early::early_logs[early::early_logs_count++] = reinterpret_cast<uint32_t>(s); auto c = early::early_logs_count();
auto table = reinterpret_cast<uint32_t*>(early::early_logs_address);
table[c] = reinterpret_cast<uint32_t>(s);
early::early_logs_count(c + 1);
} }
typedef unsigned int uint8_t __attribute__((__mode__(__QI__))); typedef unsigned int uint8_t __attribute__((__mode__(__QI__)));
@ -68,22 +74,22 @@ void setup_paging(){
//Link tables (0x3 means Writeable and Supervisor) //Link tables (0x3 means Writeable and Supervisor)
//PML4T[0] -> PDPT //PML4T[0] -> PDPT
*reinterpret_cast<uint32_t*>(PML4T) = PML4T + paging::PAGE_SIZE + 0x7; *reinterpret_cast<uint32_t*>(PML4T) = PML4T + PAGE_SIZE + 0x7;
//PDPT[0] -> PDT //PDPT[0] -> PDT
*reinterpret_cast<uint32_t*>(PML4T + 1 * paging::PAGE_SIZE) = PML4T + 2 * paging::PAGE_SIZE + 0x7; *reinterpret_cast<uint32_t*>(PML4T + 1 * PAGE_SIZE) = PML4T + 2 * PAGE_SIZE + 0x7;
//PD[0] -> PT //PD[0] -> PT
*reinterpret_cast<uint32_t*>(PML4T + 2 * paging::PAGE_SIZE) = PML4T + 3 * paging::PAGE_SIZE + 0x7; *reinterpret_cast<uint32_t*>(PML4T + 2 * PAGE_SIZE) = PML4T + 3 * PAGE_SIZE + 0x7;
//Map the first MiB //Map the first MiB
auto page_table_ptr = reinterpret_cast<uint32_t*>(PML4T + 3 * paging::PAGE_SIZE); auto page_table_ptr = reinterpret_cast<uint32_t*>(PML4T + 3 * PAGE_SIZE);
auto phys = 0x3; auto phys = 0x3;
for(uint32_t i = 0; i < 256; ++i){ for(uint32_t i = 0; i < 256; ++i){
*page_table_ptr = phys; *page_table_ptr = phys;
phys += paging::PAGE_SIZE; phys += PAGE_SIZE;
//A page entry is 64 bit in size //A page entry is 64 bit in size
page_table_ptr += 2; page_table_ptr += 2;
@ -166,6 +172,9 @@ void pm_main(){
// Initialize serial transmission (for debugging in Qemu) // Initialize serial transmission (for debugging in Qemu)
serial_init(); serial_init();
// TODO This will need to be computed from the init loader
early::kernel_mib(1);
//Enable long mode by setting the EFER.LME flag //Enable long mode by setting the EFER.LME flag
enable_long_mode(); enable_long_mode();
@ -182,4 +191,4 @@ void pm_main(){
lm_jump(); lm_jump();
} }
} //end of exern "C" } //end of extern "C"