andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-24 02:16:19 +04:00
Code Issues Projects Releases Wiki Activity

Fixed mapping kernel stack

Browse Source
This commit is contained in:
Stephen Marz 2019-10-21 13:19:52 -04:00
parent ce0cc7df11
commit 7e3d97b908
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
risc_v/ch4/src/lib.rs
View File

@ -264,7 +264,7 @@ extern "C" fn kinit() {
id_map_range( id_map_range(
&mut root, &mut root,
cpu::KERNEL_TRAP_FRAME[0].trap_stack.sub(page::PAGE_SIZE) as usize, cpu::KERNEL_TRAP_FRAME[0].trap_stack.sub(page::PAGE_SIZE) as usize,
cpu::KERNEL_TRAP_FRAME[0].trap_stack as usize + 1, cpu::KERNEL_TRAP_FRAME[0].trap_stack as usize,
page::EntryBits::ReadWrite.val(), page::EntryBits::ReadWrite.val(),
); );
id_map_range( id_map_range(
@ -273,7 +273,7 @@ extern "C" fn kinit() {
cpu::mscratch_read() + core::mem::size_of::<cpu::KernelTrapFrame>(), cpu::mscratch_read() + core::mem::size_of::<cpu::KernelTrapFrame>(),
page::EntryBits::ReadWrite.val(), page::EntryBits::ReadWrite.val(),
); );
let p = cpu::KERNEL_TRAP_FRAME[0].trap_stack as usize; let p = cpu::KERNEL_TRAP_FRAME[0].trap_stack as usize - 1;
let m = page::virt_to_phys(&root, p).unwrap_or(0); let m = page::virt_to_phys(&root, p).unwrap_or(0);
println!("Walk 0x{:x} = 0x{:x}", p, m); println!("Walk 0x{:x} = 0x{:x}", p, m);
} }