Attempt to print memory map

8 files changed, 59 insertions, 19 deletions

diff --git a/arch/x86_64/include/arch/boot/multiboot.hpp b/arch/x86_64/include/arch/boot/multiboot.hpp
index 9a0757e..4182a18 100644
--- a/arch/x86_64/include/arch/boot/multiboot.hpp
+++ b/arch/x86_64/include/arch/boot/multiboot.hpp
@@ -2,7 +2,8 @@
 
 struct multiboot_tag
 {
-  uint32_t type;
+  uint16_t type;
+  uint16_t flags;
   uint32_t size;
 };
 
@@ -18,6 +19,14 @@ struct multiboot_info
   struct multiboot_tag tags;
 };
 
+struct memory_map_entry
+{
+  uint64_t base_addr;
+  uint64_t length;
+  uint32_t type;
+  uint32_t reserved;
+};
+
 /*
  * Define all multiboot tag types to ther respective values
  * The gnu boot information format is defined here:
diff --git a/arch/x86_64/include/arch/boot/pointers.hpp b/arch/x86_64/include/arch/boot/pointers.hpp
index c7424e2..25800f4 100644
--- a/arch/x86_64/include/arch/boot/pointers.hpp
+++ b/arch/x86_64/include/arch/boot/pointers.hpp
@@ -8,4 +8,4 @@ namespace teachos::arch::boot
   extern "C" size_t const multiboot_information_pointer;
 }  // namespace teachos::arch::boot
 
-#endif
\ No newline at end of file
+#endif
diff --git a/arch/x86_64/include/arch/io/port_io.hpp b/arch/x86_64/include/arch/io/port_io.hpp
index 5b61f90..c0f1ef3 100644
--- a/arch/x86_64/include/arch/io/port_io.hpp
+++ b/arch/x86_64/include/arch/io/port_io.hpp
@@ -131,4 +131,4 @@ namespace teachos::arch::io
 
 }  // namespace teachos::arch::io
 
-#endif
\ No newline at end of file
+#endif
diff --git a/arch/x86_64/include/arch/kernel/main.hpp b/arch/x86_64/include/arch/kernel/main.hpp
index 6961594..6759eb2 100644
--- a/arch/x86_64/include/arch/kernel/main.hpp
+++ b/arch/x86_64/include/arch/kernel/main.hpp
@@ -8,4 +8,4 @@ namespace teachos::arch::kernel
   auto main() -> void;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/arch/x86_64/include/arch/video/vga/io.hpp b/arch/x86_64/include/arch/video/vga/io.hpp
index 9226c5c..da9375d 100644
--- a/arch/x86_64/include/arch/video/vga/io.hpp
+++ b/arch/x86_64/include/arch/video/vga/io.hpp
@@ -7,10 +7,8 @@
 
 namespace teachos::arch::video::vga
 {
-
   namespace crtc
   {
-
     /**
      * @brief The address port of the CRT Controller
      */
@@ -38,4 +36,4 @@ namespace teachos::arch::video::vga
 
 }  // namespace teachos::arch::video::vga
 
-#endif
\ No newline at end of file
+#endif
diff --git a/arch/x86_64/include/arch/video/vga/text.hpp b/arch/x86_64/include/arch/video/vga/text.hpp
index 97344da..3b484e5 100644
--- a/arch/x86_64/include/arch/video/vga/text.hpp
+++ b/arch/x86_64/include/arch/video/vga/text.hpp
@@ -138,8 +138,8 @@ namespace teachos::arch::video::vga::text
   auto write_number(T value, attribute attribute) -> void
   {
     T current_value = value;
-
     T divisor = 1;
+
     while (current_value > 9)
     {
       divisor *= 10;
@@ -154,7 +154,6 @@ namespace teachos::arch::video::vga::text
 
       write_char(ascii_digit, attribute);
       current_value %= divisor;
-
       divisor /= 10;
     }
   }
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index a5ffbb4..6eb8521 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -6,6 +6,46 @@
 
 namespace teachos::arch::kernel
 {
+
+  auto print_meminfo(multiboot_tag * tag) -> void
+  {
+    using namespace video::vga;
+
+    uint32_t * pointer = &tag->size;
+    uint32_t mem_lower = *(++pointer);
+    uint32_t mem_upper = *(++pointer);
+
+    text::write("Lower memory bound: ", text::common_attributes::green_on_black);
+    text::write_number(mem_lower, text::common_attributes::green_on_black);
+    text::write("Upper memory bound: ", text::common_attributes::green_on_black);
+    text::write_number(mem_upper, text::common_attributes::green_on_black);
+  }
+
+  auto print_memory_map(multiboot_tag * tag) -> void
+  {
+    using namespace video::vga;
+
+    uint32_t * pointer = &tag->size;
+    uint32_t entry_size = *(++pointer);
+    uint32_t entry_version = *(++pointer);
+    text::write("Version: ", text::common_attributes::green_on_black);
+    text::write_number(entry_version, text::common_attributes::green_on_black);
+
+    auto begin = (struct memory_map_entry *)++pointer;
+    auto end = begin + entry_size;
+    for (auto itr = begin; itr < end; ++itr)
+    {
+      text::write("Base Address: ", text::common_attributes::green_on_black);
+      text::write_number(itr->base_addr, text::common_attributes::green_on_black);
+      text::write("Length: ", text::common_attributes::green_on_black);
+      text::write_number(itr->length, text::common_attributes::green_on_black);
+      text::write("Type: ", text::common_attributes::green_on_black);
+      text::write_number(itr->type, text::common_attributes::green_on_black);
+      text::write("Reserved: ", text::common_attributes::green_on_black);
+      text::write_number(itr->reserved, text::common_attributes::green_on_black);
+    }
+  }
+
   auto main() -> void
   {
     using namespace video::vga;
@@ -29,15 +69,10 @@ namespace teachos::arch::kernel
       switch (tag->type)
       {
         case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
-          uint32_t size = tag->size;
-          uint32_t mem_lower = *(uint32_t *)(&size + 32);
-          uint32_t mem_upper = *(uint32_t *)(&size + 64);
-
-          text::write_number(mem_lower, text::common_attributes::green_on_black);
-          text::write("Lower memory bound", text::common_attributes::green_on_black);
-          text::write_number(mem_lower, text::common_attributes::green_on_black);
-          text::write("Upper memory bound", text::common_attributes::green_on_black);
-          text::write_number(mem_upper, text::common_attributes::green_on_black);
+          print_meminfo(tag);
+          break;
+        case MULTIBOOT_TAG_TYPE_MMAP:
+          print_memory_map(tag);
           break;
       }
     }
diff --git a/arch/x86_64/src/video/vga/text.cpp b/arch/x86_64/src/video/vga/text.cpp
index bf60410..a613c3b 100644
--- a/arch/x86_64/src/video/vga/text.cpp
+++ b/arch/x86_64/src/video/vga/text.cpp
@@ -10,7 +10,6 @@
 
 namespace teachos::arch::video::vga::text
 {
-
   namespace
   {
     auto constexpr default_text_buffer_address = 0xb8000;