Skip to content

Commit 0a25f40

Browse files
committed
refactor(memory/paging): 调整导入顺序并移除测试模块
1 parent 0e158e7 commit 0a25f40

File tree

1 file changed

+1
-43
lines changed
  • kernel/src/memory/paging

1 file changed

+1
-43
lines changed

kernel/src/memory/paging/vmm.rs

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use x86_64::structures::paging::Translate;
99
use x86_64::structures::paging::{
1010
mapper::MapToError, FrameAllocator, Mapper, OffsetPageTable, Page, PageTableFlags,
1111
};
12-
use x86_64::{VirtAddr, PhysAddr};
12+
use x86_64::{PhysAddr, VirtAddr};
1313

1414
extern "C" {
1515
// 从链接脚本中获取
@@ -215,45 +215,3 @@ pub fn init(page_table: OffsetPageTable<'static>) {
215215
pub fn translate_addr(addr: VirtAddr) -> Option<PhysAddr> {
216216
KERNEL_MEMORY_SET.lock().as_ref()?.translate_addr(addr)
217217
}
218-
#[cfg(test)]
219-
mod tests {
220-
use super::*;
221-
use alloc::vec::Vec;
222-
223-
#[test_case]
224-
fn test_heap_growth() {
225-
let mut v = Vec::new();
226-
// Allocate 1MB of integers
227-
for i in 0..100000 {
228-
v.push(i);
229-
}
230-
assert_eq!(v.len(), 100000);
231-
for i in 0..100000 {
232-
assert_eq!(v[i], i);
233-
}
234-
}
235-
236-
#[test_case]
237-
fn test_lazy_allocation() {
238-
let addr = VirtAddr::new(0x_5555_5555_0000);
239-
let end = addr + 4096u64;
240-
{
241-
let mut ms_lock = KERNEL_MEMORY_SET.lock();
242-
let memory_set = ms_lock.as_mut().unwrap();
243-
memory_set
244-
.insert_area(VmArea::new(
245-
addr,
246-
end,
247-
PageTableFlags::PRESENT | PageTableFlags::WRITABLE,
248-
"test_lazy",
249-
))
250-
.unwrap();
251-
}
252-
253-
let ptr = addr.as_mut_ptr::<u64>();
254-
unsafe {
255-
*ptr = 0xDEADBEEF;
256-
assert_eq!(*ptr, 0xDEADBEEF);
257-
}
258-
}
259-
}

0 commit comments

Comments
 (0)