Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/arch/riscv32/mem.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use super::asm;

pub fn update_kernel_sp(sp: usize) {
unsafe { core::arch::asm!("mv a0, {}", in(reg) sp) };
unsafe { asm::set_kernel_sp() };
}
1 change: 1 addition & 0 deletions src/arch/riscv32/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod asm;
pub mod mem;
pub mod scheduler;
pub mod start;
pub mod task;
Expand Down
4 changes: 2 additions & 2 deletions src/boot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::{
ktime::set_ktime_seconds,
log,
logs::LogLevel,
mem::{memory_init, update_kernel_sp},
mem::{mem_update_kernel_sp, memory_init},
platform::platform_init,
};

Expand All @@ -34,7 +34,7 @@ pub fn kernel_early_boot(core: usize, dtb_addr: usize) -> ! {
);
memory_init();
log!(LogLevel::Debug, "Switch to new kernel stack...");
update_kernel_sp();
mem_update_kernel_sp();
// Allow empty loop because it will never enter, just to make the fn never return without
// warning
#[allow(clippy::empty_loop)]
Expand Down
16 changes: 8 additions & 8 deletions src/mem/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ Tests files:

mod kernel;

use core::{arch::asm, mem};
use core::mem;

use kernel::{__kernel_end, __kernel_start, KernelStack};

use crate::{
arch, config::KERNEL_STACK_SIZE, log, logs::LogLevel, platform::mem::platform_init_mem,
arch::mem::update_kernel_sp, config::KERNEL_STACK_SIZE, log, logs::LogLevel,
platform::mem::platform_init_mem,
};

pub struct Memory {
Expand Down Expand Up @@ -137,19 +138,18 @@ pub fn memory_init() {
}
}

#[unsafe(no_mangle)]
pub fn update_kernel_sp() {
unsafe { asm!("mv a0, {}", in(reg) MEMORY.kernel_stack.top) };
unsafe { arch::asm::set_kernel_sp() };
}

pub fn mem_kernel_stack_info<'a>() -> &'a KernelStack {
#[allow(static_mut_refs)]
unsafe {
&MEMORY.kernel_stack
}
}

pub fn mem_update_kernel_sp() {
let sp: usize = unsafe { MEMORY.kernel_stack.top };
update_kernel_sp(sp);
}

/// Return the hi and lo address of the RAM
/// first index is hi, second is lo
pub fn mem_reg_info() -> [usize; 2] {
Expand Down