Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-11 07:19:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trying to fix user stack

Browse Source
This commit is contained in:
Alex
2022-11-16 16:04:09 +02:00
parent 4d874a3e81
commit 9fdad650b9
7 changed files with 172 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
KThread.cpp
View File

@ -47,8 +47,6 @@ void FetchDisks()
void KernelMainThread()
{
Vector<const char *> argv;
Vector<const char *> envp;
Vector<AuxiliaryVector> auxv;
Tasking::TCB *CurrentWorker = nullptr;
@ -56,36 +54,38 @@ void KernelMainThread()
KPrint("C++ Language Version (__cplusplus): %ld", __cplusplus);
TaskManager->GetCurrentThread()->SetPriority(1);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)StartFilesystem, argv, envp, auxv);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)StartFilesystem, nullptr, nullptr, auxv);
CurrentWorker->Rename("Disk");
CurrentWorker->SetPriority(100);
TaskManager->WaitForThread(CurrentWorker);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)LoadDrivers, argv, envp, auxv);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)LoadDrivers, nullptr, nullptr, auxv);
CurrentWorker->Rename("Drivers");
CurrentWorker->SetPriority(100);
TaskManager->WaitForThread(CurrentWorker);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)FetchDisks, argv, envp, auxv);
CurrentWorker = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (Tasking::IP)FetchDisks, nullptr, nullptr, auxv);
CurrentWorker->Rename("Fetch Disks");
CurrentWorker->SetPriority(100);
TaskManager->WaitForThread(CurrentWorker);
KPrint("Setting up userspace...");
envp.clear();
envp.push_back("PATH=/system:/system/bin");
envp.push_back("TERM=tty");
envp.push_back("HOME=/");
envp.push_back("USER=root");
envp.push_back("SHELL=/system/bin/sh");
envp.push_back("PWD=/");
envp.push_back("LANG=en_US.UTF-8");
envp.push_back("TZ=UTC");
const char *envp[] = {
"PATH=/system:/system/bin",
"TERM=tty",
"HOME=/",
"USER=root",
"SHELL=/system/bin/sh",
"PWD=/",
"LANG=en_US.UTF-8",
"TZ=UTC",
nullptr};
argv.clear();
argv.push_back("--init");
argv.push_back("--critical");
const char *argv[] = {
"--init",
"--critical",
nullptr};
// TODO: Untested!
bool ien = CPU::Interrupts(CPU::Check);