ejung/bsb2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip on pagetable

Browse Source 
compiles&runs now
This commit is contained in:
Eggert Jung
2026-02-24 04:38:16 +01:00
parent dc1c98c091
commit c92b15e2a6
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/main.cc
View File

@@ -44,7 +44,7 @@ OutputStream* copyout = &copystream;
//alignas(4096) four_lvl_paging_t paging_tree; //alignas(4096) four_lvl_paging_t paging_tree;
//four_lvl_paging_t paging_tree; //four_lvl_paging_t paging_tree;
pagetable_t identity_table[KERNEL_MEMORY_BORDER/4096/512]; alignas(4096) pagetable_t identity_table[KERNEL_MEMORY_BORDER/4096/512];
//static const uint32_t NUM_APPS = 9; //static const uint32_t NUM_APPS = 9;
//Application apps[NUM_APPS]; //Application apps[NUM_APPS];

3
kernel/memory/pageframealloc.cc
View File

@@ -142,11 +142,10 @@ void* PageFrameAllocator::alloc(bool kernel){
if(!free_pageframe) if(!free_pageframe)
return 0; return 0;
assert(free_pageframe->available);
free_pageframe->available = false; free_pageframe->available = false;
uintptr_t addr = ((free_pageframe - &PageFrames[0]))<<12; uintptr_t addr = ((free_pageframe - &PageFrames[0]))<<12;
mark_pageframes(addr, addr+1, false);
return (void*)(addr); return (void*)(addr);
} }

40
kernel/memory/pagetable.cc
View File

