Merge branch 'fmorgner/abort' into 'feat_memory_manager'

Implement support for `std::terminate` via `::abort`

See merge request teachos/kernel!2

1 files changed, 4 insertions, 12 deletions

diff --git a/arch/x86_64/src/exception_handling/assert.cpp b/arch/x86_64/src/exception_handling/assert.cpp
index b55da49..86696f8 100644
--- a/arch/x86_64/src/exception_handling/assert.cpp
+++ b/arch/x86_64/src/exception_handling/assert.cpp
@@ -1,4 +1,6 @@
-#include "arch/video/vga/text.hpp"
+#include "arch/exception_handling/assert.hpp"
+
+#include "arch/exception_handling/panic.hpp"
 
 namespace teachos::arch::exception_handling
 {
@@ -9,16 +11,6 @@ namespace teachos::arch::exception_handling
       return;
     }
 
-    video::vga::text::write("Assert failed: ", video::vga::text::common_attributes::green_on_black);
-    video::vga::text::write(message, video::vga::text::common_attributes::green_on_black);
-    for (;;)
-    {
-      // Trick the compiler into thinking the variable is changes at run time,
-      // to prevent the while loop being optimized away
-      // See
-      // https://stackoverflow.com/questions/9495856/how-to-prevent-g-from-optimizing-out-a-loop-controlled-by-a-variable-that-can
-      // for more information.
-      asm volatile("" : "+g"(condition));
-    }
+    panic("Assertion Violation: ", message);
   }
 }  // namespace teachos::arch::exception_handling
\ No newline at end of file