From 419f4bebff5745b46bf30092dc7a7ca43449ea2e Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 1 Apr 2026 11:12:20 +0200
Subject: kernel/tests: implement basic simulated memory

---
 kernel/kapi/memory.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'kernel/kapi')

diff --git a/kernel/kapi/memory.cpp b/kernel/kapi/memory.cpp
index 2803d76..06a3165 100644
--- a/kernel/kapi/memory.cpp
+++ b/kernel/kapi/memory.cpp
@@ -125,14 +125,18 @@ namespace kapi::memory
     }
 
     auto const flags = page_mapper::flags::writable | page_mapper::flags::supervisor_only | page_mapper::flags::global;
+    auto bitmap_ptr = static_cast<std::uint64_t *>(nullptr);
 
     std::ranges::for_each(std::views::iota(0uz, bitmap_pages), [&](auto index) {
       auto page = page::containing(pmm_metadata_base + index * page::size);
       auto frame = memory::frame(bitmap_frames->first.number() + index);
-      active_page_mapper->map(page, frame, flags);
+      auto mapped = active_page_mapper->map(page, frame, flags);
+      if (!bitmap_ptr)
+      {
+        bitmap_ptr = reinterpret_cast<std::uint64_t *>(mapped);
+      }
     });
 
-    auto bitmap_ptr = static_cast<std::uint64_t *>(pmm_metadata_base);
     auto bitmap =
         std::span{bitmap_ptr, (bitmap_bytes + kstd::type_size<std::uint64_t> - 1_B) / kstd::type_size<std::uint64_t>};
 
-- 
cgit v1.2.3


From 1f652b8b5ca5dbea588975466801cb1479f3dda8 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 1 Apr 2026 12:15:25 +0200
Subject: kernel/tests: dissolve tests into source tree

---
 kernel/kapi/cpu.tests.cpp    | 19 +++++++++++++++++++
 kernel/kapi/system.tests.cpp | 30 ++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 kernel/kapi/cpu.tests.cpp
 create mode 100644 kernel/kapi/system.tests.cpp

(limited to 'kernel/kapi')

diff --git a/kernel/kapi/cpu.tests.cpp b/kernel/kapi/cpu.tests.cpp
new file mode 100644
index 0000000..6fe026b
--- /dev/null
+++ b/kernel/kapi/cpu.tests.cpp
@@ -0,0 +1,19 @@
+#include "kapi/cpu.hpp"
+
+#include "kernel/tests/cpu.hpp"
+
+#include <catch2/catch_test_macros.hpp>
+
+SCENARIO("Kernel testing kapi::cpu shims", "[support]")
+{
+  GIVEN("the test support infrastructure is initialized")
+  {
+    WHEN("a CPU halt is requested")
+    {
+      THEN("the correct exception is thrown")
+      {
+        REQUIRE_THROWS_AS(kapi::cpu::halt(), kernel::tests::cpu::halt);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/kernel/kapi/system.tests.cpp b/kernel/kapi/system.tests.cpp
new file mode 100644
index 0000000..c130b54
--- /dev/null
+++ b/kernel/kapi/system.tests.cpp
@@ -0,0 +1,30 @@
+#include "kapi/system.hpp"
+
+#include "kernel/tests/cpu.hpp"
+#include "kernel/tests/log_buffer.hpp"
+
+#include <kstd/print>
+
+#include <catch2/catch_test_macros.hpp>
+
+SCENARIO("Kernel testing kapi::system shims", "[support]")
+{
+  GIVEN("the test support infrastructure is initialized")
+  {
+    WHEN("a the system panics")
+    {
+      kernel::tests::log_buffer::clear();
+
+      THEN("the correct exception is thrown")
+      {
+        REQUIRE_THROWS_AS(kapi::system::panic("[kernel:tests] Test Panic"), kernel::tests::cpu::halt);
+      }
+
+      THEN("the message is appended to the log buffer")
+      {
+        CHECK_THROWS(kapi::system::panic("[kernel:tests] Test Panic"));
+        REQUIRE(kernel::tests::log_buffer::flat_messages().contains("[kernel:tests] Test Panic"));
+      }
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 825d8bafef152a52cd76851764913fb12cdc685d Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 1 Apr 2026 17:29:25 +0200
Subject: kernel/test: rename test include to test_support

---
 kernel/kapi/cpu.tests.cpp    | 2 +-
 kernel/kapi/system.tests.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kernel/kapi')

diff --git a/kernel/kapi/cpu.tests.cpp b/kernel/kapi/cpu.tests.cpp
index 6fe026b..85b20fd 100644
--- a/kernel/kapi/cpu.tests.cpp
+++ b/kernel/kapi/cpu.tests.cpp
@@ -1,6 +1,6 @@
 #include "kapi/cpu.hpp"
 
-#include "kernel/tests/cpu.hpp"
+#include "kernel/test_support/cpu.hpp"
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/kernel/kapi/system.tests.cpp b/kernel/kapi/system.tests.cpp
index c130b54..ee31c51 100644
--- a/kernel/kapi/system.tests.cpp
+++ b/kernel/kapi/system.tests.cpp
@@ -1,7 +1,7 @@
 #include "kapi/system.hpp"
 
-#include "kernel/tests/cpu.hpp"
-#include "kernel/tests/log_buffer.hpp"
+#include "kernel/test_support/cpu.hpp"
+#include "kernel/test_support/log_buffer.hpp"
 
 #include <kstd/print>
 
-- 
cgit v1.2.3