Add printf like behaviour to assert

1 files changed, 18 insertions, 6 deletions

diff --git a/arch/x86_64/src/memory/multiboot/reader.cpp b/arch/x86_64/src/memory/multiboot/reader.cpp
index 565f604..4e78a06 100644
--- a/arch/x86_64/src/memory/multiboot/reader.cpp
+++ b/arch/x86_64/src/memory/multiboot/reader.cpp
@@ -19,7 +19,9 @@ 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, "Unexpected memory_area entry size");
+      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);
 
       auto total_size = mminfo->info.size;
       auto total_entries_size = total_size - sizeof(memory_map_header) + actual_entry_size;
@@ -34,18 +36,22 @@ 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, "Unexpected elf_section_header entry size");
+      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);
 
       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,
-                                 "Unexpected elf_symbols_section_header total size");
+                                 "[Multiboot Reader] Expected elf symbols section header total size (%u) but got (%u)",
+                                 expected_total_size, actual_total_size);
 
       auto begin = reinterpret_cast<elf_section_header *>(&symbol->end);
       auto end = begin + symbol->number_of_sections;
-      exception_handling::assert(begin->is_null(), "Missing elf_section_header begin");
+      exception_handling::assert(begin->is_null(),
+                                 "[Multiboot Reader] Elf symbols section not starting with SHT_NULL section");
 
       std::size_t symbol_table_section_count = 0U;
       std::size_t dynamic_section_count = 0U;
@@ -79,8 +85,14 @@ namespace teachos::arch::memory::multiboot
         }
       }
 
-      exception_handling::assert(symbol_table_section_count == 1U, "Unexpected symbol_table_count value");
-      exception_handling::assert(dynamic_section_count <= 1U, "Unexpected dynamic_section_count value");
+      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);
+      exception_handling::assert(
+          dynamic_section_count <= 1U,
+          "[Multiboot Reader] ELF Specifications allows only (1) or less dynamic sections, but got (%u)",
+          dynamic_section_count);
     }
   }  // namespace