diff --git a/kernel/bin/riscv32i-unknown-none-elf.a b/kernel/bin/riscv32i-unknown-none-elf.a index 15aabf24c..21ed4e56e 100644 Binary files a/kernel/bin/riscv32i-unknown-none-elf.a and b/kernel/bin/riscv32i-unknown-none-elf.a differ diff --git a/kernel/bin/riscv32imac-unknown-none-elf.a b/kernel/bin/riscv32imac-unknown-none-elf.a index bf535b656..4918d0962 100644 Binary files a/kernel/bin/riscv32imac-unknown-none-elf.a and b/kernel/bin/riscv32imac-unknown-none-elf.a differ diff --git a/kernel/bin/riscv32imc-unknown-none-elf.a b/kernel/bin/riscv32imc-unknown-none-elf.a index bf535b656..647d4b0dc 100644 Binary files a/kernel/bin/riscv32imc-unknown-none-elf.a and b/kernel/bin/riscv32imc-unknown-none-elf.a differ diff --git a/kernel/bin/riscv64gc-unknown-none-elf.a b/kernel/bin/riscv64gc-unknown-none-elf.a index 5e59fbd3c..de5e92ad4 100644 Binary files a/kernel/bin/riscv64gc-unknown-none-elf.a and b/kernel/bin/riscv64gc-unknown-none-elf.a differ diff --git a/kernel/bin/riscv64imac-unknown-none-elf.a b/kernel/bin/riscv64imac-unknown-none-elf.a index 5e59fbd3c..de5e92ad4 100644 Binary files a/kernel/bin/riscv64imac-unknown-none-elf.a and b/kernel/bin/riscv64imac-unknown-none-elf.a differ diff --git a/kernel/src/asm.S b/kernel/src/asm.S index f0d102157..a081b19e5 100644 --- a/kernel/src/asm.S +++ b/kernel/src/asm.S @@ -51,10 +51,10 @@ _start: _start_trap: csrw sscratch, sp li sp, 0xff801000 - STORE x1, 0*REGBYTES(sp) - LOAD x1, 1*REGBYTES(sp) - slli x1, x1, 7 - add sp, sp, x1 + STORE x1, 0*REGBYTES(sp) // Store x1 in the scratch field + lh x1, 1*REGBYTES(sp) // Load current context number + slli x1, x1, 7 // Multiply current context number by 32 + add sp, sp, x1 // Set $sp to 0xff801000 + (current_context * 32) STORE x1, 0*REGBYTES(sp) // Skip SP for now