diff options
Diffstat (limited to 'arch/riscv64')
| -rw-r--r-- | arch/riscv64/asm/asm-offsets.c | 5 | ||||
| -rw-r--r-- | arch/riscv64/include/tcb.h | 1 | ||||
| -rw-r--r-- | arch/riscv64/kernel/entry.S | 19 | ||||
| -rw-r--r-- | arch/riscv64/kernel/proc.c | 20 |
4 files changed, 25 insertions, 20 deletions
diff --git a/arch/riscv64/asm/asm-offsets.c b/arch/riscv64/asm/asm-offsets.c index 3619765..1239489 100644 --- a/arch/riscv64/asm/asm-offsets.c +++ b/arch/riscv64/asm/asm-offsets.c @@ -83,4 +83,9 @@ void asm_offsets() OFFSETOF(ar3, struct sys_ret); OFFSETOF(ar4, struct sys_ret); SIZEOF(sys_ret, struct sys_ret); + + OFFSETOF(exec, struct tcb); + OFFSETOF(regs, struct tcb); + OFFSETOF(tcbd, struct tcb); + SIZEOF(tcb, struct tcb); } diff --git a/arch/riscv64/include/tcb.h b/arch/riscv64/include/tcb.h index ed2fd71..829ce6a 100644 --- a/arch/riscv64/include/tcb.h +++ b/arch/riscv64/include/tcb.h @@ -16,6 +16,7 @@ * saving of something */ struct arch_tcbd { + long scratch; }; #endif /* ARCH_RISCV_TCB_H */ diff --git a/arch/riscv64/kernel/entry.S b/arch/riscv64/kernel/entry.S index 355cd3d..f099065 100644 --- a/arch/riscv64/kernel/entry.S +++ b/arch/riscv64/kernel/entry.S @@ -23,13 +23,9 @@ handle_irq: * now just spin in place */ 1: j 1b _save_context: - /* store user stack pointer and replace it with kernel stack */ - addi tp, tp,-sizeof_registers - sr sp, offsetof_sp(tp) - mv sp, tp - - /* move thread pointer back */ - addi tp, tp, sizeof_registers + sr sp, offsetof_tcbd(tp) + lr sp, offsetof_regs(tp) + addi sp, sp, -sizeof_registers csrrw tp, CSR_SSCRATCH, tp /* save registers */ @@ -67,6 +63,9 @@ _save_context: /* get current tcb into tp and set scratch to 0 so we can figure out if * exception occured in kernel or userspace */ csrrw tp, CSR_SSCRATCH, x0 + lr s0, offsetof_tcbd(tp) + sr s0, offsetof_sp(sp) + addi sp, tp, -sizeof_registers /* load supervisor cause */ csrr s4, CSR_SCAUSE @@ -85,7 +84,7 @@ handle_exception: handle_dispatch: /* store execution continuation point */ csrr s0, CSR_SEPC - sr s0, 0(tp) + sr s0, offsetof_exec(tp) /* allocate space for sys_ret structure on stack and shift argument * registers down one to make room for the pointer to this structure */ addi sp, sp, -sizeof_sys_ret @@ -109,10 +108,10 @@ handle_dispatch: /* if we had a thread switch, load kernel stack of current thread and * restore its context */ /* get associated kernel stack */ - mv sp, tp + lr sp, offsetof_regs(tp) addi sp, sp, -sizeof_registers /* set execution continuation */ - lr s0, 0(tp) + lr s0, offsetof_exec(tp) csrw CSR_SEPC, s0 /* restore system call result */ j restore_noreturn diff --git a/arch/riscv64/kernel/proc.c b/arch/riscv64/kernel/proc.c index b8f6c5d..4180bf8 100644 --- a/arch/riscv64/kernel/proc.c +++ b/arch/riscv64/kernel/proc.c @@ -30,7 +30,7 @@ void run_init(struct tcb *t, void *fdt) void set_args(struct tcb *t, struct sys_ret a) { - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; r->a0 = a.s; r->a1 = a.ar0; r->a2 = a.ar1; @@ -41,7 +41,7 @@ void set_args(struct tcb *t, struct sys_ret a) struct sys_ret get_args(struct tcb *t) { - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; return SYS_RET6(r->a0, r->a1, r->a2, r->a3, r->a4, r->a5); } @@ -49,7 +49,7 @@ void set_thread(struct tcb *t) { /* get location of registers in memory */ /** \todo check alignment, should be fine but just to be sure */ - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; /* insert important values into register slots */ r->sp = (long)t->thread_stack_top; @@ -58,28 +58,28 @@ void set_thread(struct tcb *t) vm_t get_stack(struct tcb *t) { - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; return r->sp; } void save_regs(struct tcb *t, void *p) { - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; - struct riscv_regs *rp = (struct riscv_regs *)(p); + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; + struct riscv_regs *rp = (struct riscv_regs *)(p) - 1; *rp = *r; } void load_regs(void *p, struct tcb *t) { - struct riscv_regs *r = (struct riscv_regs *)(t) - 1; - struct riscv_regs *rp = (struct riscv_regs *)(p); + struct riscv_regs *r = (struct riscv_regs *)(t->regs) - 1; + struct riscv_regs *rp = (struct riscv_regs *)(p) - 1; *r = *rp; } void clone_regs(struct tcb *d, struct tcb *s) { - struct riscv_regs *rd = (struct riscv_regs *)(d) - 1; - struct riscv_regs *rs = (struct riscv_regs *)(s) - 1; + struct riscv_regs *rd = (struct riscv_regs *)(d->regs) - 1; + struct riscv_regs *rs = (struct riscv_regs *)(s->regs) - 1; *rd = *rs; } |