Simplify the entry address computation

We actually don't need to preserve the initially computed base address
for each binary, but we can just preserve the final entry address.

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>

1 files changed, 4 insertions, 14 deletions

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