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

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
user
2026-02-25 15:23:47 +01:00
parent 23b453dac8 71186f5601
commit e7a33124dc
8 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/arch/core_ring.cc
View File

@@ -26,7 +26,7 @@ void switchToUsermode(void *stackpointer, void *kickoff,
"pushq %[user_eflags] \n" \
"pushq %[user_code] \n" \
"pushq %[user_function] \n" \
"mov %[user_parameter], %%rdi\n" \
"mov %[user_parameter], %%rax\n" \
"iretq \n" \
: \
: [user_data] "r"((uint64_t)user_ds),

4
kernel/interrupt/handlers.cc
View File

@@ -65,13 +65,13 @@ static void printContext(const InterruptContext *context) {
uint64_t pf_number = uint64_t (pf >> 12 );
if(PageFrameAllocator::PageFrames[pf_number].ref_count==1){
setMapping(virt, (void*) pf , paging_tree, 1);
setMapping(virt, (void*) pf , paging_tree, true);
}else{
uintptr_t page = (uintptr_t) PageFrameAllocator::alloc(false);
//Syscall::Skeleton::map(page, 4096);
setMapping(virt, (void*) page , paging_tree, 1);
setMapping(virt, (void*) page , paging_tree, true);
memcpy( (void*)page, (void*)virt, 4096);
Syscall::Skeleton::invlpg(virt);

4
kernel/memory/pagetable.cc
View File

@@ -160,7 +160,7 @@ void* getFreeVirtSpace(four_lvl_paging_t* search_table, uint8_t num_pages){
}
void setMapping(uintptr_t vaddr, void* frame, four_lvl_paging_t* flpt, uint8_t writeable){
void setMapping(uintptr_t vaddr, void* frame, four_lvl_paging_t* flpt, bool write){
uint16_t l4Index = (vaddr>>39) & 0x1FF;
uint16_t l3Index = (vaddr>>30) & 0x1FF;
uint16_t l2Index = (vaddr>>21) & 0x1FF;
@@ -195,7 +195,7 @@ void setMapping(uintptr_t vaddr, void* frame, four_lvl_paging_t* flpt, uint8_t w
memset(newl1, 0, 4096);
lvl2->entries[l2Index] = {
.present = 1,
.write = 1,
.write = write,
.user = 1,
.address = (uintptr_t)newl1 >> 12
};

2
kernel/memory/pagetable.h
View File

@@ -50,7 +50,7 @@ typedef struct {
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 load_cr3(void* cr3_value);
void setMapping(uintptr_t vaddr, void* frame, four_lvl_paging_t* flpt, uint8_t writeable =1);
void setMapping(uintptr_t vaddr, void* frame, four_lvl_paging_t* flpt, bool write=true);
uintptr_t isMapped(uintptr_t vaddr, four_lvl_paging_t* flpt);
void* getFreeVirtSpace(four_lvl_paging_t* search_table, uint8_t num_pages);
void copy_pagetable(four_lvl_paging_t* parent_table, four_lvl_paging_t* child_table);

6
kernel/syscall/skeleton.cc
View File

@@ -296,10 +296,14 @@ int fork(Vault &vault, InterruptContext *user_context) {
copy_stack(parent, child);
child->StackPointer.user = (void*)user_context->sp;
vault.thread_list[child->id] = child;
//return parent pid to child
prepareContext(child->StackPointer.isr, child->context, Thread::kickoff, reinterpret_cast<uintptr_t>(child), parent->id, 0);
vault.scheduler.ready(child);
return 0;
// return child pid to parent
return child->id;
}

3
kernel/thread/thread.cc
View File

@@ -16,13 +16,12 @@ extern pagetable_t identity_table;
void Thread::kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3) {
Thread *thread = reinterpret_cast<Thread *>(param1);
assert(thread != nullptr && "Kickoff got nullptr pointer to Thread");
(void)param2; // will be used later
(void)param3; // will be used later
// The core must have entered level 1/2 to cause a thread to be scheduled.
Guard::leave();
if(!thread->isKernel)
Core::Ring::switchToUsermode(thread->StackPointer.user, thread->start, 0);
Core::Ring::switchToUsermode(thread->StackPointer.user, thread->start, (void*)param2);
else
if(thread->start == nullptr)
thread->action();

2
kernel/thread/thread.h
View File

@@ -75,11 +75,11 @@ class Thread {
* \param param3 Third parameter (will be used later)
*
*/
static void kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3);
static void kickoffUsermode (Thread *object);
void map_app(void* code_paddr, uint16_t code_page_num, void* stack_vaddr, uint16_t stack_page_num);
public:
static void kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3);
struct{
void* user;
void* isr;

13
user/app1/appl.cc
View File

@@ -45,19 +45,26 @@ extern "C" void main() {
//sys_test(1,2,3,4,5);
fork();
uint8_t ret = fork();
//ret = fork();
unsigned id = sys_getpid();
char text[] = "appX";
text[3] = 0x30+id;
write(1, text, sizeof(text), 0, (int)id);
write(1, text, strlen(text), 0, (int)id);
char msg[] = "forked pid: ";
msg[12] = 0x30+ret;
write(1, msg, strlen(msg), 6, (int)id);
uint8_t cnt = 0;
while(1){
cnt = (cnt+1)%100;
char msg[12];
char* num = itoa(cnt, msg);
write(1, num, strlen(num), 10, (int)id);
write(1, num, strlen(num), 25, (int)id);
sleep(100);
}