diff --git a/kernel/include/kernel/BootInfo.h b/kernel/include/kernel/BootInfo.h index 2d6c8e19..60e517a6 100644 --- a/kernel/include/kernel/BootInfo.h +++ b/kernel/include/kernel/BootInfo.h @@ -44,7 +44,7 @@ namespace Kernel struct BootModule { paddr_t start; - size_t size; + uint64_t size; }; struct BootInfo diff --git a/kernel/include/kernel/Memory/PhysicalRange.h b/kernel/include/kernel/Memory/PhysicalRange.h index 5dd14911..1d0a0484 100644 --- a/kernel/include/kernel/Memory/PhysicalRange.h +++ b/kernel/include/kernel/Memory/PhysicalRange.h @@ -10,7 +10,7 @@ namespace Kernel class PhysicalRange { public: - PhysicalRange(paddr_t, size_t); + PhysicalRange(paddr_t, uint64_t); paddr_t reserve_page(); void release_page(paddr_t); diff --git a/kernel/kernel/Memory/Heap.cpp b/kernel/kernel/Memory/Heap.cpp index 191b84ba..980e9847 100644 --- a/kernel/kernel/Memory/Heap.cpp +++ b/kernel/kernel/Memory/Heap.cpp @@ -12,7 +12,7 @@ namespace Kernel struct ReservedRegion { paddr_t paddr; - size_t size; + uint64_t size; }; static BAN::Vector get_reserved_regions() @@ -138,10 +138,10 @@ namespace Kernel MUST(m_physical_ranges.emplace_back(e_start, e_end - e_start)); } - size_t total_kibi_bytes = 0; + uint64_t total_kibi_bytes = 0; for (auto& range : m_physical_ranges) { - const size_t kibi_bytes = range.usable_memory() / 1024; + const uint64_t kibi_bytes = range.usable_memory() / 1024; dprintln("RAM {8H}->{8H} ({}.{3} MiB)", range.start(), range.end(), kibi_bytes / 1024, kibi_bytes % 1024); total_kibi_bytes += kibi_bytes; } @@ -152,7 +152,7 @@ namespace Kernel { const auto modules = BAN::move(g_boot_info.modules); - size_t kibi_bytes = 0; + uint64_t kibi_bytes = 0; for (const auto& module : modules) { vaddr_t start = module.start; diff --git a/kernel/kernel/Memory/PhysicalRange.cpp b/kernel/kernel/Memory/PhysicalRange.cpp index 38f6a12c..9c763c39 100644 --- a/kernel/kernel/Memory/PhysicalRange.cpp +++ b/kernel/kernel/Memory/PhysicalRange.cpp @@ -10,7 +10,7 @@ namespace Kernel static constexpr size_t bits_per_page = PAGE_SIZE * 8; - PhysicalRange::PhysicalRange(paddr_t paddr, size_t size) + PhysicalRange::PhysicalRange(paddr_t paddr, uint64_t size) : m_paddr(paddr) , m_page_count(size / PAGE_SIZE) , m_free_pages(m_page_count)