diff --git a/kernel/assemble.ps1 b/kernel/assemble.ps1 index e9601fd67..a18ddb076 100644 --- a/kernel/assemble.ps1 +++ b/kernel/assemble.ps1 @@ -13,17 +13,17 @@ Switch ($Arch) { # remove existing blobs because otherwise this will append object files to the old blobs Remove-Item -Force bin/riscv*.a - riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/arch/riscv/asm.S -o bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac_zicsr_zifencei src/arch/riscv/asm.S -o bin/$crate.o + riscv-none-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o + riscv-none-elf-ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o + riscv-none-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i_zicsr_zifencei src/arch/riscv/asm.S -o bin/$crate.o + riscv-none-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - riscv64-unknown-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/arch/riscv/asm.S -o bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o - riscv64-unknown-elf-ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac_zicsr_zifencei src/arch/riscv/asm.S -o bin/$crate.o + riscv-none-elf-ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o + riscv-none-elf-ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o } "arm" { Remove-Item -Force bin/arm*.a diff --git a/kernel/assemble.sh b/kernel/assemble.sh index b5c4c7880..32932a205 100755 --- a/kernel/assemble.sh +++ b/kernel/assemble.sh @@ -34,15 +34,15 @@ case $arch in # files to the old blobs rm -f bin/riscv*.a - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/arch/riscv/asm.S -o bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac_zicsr src/arch/riscv/asm.S -o bin/$crate.o ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i_zicsr src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/arch/riscv/asm.S -o bin/$crate.o + riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac_zicsr src/arch/riscv/asm.S -o bin/$crate.o ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o ;; diff --git a/kernel/bin/riscv32i-unknown-none-elf.a b/kernel/bin/riscv32i-unknown-none-elf.a index 83b7dc9b4..e2ef052ec 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 766988e8d..67090cb12 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/riscv32imac-unknown-xous-elf.a b/kernel/bin/riscv32imac-unknown-xous-elf.a index 766988e8d..67090cb12 100644 Binary files a/kernel/bin/riscv32imac-unknown-xous-elf.a and b/kernel/bin/riscv32imac-unknown-xous-elf.a differ diff --git a/kernel/bin/riscv32imc-unknown-none-elf.a b/kernel/bin/riscv32imc-unknown-none-elf.a index 766988e8d..67090cb12 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 838b18e96..eca21c241 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 838b18e96..eca21c241 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/arch/riscv/asm.S b/kernel/src/arch/riscv/asm.S index 755a2f9d5..767d9d40f 100644 --- a/kernel/src/arch/riscv/asm.S +++ b/kernel/src/arch/riscv/asm.S @@ -40,7 +40,7 @@ _start: handler to set up the remainder of the resume tasks. */ // Restore a default stack pointer - used by interrupt handlers and considered temporary/smashable - li sp, 0xfffefffc + li sp, 0xfffefff0 // setup sie [ssoft, sext]. This corresponds to bits 1 and 9, or 0b10_0000_0010 li t0, 0x202 @@ -49,7 +49,7 @@ _start: // restore the SIM with the value previously socked away by the interrupt handler routine during the suspend half jal ra, _enable_all_irqs - // set scause to simulate an interrupt's occurence -- this makes the resume "feel like" an interrupt + // set scause to simulate an interrupt's occurrence -- this makes the resume "feel like" an interrupt // vectored into the same routine that caused the suspend, but without having gone through the typical // interrupt handler mechanisms li t0, 0x80000000 @@ -137,7 +137,7 @@ _start_trap: STORE t0, 1*REGBYTES(sp) // Restore a default stack pointer - li sp, 0xfffefffc + li sp, 0xfffefff0 // Note that registers $a0-$a7 still contain the arguments j _start_trap_rust @@ -155,8 +155,8 @@ _xous_resume_context: LOAD x1, 0*REGBYTES(sp) // Clear any reservations, invalidating any atomic operations -#ifndef SKIP_MULTICORE - sc.w zero, x1, 0*REGBYTES(sp) +#ifdef __riscv_atomic + sc.w.rl zero, x1, (sp) #endif // Skip SP for now @@ -222,8 +222,8 @@ _xous_syscall_return_result: // one bit, and we can clear the bit by performing a dummy `sc` // here. This will cause a failure in any atomic operation in the // program we're switching to. -#ifndef SKIP_MULTICORE - sc.w zero, x1, 0*REGBYTES(sp) +#ifdef __riscv_atomic + sc.w.rl zero, x1, (sp) #endif // Skip SP for now @@ -261,8 +261,10 @@ _xous_syscall_return_result: LOAD x30, 29*REGBYTES(sp) LOAD x31, 30*REGBYTES(sp) + fence + // Restore SP - //csrr t0, sscratch + //csrr t0, sscratch LOAD x2, 1*REGBYTES(sp) sret