diff --git a/Cargo.lock b/Cargo.lock index 1f9f85236..36d044666 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -367,9 +367,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.14" +version = "4.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea54a38e4bce14ff6931c72e5b3c43da7051df056913d4e7e1fcdb1c03df69d" +checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f" dependencies = [ "atty", "bitflags", @@ -2534,7 +2534,7 @@ dependencies = [ name = "xtask" version = "0.1.0" dependencies = [ - "clap 4.0.14", + "clap 4.0.15", "dircpy", "num_cpus", "once_cell", diff --git a/zCore/src/memory.rs b/zCore/src/memory.rs index 006e3edcd..83759eaa5 100644 --- a/zCore/src/memory.rs +++ b/zCore/src/memory.rs @@ -25,8 +25,14 @@ const PAGE_BITS: usize = 12; /// 为启动准备的初始内存。 /// -/// 经测试 16 KiB 单核够用,多核不够,故此处给了 32 KiB。 -static mut MEMORY: [u8; 8 * 4096] = [0u8; 8 * 4096]; +/// 经测试,不同硬件的需求: +/// +/// | machine | memory +/// | --------------- | - +/// | qemu,virt SMP 1 | 16 KiB +/// | qemu,virt SMP 4 | 32 KiB +/// | allwinner,nezha | 256 KiB +static mut MEMORY: [u8; 256 << 10] = [0u8; 256 << 10]; unsafe impl GlobalAlloc for LockedHeap { #[inline]