Merge pull request #590 from betrusted-io/fix-test

revert statics clearing routine
This commit is contained in:
bunnie 2024-10-21 03:32:02 +08:00 committed by GitHub
commit df44d62b1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -15,14 +15,9 @@ pub extern "C" fn _start(_kernel_args: usize, loader_sig: usize) {
unsafe {
#[rustfmt::skip]
asm! (
"mv t0, {ram_base}",
"li t1, 0x10000",
"add t2, t0, t1",
"900:", // clear 64k base data for statics
"sw x0, 0(t0)",
"addi t0, t0, 4",
"bltu t0, t2, 900b",
"li t0, 0xffffffff",
"csrw mideleg, t0",
"csrw medeleg, t0",
// decorate our stack area with a canary pattern
"li t1, 0xACE0BACE",
@ -38,10 +33,6 @@ pub extern "C" fn _start(_kernel_args: usize, loader_sig: usize) {
// subtract four from sp to make room for a DMA "gutter"
"addi sp, sp, -4",
"li t0, 0xffffffff",
"csrw mideleg, t0",
"csrw medeleg, t0",
// Install a machine mode trap handler
"la t0, abort",
"csrw mtvec, t0",
@ -57,7 +48,6 @@ pub extern "C" fn _start(_kernel_args: usize, loader_sig: usize) {
ram_top = in(reg) (platform::RAM_BASE + platform::RAM_SIZE),
// On Precursor - 0x40FFE01C: currently allowed stack extent - 8k - (7 words). 7 words are for kernel backup args - see bootloader in betrusted-soc
stack_limit = in(reg) (platform::RAM_BASE + platform::RAM_SIZE - 8192 + 7 * core::mem::size_of::<usize>()),
ram_base = in(reg) (platform::RAM_BASE),
options(noreturn)
);
}