[arch][mmu][test] change the arch mmu test file to c++

This lets us more easily use some C++ for test cleanup.
Updated the arch mmu flags to be explicitly unsigned to make C++
happier.

3 files changed, 34 insertions, 19 deletions

diff --git a/arch/include/arch/mmu.h b/arch/include/arch/mmu.h
index 34d5c3d0..ed80fc38 100644
--- a/arch/include/arch/mmu.h
+++ b/arch/include/arch/mmu.h
@@ -18,21 +18,21 @@
 
 __BEGIN_CDECLS
 
-#define ARCH_MMU_FLAG_CACHED            (0<<0)
-#define ARCH_MMU_FLAG_UNCACHED          (1<<0)
-#define ARCH_MMU_FLAG_UNCACHED_DEVICE   (2<<0) /* only exists on some arches, otherwise UNCACHED */
-#define ARCH_MMU_FLAG_CACHE_MASK        (3<<0)
+#define ARCH_MMU_FLAG_CACHED            (0U<<0)
+#define ARCH_MMU_FLAG_UNCACHED          (1U<<0)
+#define ARCH_MMU_FLAG_UNCACHED_DEVICE   (2U<<0) /* only exists on some arches, otherwise UNCACHED */
+#define ARCH_MMU_FLAG_CACHE_MASK        (3U<<0)
 
-#define ARCH_MMU_FLAG_PERM_USER         (1<<2)
-#define ARCH_MMU_FLAG_PERM_RO           (1<<3)
-#define ARCH_MMU_FLAG_PERM_NO_EXECUTE   (1<<4)
-#define ARCH_MMU_FLAG_NS                (1<<5) /* NON-SECURE */
-#define ARCH_MMU_FLAG_INVALID           (1<<7) /* indicates that flags are not specified */
+#define ARCH_MMU_FLAG_PERM_USER         (1U<<2)
+#define ARCH_MMU_FLAG_PERM_RO           (1U<<3)
+#define ARCH_MMU_FLAG_PERM_NO_EXECUTE   (1U<<4)
+#define ARCH_MMU_FLAG_NS                (1U<<5) /* NON-SECURE */
+#define ARCH_MMU_FLAG_INVALID           (1U<<7) /* indicates that flags are not specified */
 
 /* forward declare the per-address space arch-specific context object */
 typedef struct arch_aspace arch_aspace_t;
 
-#define ARCH_ASPACE_FLAG_KERNEL         (1<<0)
+#define ARCH_ASPACE_FLAG_KERNEL         (1U<<0)
 
 /* initialize per address space */
 status_t arch_mmu_init_aspace(arch_aspace_t *aspace, vaddr_t base, size_t size, uint flags) __NONNULL((1));
diff --git a/arch/test/mmu.c b/arch/test/mmu.cpp
index 7294e024..4ae65ca0 100644
--- a/arch/test/mmu.c
+++ b/arch/test/mmu.cpp
@@ -9,6 +9,7 @@
 
 #include <arch/mmu.h>
 
+#include <lk/cpp.h>
 #include <lk/err.h>
 #include <lib/unittest.h>
 #include <kernel/vm.h>
