add mm and ds modules (yet empty)

7 files changed, 33 insertions, 6 deletions

diff --git a/src/ds/bitmap.rs b/src/ds/bitmap.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/ds/bitmap.rs
diff --git a/src/ds/mod.rs b/src/ds/mod.rs
new file mode 100644
index 0000000..7cfb300
--- /dev/null
+++ b/src/ds/mod.rs
@@ -0,0 +1,2 @@
+pub mod bitmap;
+pub mod queue;
diff --git a/src/ds/queue.rs b/src/ds/queue.rs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/ds/queue.rs
diff --git a/src/lib.rs b/src/lib.rs
index b66afb5..d982d51 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,9 +3,11 @@
 #![no_std]
 #![no_main]
 mod arch;
+mod defs;
+mod ds;
 mod io;
 mod machine;
-mod defs;
+mod mm;
 use arch::x86_64::interrupt::pic_8259;
 use arch::x86_64::interrupt::pic_8259::PicDeviceInt;
 use core::panic::PanicInfo;
@@ -28,8 +30,6 @@ pub extern "C" fn _entry() -> ! {
 	println!("   (,-.`._,'(       |\\`-/|");
 	println!("       `-.-' \\ )-`( , o o)");
 	println!("             `-    \\`_`\"'-");
-	println!("it works!");
-
 	// testing interrupt/PIC
 	// pic_8259::allow(PicDeviceInt::KEYBOARD);
 	// interrupt::interrupt_enable();
diff --git a/src/mm/heap_allocator.rs b/src/mm/heap_allocator.rs
new file mode 100644
index 0000000..5a7463d
--- /dev/null
+++ b/src/mm/heap_allocator.rs
@@ -0,0 +1,2 @@
+#![feature(global_allocator, allocator_api, heap_api)]
+struct HeapAllocator;
diff --git a/src/mm/mod.rs b/src/mm/mod.rs
index 1298d0d..b030dfb 100644
--- a/src/mm/mod.rs
+++ b/src/mm/mod.rs
@@ -1 +1,2 @@
+pub mod heap_allocator;
 pub mod pma;
diff --git a/src/mm/pma.rs b/src/mm/pma.rs
index f9a40ee..aa5e193 100644
--- a/src/mm/pma.rs
+++ b/src/mm/pma.rs
@@ -1,9 +1,31 @@
-use core::ffi::c_void;
 use crate::defs::Mem;
+use core::ffi::c_void;
+use core::{ptr, slice};
 // this is POC code, it will be ugly
+
 extern "C" {
-    static KERNEL_END: *const c_void;
+	pub fn ___KERNEL_END__();
+}
+/// Bitmap for physical frames. to get around the chicken-egg problem, we provide a provisional
+/// bitmap of fixed length in the startup code.
+pub struct PFMap {
+	bm: &'static mut [u8],
+	skip: usize, // pfn to skip (because they are already used by the initial kernel image)
+	end: usize,  // pfn limit
 }
 
-// pub struct PageAlloctor;
+// TODO PMA initialization : needs to singleton
+
+impl PFMap {}
 
+pub struct Frame {
+	pfn: usize,
+}
+
+impl Frame {
+	pub fn addr(&self) -> usize {
+		self.pfn << Mem::PAGE_SHIFT
+	}
+}
+
+// pub struct PageAlloctor;