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

relocate stack

Browse Source
This commit is contained in:
Eggert Jung
2026-02-24 10:00:31 +01:00
parent c92b15e2a6
commit 48fea8f8d8
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/thread/thread.cc
View File

@@ -35,38 +35,43 @@ void Thread::load_paging(Thread* t){
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*)(0x61FF000+STACK_SIZE);
paging_tree = (four_lvl_paging_t*)PageFrameAllocator::alloc(true); paging_tree = (four_lvl_paging_t*)PageFrameAllocator::alloc(true);
create_basic_page_table(paging_tree, &identity_table); create_basic_page_table(paging_tree, &identity_table);
appcode_table = (pagetable_t*) PageFrameAllocator::alloc(true);
subtable = (pagetable_t*) PageFrameAllocator::alloc(true); assert(num_pages < 512); //limit for application code size is 2M
for(uint8_t i=0; i<num_pages; i++){ for(uint8_t i=0; i<num_pages; i++){
subtable->entries[i] = { appcode_table->entries[i] = {
.present = 1, .present = 1,
.user = 1, .user = 1,
.address = ((uintptr_t)startframe >> 12) + i .address = ((uintptr_t)startframe >> 12) + i
}; };
} }
// insert app code pages at 32*512*4096 = 0x4000000
paging_tree->l2->entries[32] = {
.present = 1,
.write = 1,
.user = 1,
.address = (uintptr_t)(appcode_table) >> 12
};
uintptr_t user_stackframe_p = ((uintptr_t)PageFrameAllocator::alloc(false)); uintptr_t user_stackframe_p = ((uintptr_t)PageFrameAllocator::alloc(false));
subtable->entries[256] = { appstack_table->entries[511] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = user_stackframe_p >> 12 .address = user_stackframe_p >> 12
}; };
// insert stack page at 48*512*4096 = 0x6000000
//pagetable_t* l2addr = (pagetable_t*)(paging_tree.l3.entries[0].address<<12); paging_tree->l2->entries[48] = {
//l2addr->entries[32] = {
paging_tree->l2->entries[32] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = (uintptr_t)(subtable) >> 12 .address = (uintptr_t)(appstack_table) >> 12
}; };
//map_pageframe(&paging_tree, (uintptr_t)StackPointer.user, 0x4001000);
prepareContext(StackPointer.isr, context, kickoff, reinterpret_cast<uintptr_t>(this), 0, 0); prepareContext(StackPointer.isr, context, kickoff, reinterpret_cast<uintptr_t>(this), 0, 0);
} }

6
kernel/thread/thread.h
View File

@@ -34,7 +34,6 @@ class Thread {
void* start; void* start;
four_lvl_paging_t* paging_tree;
friend class Queue<Thread>; friend class Queue<Thread>;
friend class Semaphore; friend class Semaphore;
@@ -75,7 +74,10 @@ class Thread {
void* isr; void* isr;
} StackPointer; } StackPointer;
void* operator new ( size_t count )noexcept; void* operator new ( size_t count )noexcept;
pagetable_t* subtable;
four_lvl_paging_t* paging_tree;
pagetable_t* appcode_table;
pagetable_t* appstack_table;
/*! \brief Unique thread id */ /*! \brief Unique thread id */
const int id; const int id;

2
user/app1/appl.cc
View File

@@ -34,5 +34,7 @@ extern "C" void main() {
// sys_exit(); // sys_exit();
//} //}
sleep(1000); sleep(1000);
if(id == 2)
*reinterpret_cast<uint8_t*>(0xdeadbeaf) = 1;
} }
} }