Revert assert with printf functionality, requires malloc 😭

3 files changed, 18 insertions, 11 deletions

diff --git a/arch/x86_64/src/exception_handling/abort.cpp b/arch/x86_64/src/exception_handling/abort.cpp
index 77576b1..e331d34 100644
--- a/arch/x86_64/src/exception_handling/abort.cpp
+++ b/arch/x86_64/src/exception_handling/abort.cpp
@@ -12,5 +12,4 @@ namespace teachos::arch::exception_handling
    * currently implement, @p ::abort gets overridden to simply panic.
    */
   extern "C" auto abort() -> void { panic("Terminate was called, possibly due to an unhandled exception"); }
-
 }  // namespace teachos::arch::exception_handling
diff --git a/arch/x86_64/src/exception_handling/assert.cpp b/arch/x86_64/src/exception_handling/assert.cpp
new file mode 100644
index 0000000..b36f52d
--- /dev/null
+++ b/arch/x86_64/src/exception_handling/assert.cpp
@@ -0,0 +1,13 @@
+#include "arch/exception_handling/assert.hpp"
+
+namespace teachos::arch::exception_handling
+{
+  auto assert(bool condition, char const * message) -> void
+  {
+    if (condition)
+    {
+      return;
+    }
+    panic("Assertion Violation: ", message);
+  }
+}  // namespace teachos::arch::exception_handling
diff --git a/arch/x86_64/src/memory/multiboot/reader.cpp b/arch/x86_64/src/memory/multiboot/reader.cpp
index 4e78a06..545e517 100644
--- a/arch/x86_64/src/memory/multiboot/reader.cpp
+++ b/arch/x86_64/src/memory/multiboot/reader.cpp
@@ -20,8 +20,7 @@ namespace teachos::arch::memory::multiboot
       auto expected_entry_size = mminfo->entry_size;
       constexpr auto actual_entry_size = sizeof(memory_area);
       exception_handling::assert(expected_entry_size == actual_entry_size,
-                                 "[Multiboot Reader] Expected memory area entry size (%u) but got (%u)",
-                                 expected_entry_size, actual_entry_size);
+                                 "[Multiboot Reader] Unexpected memory area entry size");
 
       auto total_size = mminfo->info.size;
       auto total_entries_size = total_size - sizeof(memory_map_header) + actual_entry_size;
@@ -37,16 +36,14 @@ namespace teachos::arch::memory::multiboot
       auto expected_entry_size = symbol->entry_size;
       constexpr auto actual_entry_size = sizeof(elf_section_header);
       exception_handling::assert(expected_entry_size == actual_entry_size,
-                                 "[Multiboot Reader] Expected elf section header entry size (%u) but got (%u)",
-                                 expected_entry_size, actual_entry_size);
+                                 "[Multiboot Reader] Unexpected elf section header entry size");
 
       auto expected_total_size = symbol->info.size;
       auto actual_total_entry_size = actual_entry_size * symbol->number_of_sections;
       constexpr auto actual_total_section_size = sizeof(elf_symbols_section_header) - sizeof(uint32_t);
       auto actual_total_size = actual_total_entry_size + actual_total_section_size;
       exception_handling::assert(expected_total_size == actual_total_size,
-                                 "[Multiboot Reader] Expected elf symbols section header total size (%u) but got (%u)",
-                                 expected_total_size, actual_total_size);
+                                 "[Multiboot Reader] Unexpected elf symbols section header total size");
 
       auto begin = reinterpret_cast<elf_section_header *>(&symbol->end);
       auto end = begin + symbol->number_of_sections;
@@ -87,12 +84,10 @@ namespace teachos::arch::memory::multiboot
 
       exception_handling::assert(
           symbol_table_section_count == 1U,
-          "[Multiboot Reader] ELF Specifications allows only (1) symbol table section, but got (%u)",
-          symbol_table_section_count);
+          "[Multiboot Reader] ELF Specifications allows only (1) symbol table section, but got more");
       exception_handling::assert(
           dynamic_section_count <= 1U,
-          "[Multiboot Reader] ELF Specifications allows only (1) or less dynamic sections, but got (%u)",
-          dynamic_section_count);
+          "[Multiboot Reader] ELF Specifications allows only (1) or less dynamic sections, but got more");
     }
   }  // namespace