@@ -33,11 +34,15 @@ static bool map_user_pages(void) {
     status_t err = arch_mmu_init_aspace(&as, USER_ASPACE_BASE, USER_ASPACE_SIZE, 0);
     ASSERT_EQ(NO_ERROR, err, "init");
 
+    auto aspace_cleanup = lk::make_auto_call([&]() { arch_mmu_destroy_aspace(&as); });
+
     // allocate a batch of pages
     struct list_node pages = LIST_INITIAL_VALUE(pages);
     size_t count = pmm_alloc_pages(4, &pages);
-    ASSERT_EQ(4, count, "alloc pages");
-    ASSERT_EQ(4, list_length(&pages), "page list");
+    ASSERT_EQ(4U, count, "alloc pages");
+    ASSERT_EQ(4U, list_length(&pages), "page list");
+
+    auto pages_cleanup = lk::make_auto_call([&]() { pmm_free(&pages); });
 
     // map the pages into the address space
     vaddr_t va = USER_ASPACE_BASE;
@@ -63,9 +68,12 @@ static bool map_user_pages(void) {
     }
 
     // destroy the aspace with the pages mapped
+    aspace_cleanup.cancel();
     err = arch_mmu_destroy_aspace(&as);
     EXPECT_EQ(NO_ERROR, err, "destroy");
 
+    // free the pages we allocated before
+    pages_cleanup.cancel();
     size_t freed = pmm_free(&pages);
     ASSERT_EQ(count, freed, "free");
 
@@ -85,7 +93,7 @@ static bool map_region_query_result(vmm_aspace_t *aspace, uint arch_flags) {
         paddr_t pa;
         uint flags;
         EXPECT_EQ(NO_ERROR, arch_mmu_query(&aspace->arch_aspace, (vaddr_t)ptr, &pa, &flags), "arch_query");
-        EXPECT_NE(0, pa, "valid pa");
+        EXPECT_NE(0U, pa, "valid pa");
         EXPECT_EQ(arch_flags, flags, "query flags");
     }
 
@@ -121,24 +129,27 @@ static bool context_switch(void) {
     arch_aspace_t as;
     status_t err = arch_mmu_init_aspace(&as, USER_ASPACE_BASE, USER_ASPACE_SIZE, 0);
     ASSERT_EQ(NO_ERROR, err, "init");
+    auto aspace_cleanup = lk::make_auto_call([&]() { arch_mmu_destroy_aspace(&as); });
 
     // switch to the address space
     arch_mmu_context_switch(&as);
+    auto cleanup_switch = lk::make_auto_call([&]() { arch_mmu_context_switch(NULL); });
 
     // map a page, verify can be read through the page
     vm_page_t *p = pmm_alloc_page();
     ASSERT_NONNULL(p, "page");
+    auto page_cleanup = lk::make_auto_call([&]() { pmm_free_page(p); });
 
     // map it
     err = arch_mmu_map(&as, USER_ASPACE_BASE, vm_page_to_paddr(p), 1, ARCH_MMU_FLAG_PERM_USER);
-    EXPECT_EQ(NO_ERROR, err, "map");
+    ASSERT_EQ(NO_ERROR, err, "map");
 
     // write a known value to the kvaddr portion of the page
-    volatile int *kv = paddr_to_kvaddr(vm_page_to_paddr(p));
+    volatile int *kv = static_cast<volatile int *>(paddr_to_kvaddr(vm_page_to_paddr(p)));
     *kv = 99;
 
     // read the data back from the page
-    volatile int *ptr = (void *)USER_ASPACE_BASE;
+    volatile int *ptr = reinterpret_cast<volatile int *>(USER_ASPACE_BASE);
     volatile int foo = *ptr;
 
     EXPECT_EQ(99, foo, "readback");
@@ -152,15 +163,18 @@ static bool context_switch(void) {
     EXPECT_EQ(0x55, foo, "readback 3");
 
     // switch back to kernel aspace
+    cleanup_switch.cancel();
     arch_mmu_context_switch(NULL);
 
     // destroy it
+    aspace_cleanup.cancel();
     err = arch_mmu_destroy_aspace(&as);
     EXPECT_EQ(NO_ERROR, err, "destroy");
 
     // free the page
+    page_cleanup.cancel();
     size_t c = pmm_free_page(p);
-    ASSERT_EQ(1, c, "free");
+    EXPECT_EQ(1U, c, "free");
 
     END_TEST;
 }
diff --git a/arch/test/rules.mk b/arch/test/rules.mk
index 2e9adddc..802e1793 100644
--- a/arch/test/rules.mk
+++ b/arch/test/rules.mk
@@ -2,9 +2,10 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
 
 MODULE := $(LOCAL_DIR)
 
-MODULE_SRCS := $(LOCAL_DIR)/mmu.c
+MODULE_SRCS := $(LOCAL_DIR)/mmu.cpp
 
-MODULE_DEPS := lib/unittest
+MODULE_DEPS := lib/libcpp
+MODULE_DEPS += lib/unittest
 
 include make/module.mk