diff --git a/baremetal/arch/aarch64/dump_regs.c b/baremetal/arch/aarch64/dump_regs.c
index 1f799a6..bff0e68 100644
--- a/baremetal/arch/aarch64/dump_regs.c
+++ b/baremetal/arch/aarch64/dump_regs.c
@@ -6,6 +6,6 @@
 #include <lkmc/aarch64_dump_regs.h>
 
 int main(void) {
-    LKMC_DUMP_SYSTEM_REGS;
+    lkmc_dump_system_regs();
     return 0;
 }
diff --git a/kernel_modules/dump_regs.c b/kernel_modules/dump_regs.c
index c533a33..daa7bdd 100644
--- a/kernel_modules/dump_regs.c
+++ b/kernel_modules/dump_regs.c
@@ -13,7 +13,7 @@
 static int myinit(void)
 {
 #if !defined(LKMC_DO_NOTHING)
-    LKMC_DUMP_SYSTEM_REGS;
+    lkmc_dump_system_regs();
 #endif
 	return 0;
 }
diff --git a/lkmc/aarch64_dump_regs.h b/lkmc/aarch64_dump_regs.h
index 6d210b4..2126ea4 100644
--- a/lkmc/aarch64_dump_regs.h
+++ b/lkmc/aarch64_dump_regs.h
@@ -16,40 +16,46 @@
 #endif
 
 /* Dump registers that are only visible from privileged levels of the system. */
-#define LKMC_DUMP_SYSTEM_REGS \
-    uint32_t sctlr_el1; \
-    __asm__ ("mrs %0, sctlr_el1" : "=r" (sctlr_el1) : :); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1 0x%" PRIX32 "\n", sctlr_el1); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.nTWE 0x%" PRIX32 "\n", (sctlr_el1 >> 18) & 1); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.A 0x%" PRIX32 "\n", (sctlr_el1 >> 1) & 1); \
-    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-paging */ \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.M 0x%" PRIX32 "\n", (sctlr_el1 >> 0) & 1); \
-    \
-    uint64_t id_aa64pfr0_el1; \
-    __asm__ ("mrs %0, id_aa64pfr0_el1" : "=r" (id_aa64pfr0_el1) : :); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64PFR0_EL1 0x%" PRIX64 "\n", id_aa64pfr0_el1); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64PFR0_EL1.SVE 0x%" PRIX64 "\n", (id_aa64pfr0_el1 >> 32) & 0xF); \
-    \
-    uint64_t CurrentEL; \
-    __asm__ ("mrs %0, CurrentEL;" : "=r" (CurrentEL) : :); \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("CurrentEL 0x%" PRIX64 "\n", CurrentEL); \
-    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-exception-levels */ \
-    LKMC_DUMP_SYSTEM_REGS_PRINTF("CurrentEL.EL 0x%" PRIX64 "\n", CurrentEL >> 2); \
-   \
-    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-paging */ \
-    { \
-        uint64_t tcr_el1; \
-        __asm__ ("mrs %0, tcr_el1;" : "=r" (tcr_el1) : :); \
-        LKMC_DUMP_SYSTEM_REGS_PRINTF("TCR_EL1 0x%" PRIX64 "\n", tcr_el1); \
-        LKMC_DUMP_SYSTEM_REGS_PRINTF("TCR_EL1.A1 0x%" PRIX64 "\n", (tcr_el1 >> 22) & 1); \
-        \
-        uint64_t ttbr0_el1; \
-        __asm__ ("mrs %0, ttbr0_el1;" : "=r" (ttbr0_el1) : :); \
-        LKMC_DUMP_SYSTEM_REGS_PRINTF("TTBR0_EL1 0x%" PRIX64 "\n", ttbr0_el1); \
-        \
-        uint64_t ttbr1_el1; \
-        __asm__ ("mrs %0, ttbr1_el1;" : "=r" (ttbr1_el1) : :); \
-        LKMC_DUMP_SYSTEM_REGS_PRINTF("TTBR1_EL1 0x%" PRIX64 "\n", ttbr1_el1); \
+void lkmc_dump_system_regs() {
+    uint32_t sctlr_el1;
+    __asm__ ("mrs %0, sctlr_el1" : "=r" (sctlr_el1) : :);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1 0x%" PRIX32 "\n", sctlr_el1);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.nTWE 0x%" PRIX32 "\n", (sctlr_el1 >> 18) & 1);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.A 0x%" PRIX32 "\n", (sctlr_el1 >> 1) & 1);
+    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-paging */
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("SCTLR_EL1.M 0x%" PRIX32 "\n", (sctlr_el1 >> 0) & 1);
+
+    uint64_t id_aa64isar1_el1;
+    __asm__ ("mrs %0, id_aa64isar1_el1" : "=r" (id_aa64isar1_el1) : :);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64ISAR1_EL1 0x%" PRIX64 "\n", id_aa64isar1_el1);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64ISAR1_EL1.JSCVT 0x%" PRIX64 "\n", (id_aa64isar1_el1 >> 12) & 0xF);
+
+    uint64_t id_aa64pfr0_el1;
+    __asm__ ("mrs %0, id_aa64pfr0_el1" : "=r" (id_aa64pfr0_el1) : :);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64PFR0_EL1 0x%" PRIX64 "\n", id_aa64pfr0_el1);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("ID_AA64PFR0_EL1.SVE 0x%" PRIX64 "\n", (id_aa64pfr0_el1 >> 32) & 0xF);
+
+    uint64_t CurrentEL;
+    __asm__ ("mrs %0, CurrentEL;" : "=r" (CurrentEL) : :);
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("CurrentEL 0x%" PRIX64 "\n", CurrentEL);
+    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-exception-levels */
+    LKMC_DUMP_SYSTEM_REGS_PRINTF("CurrentEL.EL 0x%" PRIX64 "\n", CurrentEL >> 2);
+
+    /* https://cirosantilli.com/linux-kernel-module-cheat#arm-paging */
+    {
+        uint64_t tcr_el1;
+        __asm__ ("mrs %0, tcr_el1;" : "=r" (tcr_el1) : :);
+        LKMC_DUMP_SYSTEM_REGS_PRINTF("TCR_EL1 0x%" PRIX64 "\n", tcr_el1);
+        LKMC_DUMP_SYSTEM_REGS_PRINTF("TCR_EL1.A1 0x%" PRIX64 "\n", (tcr_el1 >> 22) & 1);
+
+        uint64_t ttbr0_el1;
+        __asm__ ("mrs %0, ttbr0_el1;" : "=r" (ttbr0_el1) : :);
+        LKMC_DUMP_SYSTEM_REGS_PRINTF("TTBR0_EL1 0x%" PRIX64 "\n", ttbr0_el1);
+
+        uint64_t ttbr1_el1;
+        __asm__ ("mrs %0, ttbr1_el1;" : "=r" (ttbr1_el1) : :);
+        LKMC_DUMP_SYSTEM_REGS_PRINTF("TTBR1_EL1 0x%" PRIX64 "\n", ttbr1_el1);
     }
+}
 
 #endif