kernel/tests: clean up implementation structure

1 files changed, 14 insertions, 11 deletions

diff --git a/kernel/src/test_support/kapi/memory.cpp b/kernel/src/test_support/kapi/memory.cpp
index f244b7f..e926ba6 100644
--- a/kernel/src/test_support/kapi/memory.cpp
+++ b/kernel/src/test_support/kapi/memory.cpp
@@ -12,8 +12,10 @@
 namespace
 {
   //! The size of the simulated RAM.
-  constexpr auto memory_size = kstd::units::MiB(32);
-  constexpr auto number_of_frames = memory_size / kapi::memory::frame::size;
+  constexpr auto physical_size = kstd::units::MiB(32);
+  constexpr auto virtual_size = kstd::units::GiB(1);
+
+  constexpr auto number_of_frames = physical_size / kapi::memory::frame::size;
 
   auto constinit bump_allocator = std::optional<kernel::tests::bump_frame_allocator>{};
   auto constinit test_mapper = std::optional<kernel::tests::page_mapper>{};
@@ -36,15 +38,19 @@ namespace kapi::memory
   auto init() -> void
   {
     bump_allocator.emplace();
-    test_mapper.emplace(memory_size);
+    test_mapper.emplace(physical_size, virtual_size);
 
     old_allocator = set_frame_allocator(*bump_allocator);
     old_mapper = set_page_mapper(*test_mapper);
 
-    init_pmm(memory_size / frame::size, handoff_to_kernel_pmm);
+    init_pmm(physical_size / frame::size, handoff_to_kernel_pmm);
   }
+}  // namespace kapi::memory
+
+namespace kernel::tests::memory
+{
 
-  auto reset() -> void
+  auto deinit() -> void
   {
     if (old_allocator && *old_allocator)
     {
@@ -60,12 +66,9 @@ namespace kapi::memory
     test_mapper.reset();
   }
 
-}  // namespace kapi::memory
-
-namespace kernel::tests::memory
-{
-  auto heap_base() -> kapi::memory::linear_address
+  auto virtual_base() -> kapi::memory::linear_address
   {
-    return test_mapper->memory.heap_base();
+    return test_mapper->memory.virtual_base();
   }
+
 }  // namespace kernel::tests::memory
\ No newline at end of file