michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Some new test printlns

Browse Source
This commit is contained in:
Philipp Oppermann
2015-12-03 21:20:38 +01:00
parent a8df7b2e4d
commit 44fd5f682d
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib.rs
View File

@@ -61,20 +61,23 @@ pub extern fn rust_main(multiboot_information_address: usize) {
let mut frame_allocator = memory::AreaFrameAllocator::new(kernel_start as usize, let mut frame_allocator = memory::AreaFrameAllocator::new(kernel_start as usize,
kernel_end as usize, multiboot_start, multiboot_end, memory_map_tag.memory_areas()); kernel_end as usize, multiboot_start, multiboot_end, memory_map_tag.memory_areas());
for i in 0.. {
use memory::FrameAllocator;
if let None = frame_allocator.allocate_frame() {
println!("allocated {} frames", i);
break;
}
}
//println!("outer {}", {println!("inner"); "NO DEADLOCK"}); // println!("outer {}", {println!("inner"); "NO DEADLOCK"});
println!("{:?}", memory::paging::translate(0)); /*println!("{:?}", memory::paging::translate::translate(0));*/
println!("{:?}", memory::paging::translate(12345));
//for i in 0.. { println!("{:?}", memory::paging::translate::translate(0));
//println!("0o{:o}", memory::paging::translate1(0o_000_000_000_0000 + i << 21).unwrap()); println!("{:?}", memory::paging::translate::translate(0x40000000));
//} println!("{:?}", memory::paging::translate::translate(0x40000000 - 1));
println!("{:?}", memory::paging::translate::translate(0xdeadbeaa000));
println!("{:?}", memory::paging::translate::translate(0xcafebeaf000));
memory::paging::test(&mut frame_allocator);
println!("{:x}", memory::paging::translate::translate(0xdeadbeaa000).unwrap());
println!("{:x}", memory::paging::translate::translate(0xdeadbeab000).unwrap());
println!("{:x}", memory::paging::translate::translate(0xdeadbeac000).unwrap());
println!("{:x}", memory::paging::translate::translate(0xdeadbead000).unwrap());
println!("{:x}", memory::paging::translate::translate(0xcafebeaf000).unwrap());
loop{} loop{}
} }