stepus53/ficus
1
0
Fork 0
mirror of https://github.com/usatiuk/ficus.git synced 2025-10-29 08:37:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

limine module loading as user tasks!

Browse Source
This commit is contained in:
Stepan Usatiuk
2023-11-26 21:49:21 +01:00
parent a64484d0b8
commit 84ae1aa6e5
19 changed files with 143 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/arch/x86/task.cpp
View File

@@ -130,14 +130,14 @@ struct Task *new_ktask(void (*fn)(), const char *name) {
}
return newt;
}
struct Task *new_utask(void (*fn)(), const char *name) {
struct Task *new_utask(void (*entrypoint)(), const char *name) {
Task *newt = static_cast<Task *>(kmalloc(sizeof(struct Task)));
newt->kstack = static_cast<uint64_t *>(kmalloc(TASK_SS));
newt->name = static_cast<char *>(kmalloc(strlen(name) + 1));
newt->fxsave = static_cast<char *>(kmalloc(512));
strcpy(name, newt->name);
newt->frame.ip = (uint64_t) fn;
newt->frame.ip = (uint64_t) entrypoint;
newt->frame.cs = GDTSEL(gdt_code_user) | 0x3;
newt->frame.ss = GDTSEL(gdt_data_user) | 0x3;
@@ -147,7 +147,7 @@ struct Task *new_utask(void (*fn)(), const char *name) {
newt->frame.guard = IDT_GUARD;
newt->addressSpace = new AddressSpace();
newt->vma = new VMA(newt->addressSpace);
newt->state = TS_RUNNING;
newt->state = TS_BLOCKED;
newt->mode = TASKMODE_USER;
newt->pid = max_pid.fetch_add(1);
newt->used_time = 0;
@@ -175,13 +175,6 @@ struct Task *new_utask(void (*fn)(), const char *name) {
sanity_check_frame(&newt->frame);
auto new_node = NextTasks.create_node(newt);
{
LockGuard l(NextTasks_lock);
NextTasks.emplace_front(new_node);
}
{
LockGuard l(AllTasks_lock);
AllTasks.add(newt->pid, newt);
@@ -189,6 +182,15 @@ struct Task *new_utask(void (*fn)(), const char *name) {
return newt;
}
void start_utask(struct Task *task) {
task->state = TS_RUNNING;
auto new_node = NextTasks.create_node(task);
{
LockGuard l(NextTasks_lock);
NextTasks.emplace_front(new_node);
}
}
void remove_self() {
{