Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: use MEMORY_END from mod boards #136

Browse source
This commit is contained in:
Yifan Wu 2024-01-21 22:06:20 +08:00
parent f2c7dcc72b
commit 28c8a9e9fc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
os/src/boards/qemu.rs
View file

@ -1,6 +1,7 @@
//! Constants used in rCore for qemu //! Constants used in rCore for qemu
pub const CLOCK_FREQ: usize = 12500000; pub const CLOCK_FREQ: usize = 12500000;
pub const MEMORY_END: usize = 0x8800_0000;
pub const MMIO: &[(usize, usize)] = &[ pub const MMIO: &[(usize, usize)] = &[
(0x0010_0000, 0x00_2000), // VIRT_TEST/RTC in virt machine (0x0010_0000, 0x00_2000), // VIRT_TEST/RTC in virt machine

3
os/src/config.rs
View file

@ -3,7 +3,6 @@
pub const USER_STACK_SIZE: usize = 4096 * 2; pub const USER_STACK_SIZE: usize = 4096 * 2;
pub const KERNEL_STACK_SIZE: usize = 4096 * 2; pub const KERNEL_STACK_SIZE: usize = 4096 * 2;
pub const KERNEL_HEAP_SIZE: usize = 0x30_0000; pub const KERNEL_HEAP_SIZE: usize = 0x30_0000;
pub const MEMORY_END: usize = 0x80800000;
pub const PAGE_SIZE: usize = 0x1000; pub const PAGE_SIZE: usize = 0x1000;
pub const PAGE_SIZE_BITS: usize = 0xc; pub const PAGE_SIZE_BITS: usize = 0xc;
@ -16,4 +15,4 @@ pub fn kernel_stack_position(app_id: usize) -> (usize, usize) {
(bottom, top) (bottom, top)
} }
pub use crate::board::{CLOCK_FREQ, MMIO}; pub use crate::board::{CLOCK_FREQ, MEMORY_END, MMIO};