@@ -1,6 +1,7 @@
#include "pagetable.h" #include "pagetable.h"
#include "pageframealloc.h" #include "pageframealloc.h"
#include "../utils/string.h"
void load_cr3( void* cr3_value ) { void load_cr3( void* cr3_value ) {
asm volatile("mov %0, %%cr3" :: "r"((uint64_t)cr3_value) : "memory"); asm volatile("mov %0, %%cr3" :: "r"((uint64_t)cr3_value) : "memory");
@@ -18,25 +19,32 @@ void write_identity_map(pagetable_t* identity_table, uint64_t size){
} }
void create_basic_page_table(four_lvl_paging_t* table, pagetable_t* kernel_identity){ void create_basic_page_table(four_lvl_paging_t* table, pagetable_t* kernel_identity){
//pagetable_t* l2 = (pagetable_t*)PageFrameAllocator::alloc(true);
table->l4.entries[0] = { assert(table);
assert(kernel_identity);
table->l4 = (pagetable_t*)PageFrameAllocator::alloc(true);
table->l3 = (pagetable_t*)PageFrameAllocator::alloc(true);
table->l2 = (pagetable_t*)PageFrameAllocator::alloc(true);
//memset(table, 0, sizeof(four_lvl_paging_t));
table->l4->entries[0] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = ((uintptr_t)&(table->l3.entries[0])) >> 12, .address = ((uintptr_t)(table->l3)) >> 12,
}; };
table->l3.entries[0] = { table->l3->entries[0] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = ((uintptr_t)&(table->l2.entries[0])) >> 12, .address = ((uintptr_t)(table->l2)) >> 12,
}; };
//kernel memory //kernel memory
for(uint32_t i=0; i<KERNEL_MEMORY_BORDER/4096/512; i++){ for(uint32_t i=0; i<KERNEL_MEMORY_BORDER/4096/512; i++){
table->l2.entries[i] = { table->l2->entries[i] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
@@ -55,19 +63,23 @@ void create_basic_page_table(four_lvl_paging_t* table, pagetable_t* kernel_ident
//} //}
//add ioapic address to pagetable //add ioapic address to pagetable
table->l3.entries[3] = { table->l2_apic = (pagetable_t*)PageFrameAllocator::alloc(true);
table->ioapic = (pagetable_t*)PageFrameAllocator::alloc(true);
table->lapic = (pagetable_t*)PageFrameAllocator::alloc(true);
table->l3->entries[3] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = (uintptr_t)&(table->l2_apic) >> 12, .address = (uintptr_t)(table->l2_apic) >> 12,
}; };
table->l2_apic.entries[502] = { table->l2_apic->entries[502] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = (uintptr_t)&(table->ioapic) >> 12, .address = (uintptr_t)(table->ioapic) >> 12,
}; };
table->ioapic.entries[0] = { table->ioapic->entries[0] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 0, .user = 0,
@@ -75,13 +87,13 @@ void create_basic_page_table(four_lvl_paging_t* table, pagetable_t* kernel_ident
}; };
//lapic //lapic
table->l2_apic.entries[503] = { table->l2_apic->entries[503] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = (uintptr_t)&(table->lapic) >> 12, .address = (uintptr_t)(table->lapic) >> 12,
}; };
table->lapic.entries[0] = { table->lapic->entries[0] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 0, .user = 0,

14
kernel/memory/pagetable.h
View File

@@ -38,13 +38,13 @@ typedef struct {
//} __attribute__((__packed__)) pagedirectory_entry_t; //} __attribute__((__packed__)) pagedirectory_entry_t;
typedef struct { typedef struct {
alignas(4096) pagetable_t l4; pagetable_t* l4;
alignas(4096) pagetable_t l3; pagetable_t* l3;
alignas(4096) pagetable_t l2; pagetable_t* l2;
//pagetable_t l1_kernel; pagetable_t* l1_kernel;
alignas(4096) pagetable_t l2_apic; pagetable_t* l2_apic;
alignas(4096) pagetable_t ioapic; pagetable_t* ioapic;
alignas(4096) pagetable_t lapic; pagetable_t* lapic;
} four_lvl_paging_t; } four_lvl_paging_t;
void write_identity_map(pagetable_t* identity_table, uint64_t size); void write_identity_map(pagetable_t* identity_table, uint64_t size);

7
kernel/thread/thread.cc
View File

@@ -30,14 +30,15 @@ void Thread::kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3) {
} }
void Thread::load_paging(Thread* t){ void Thread::load_paging(Thread* t){
load_cr3((void*)&(t->paging_tree.l4.entries[0])); load_cr3((void*)(t->paging_tree->l4));
} }
Thread::Thread (bool kernel, void * startframe, int num_pages): queue_link(nullptr), isKernel(kernel), start(startframe), id(idCounter++), kill_flag(false){ Thread::Thread (bool kernel, void * startframe, int num_pages): queue_link(nullptr), isKernel(kernel), start(startframe), id(idCounter++), kill_flag(false){
StackPointer.isr = reinterpret_cast<void *>((uintptr_t)PageFrameAllocator::alloc(true)+STACK_SIZE);//(reserved_stack_space_isr + STACK_SIZE); StackPointer.isr = reinterpret_cast<void *>((uintptr_t)PageFrameAllocator::alloc(true)+STACK_SIZE);//(reserved_stack_space_isr + STACK_SIZE);
StackPointer.user = (void*)(0x4100000+STACK_SIZE); StackPointer.user = (void*)(0x4100000+STACK_SIZE);
create_basic_page_table(&paging_tree, &identity_table); paging_tree = (four_lvl_paging_t*)PageFrameAllocator::alloc(true);
create_basic_page_table(paging_tree, &identity_table);
subtable = (pagetable_t*) PageFrameAllocator::alloc(true); subtable = (pagetable_t*) PageFrameAllocator::alloc(true);
for(uint8_t i=0; i<num_pages; i++){ for(uint8_t i=0; i<num_pages; i++){
@@ -57,7 +58,7 @@ Thread::Thread (bool kernel, void * startframe, int num_pages): queue_link(null
//pagetable_t* l2addr = (pagetable_t*)(paging_tree.l3.entries[0].address<<12); //pagetable_t* l2addr = (pagetable_t*)(paging_tree.l3.entries[0].address<<12);
//l2addr->entries[32] = { //l2addr->entries[32] = {
paging_tree.l2.entries[32] = { paging_tree->l2->entries[32] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,

2
kernel/thread/thread.h
View File

@@ -34,7 +34,7 @@ class Thread {
void* start; void* start;
four_lvl_paging_t paging_tree; four_lvl_paging_t* paging_tree;
friend class Queue<Thread>; friend class Queue<Thread>;
friend class Semaphore; friend class Semaphore;