mm: fix Range type and addr rounding

Signed-off-by: Tianhao Wang <shrik3@mailbox.org>

2 files changed, 22 insertions, 19 deletions

diff --git a/src/mm/mod.rs b/src/mm/mod.rs
index 27737e8..8d07cc5 100644
--- a/src/mm/mod.rs
+++ b/src/mm/mod.rs
@@ -1,6 +1,7 @@
 use crate::defs::*;
 use crate::io::*;
 use crate::machine::multiboot;
+use core::ops::Range;
 pub mod pma;
 
 use lazy_static::lazy_static;
@@ -32,20 +33,21 @@ pub fn init() {
 			continue;
 		}
 		// TODO early break if the array is already full
-		if mblock.get_range().contains(pmap_kernel_end()) {
-			let r = Range {
-				addr: pmap_kernel_end(),
-				len: mblock.get_end() - pmap_kernel_end(),
-			};
-			inserted += GLOBAL_PMA.lock().insert_range(r);
-		} else {
-			inserted += GLOBAL_PMA.lock().insert_range(mblock.get_range());
+		let mut r = mblock.get_range();
+		if mblock.get_range().contains(&pmap_kernel_end()) {
+			r.start = pmap_kernel_end();
 		}
-		println!(
-			"pma init: {:#X}KiB free memory, {:#X} pages inserted from block {:#X?}",
-			inserted * 0x4,
-			inserted,
-			mblock,
-		);
+		inserted += GLOBAL_PMA.lock().insert_range(&r);
 	}
+
+	println!(
+		"pma init: kernel mapped at {:#X} - {:#X}",
+		pmap_kernel_start(),
+		pmap_kernel_end()
+	);
+	println!(
+		"pma init: {:#X}KiB free memory, {:#X} pages",
+		inserted * 0x4,
+		inserted,
+	);
 }
diff --git a/src/mm/pma.rs b/src/mm/pma.rs
index a4c27c4..f2822e6 100644
--- a/src/mm/pma.rs
+++ b/src/mm/pma.rs
@@ -1,6 +1,7 @@
 use crate::defs::*;
 use crate::io::*;
 use crate::machine::multiboot::MultibootMmap;
+use core::ops::Range;
 use core::slice;
 
 extern "C" {
@@ -51,18 +52,18 @@ impl PageStackAllocator {
 		Some(self.page_stack[self.head])
 	}
 
-	/// 4k page only
-	pub fn insert_range(&mut self, r: Range) -> u64 {
+	/// 4k page only?
+	pub fn insert_range(&mut self, r: &Range<u64>) -> u64 {
+		// r.contains(&1);
 		let mut inserted = 0;
-		let mut page = roundup_4k(r.addr);
+		let mut page = roundup_4k(r.start);
 		loop {
-			if !r.contains(page) {
+			if !r.contains(&page) {
 				break;
 			}
 			if !self.free_page(page) {
 				break;
 			} else {
-				println!("inserted: {:#X}", page);
 				inserted += 1;
 			}
 			page += 0x1000;