kstd: introduce strong type for memory amounts

1 files changed, 10 insertions, 7 deletions

diff --git a/arch/x86_64/kapi/memory.cpp b/arch/x86_64/kapi/memory.cpp
index 07e7465..5f12e5c 100644
--- a/arch/x86_64/kapi/memory.cpp
+++ b/arch/x86_64/kapi/memory.cpp
@@ -13,6 +13,7 @@
 #include "arch/memory/region_allocator.hpp"
 
 #include <kstd/print>
+#include <kstd/units>
 
 #include <multiboot2/constants.hpp>
 #include <multiboot2/information.hpp>
@@ -28,6 +29,8 @@
 #include <span>
 #include <utility>
 
+using namespace kstd::units_literals;
+
 namespace kapi::memory
 {
 
@@ -46,7 +49,7 @@ namespace kapi::memory
       }
 
       auto const & mbi = boot::bootstrap_information.mbi;
-      auto mbi_span = std::span{std::bit_cast<std::byte *>(mbi), mbi->size_bytes()};
+      auto mbi_span = std::span{std::bit_cast<std::byte *>(mbi), static_cast<std::size_t>(mbi->size())};
       auto image_span = std::span{&arch::boot::_start_physical, &arch::boot::_end_physical};
 
       return arch::memory::region_allocator::memory_information{
@@ -107,10 +110,10 @@ namespace kapi::memory
     [[maybe_unused]] auto remap_multiboot_information(page_mapper & mapper) -> void
     {
       auto mbi_base = std::bit_cast<std::uintptr_t>(boot::bootstrap_information.mbi);
-      auto mbi_size = boot::bootstrap_information.mbi->size_bytes();
+      auto mbi_size = boot::bootstrap_information.mbi->size();
       auto mbi_physical_start = physical_address{mbi_base & ~std::bit_cast<std::uintptr_t>(&arch::boot::TEACHOS_VMA)};
       auto mbi_virtual_start = linear_address{mbi_base};
-      auto mbi_block_count = (mbi_size + frame::size - 1) / frame::size;
+      auto mbi_block_count = (mbi_size + frame::size - 1_B) / frame::size;
 
       for (auto i = 0uz; i < mbi_block_count; ++i)
       {
@@ -126,8 +129,8 @@ namespace kapi::memory
         auto module_physical_start = physical_address{module.start_address};
         auto module_virtual_start =
             linear_address{module.start_address + std::bit_cast<std::uintptr_t>(&arch::boot::TEACHOS_VMA)};
-        auto module_size = module.end_address - module.start_address;
-        auto module_block_count = (module_size + frame::size - 1) / frame::size;
+        auto module_size = static_cast<kstd::units::bytes>(module.end_address - module.start_address);
+        auto module_block_count = (module_size + frame::size - 1_B) / frame::size;
 
         for (auto i = 0uz; i < module_block_count; ++i)
         {
@@ -147,7 +150,7 @@ namespace kapi::memory
                                  }))
       {
         auto start = frame::containing(physical_address{region.base});
-        auto count = region.size_in_B / page::size;
+        auto count = kstd::units::bytes{region.size_in_B} / page::size;
         new_allocator.release_many({start, count});
       }
 
@@ -167,7 +170,7 @@ namespace kapi::memory
                             [&](auto frame) { new_allocator.mark_used(frame); });
 
       auto mbi_base = std::bit_cast<std::uintptr_t>(boot::bootstrap_information.mbi);
-      auto mbi_size = boot::bootstrap_information.mbi->size_bytes();
+      auto mbi_size = boot::bootstrap_information.mbi->size();
       auto mbi_address = physical_address{mbi_base & ~std::bit_cast<std::uintptr_t>(&arch::boot::TEACHOS_VMA)};
       auto mbi_start = frame::containing(mbi_address);
       auto mbi_end = frame::containing(mbi_address + mbi_size) + 1;