diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/initrd.c | 5 | ||||
| -rw-r--r-- | kernel/main.c | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/kernel/initrd.c b/kernel/initrd.c index ff1f52b..27d0ece 100644 --- a/kernel/initrd.c +++ b/kernel/initrd.c @@ -101,8 +101,9 @@ __kernel void extract_elf(int task_id, const unsigned char *const addr, size_t s /* }; */ #ifdef __KERNEL__ - tasks[task_id].addr = (const void *)addr; - tasks[task_id].entry_offset = (uint64_t)addr[0x18]; + uint64_t offset = (uint64_t)addr[0x18]; + + tasks[task_id].entry_addr = (const void *)(addr + offset); #endif } diff --git a/kernel/main.c b/kernel/main.c index ba4ada0..58d67f5 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -7,22 +7,12 @@ unsigned long init_stack[4][THREAD_SIZE / sizeof(unsigned long)]; struct task_struct tasks[4] = { - [TASK_INIT] = { .stack = init_stack[0], .addr = nullptr, .entry_offset = 0, }, - [TASK_FIZZ] = { .stack = init_stack[1], .addr = nullptr, .entry_offset = 0, }, - [TASK_BUZZ] = { .stack = init_stack[2], .addr = nullptr, .entry_offset = 0, }, - [TASK_FIZZBUZZ] = { .stack = init_stack[3], .addr = nullptr, .entry_offset = 0, }, + [TASK_INIT] = { .stack = init_stack[0], .entry_addr = nullptr, }, + [TASK_FIZZ] = { .stack = init_stack[1], .entry_addr = nullptr, }, + [TASK_BUZZ] = { .stack = init_stack[2], .entry_addr = nullptr, }, + [TASK_FIZZBUZZ] = { .stack = init_stack[3], .entry_addr = nullptr, }, }; -// TODO -__kernel void switch_to(int task_id) -{ - const char *ddr = (const char *)tasks[task_id].addr + tasks[task_id].entry_offset; - - asm volatile("csrc sstatus, %[mask]" : : [mask] "r"(1 << 8)); - asm volatile("mv ra, %0" : : "r"(ddr)); - asm volatile("csrw sepc, ra"); -} - /* * This is the main entry point of the kernel after head.S is done. This * function can (and will) assume that everything has been reset and that we can |