diff options
| author | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-20 12:02:20 +0000 |
|---|---|---|
| committer | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-10-20 12:02:20 +0000 |
| commit | da2341ec12128d3b4983a67d39aeaf76b1781fa8 (patch) | |
| tree | eab408f61804267fabb7151edce4410b0f05ddc2 /arch/x86_64/src/exception_handling | |
| parent | 0d42fed17834a21d29032dd2d8e56e11596056bc (diff) | |
| download | teachos-da2341ec12128d3b4983a67d39aeaf76b1781fa8.tar.xz teachos-da2341ec12128d3b4983a67d39aeaf76b1781fa8.zip | |
Add printf like behaviour to assert
Diffstat (limited to 'arch/x86_64/src/exception_handling')
| -rw-r--r-- | arch/x86_64/src/exception_handling/abort.cpp | 3 | ||||
| -rw-r--r-- | arch/x86_64/src/exception_handling/assert.cpp | 16 | ||||
| -rw-r--r-- | arch/x86_64/src/exception_handling/panic.cpp | 3 |
3 files changed, 2 insertions, 20 deletions
diff --git a/arch/x86_64/src/exception_handling/abort.cpp b/arch/x86_64/src/exception_handling/abort.cpp index dc40008..77576b1 100644 --- a/arch/x86_64/src/exception_handling/abort.cpp +++ b/arch/x86_64/src/exception_handling/abort.cpp @@ -4,7 +4,6 @@ namespace teachos::arch::exception_handling { - /** * @brief Override for the newlib abort function. * @@ -14,4 +13,4 @@ namespace teachos::arch::exception_handling */ extern "C" auto abort() -> void { panic("Terminate was called, possibly due to an unhandled exception"); } -} // namespace teachos::arch::exception_handling
\ No newline at end of file +} // 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 deleted file mode 100644 index 86696f8..0000000 --- a/arch/x86_64/src/exception_handling/assert.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "arch/exception_handling/assert.hpp" - -#include "arch/exception_handling/panic.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
\ No newline at end of file diff --git a/arch/x86_64/src/exception_handling/panic.cpp b/arch/x86_64/src/exception_handling/panic.cpp index 56edfd5..8e3802a 100644 --- a/arch/x86_64/src/exception_handling/panic.cpp +++ b/arch/x86_64/src/exception_handling/panic.cpp @@ -5,7 +5,6 @@ namespace teachos::arch::exception_handling { - extern "C" char const message_prefix_panic[]; auto panic(char const * reason) -> void { panic(message_prefix_panic, reason); } @@ -20,4 +19,4 @@ namespace teachos::arch::exception_handling kernel::halt(); }; -} // namespace teachos::arch::exception_handling
\ No newline at end of file +} // namespace teachos::arch::exception_handling |
