Allow overriding doAssert

Author: Kronos3

Fw/Types/Assert.cpp

@@ -2,7 +2,6 @@
 #include <Fw/Types/Assert.hpp>
 #include <Fw/Types/StringUtils.hpp>
 #include <Fw/Types/assert_hook.hpp>
-#include <cassert>
 #include <cstdio>
 #include <cstdlib>
 
@@ -29,7 +28,7 @@ void AssertHook::reportAssert(FILE_NAME_ARG file,
 }
 
 void AssertHook::doAssert() {
-    assert(0);
+    defaultDoAssert();
 }
 
 AssertHook* AssertHook::s_assertHook = nullptr;
@@ -63,7 +62,7 @@ FW_ASSERT_NORETURN void defaultSwAssert(FILE_NAME_ARG file,
         defaultReportAssert(file, lineNo, numArgs, arg1, arg2, arg3, arg4, arg5, arg6, assertMsg,
                             static_cast<FwSizeType>(sizeof(assertMsg)));
         defaultPrintAssert(assertMsg);
-        assert(0);
+        defaultDoAssert();
     } else {
         registeredHook->reportAssert(file, lineNo, numArgs, arg1, arg2, arg3, arg4, arg5, arg6);
         registeredHook->doAssert();

Fw/Types/assert_hook.hpp

@@ -20,11 +20,16 @@
 
 namespace Fw {
 
+//! \brief handles an assertion
+//!
+//! Handle an assertion failure or FATAL. This function is called after the defaultPrintAssert has
+//! been called. The default implementation calls `assert(0)`.
+[[noreturn]] void defaultDoAssert();
+
 //! \brief print an assert message
 //!
 //! Print a pre-formatted assert message. This function is called after the assert message has been formatted
-//! by defaultReportAssert. The default implementation uses fputs to write to stderr, but this can be overridden
-//! at compile time to provide custom behavior for deeply embedded systems.
+//! by defaultReportAssert. The default implementation uses fputs to write to stderr.
 //!
 //! \param msg: null-terminated string containing the formatted assert message
 void defaultPrintAssert(const CHAR* msg);

Fw/Types/fputs_assert_hook.cpp

@@ -5,14 +5,21 @@
 // ======================================================================
 #include <Fw/Types/assert_hook.hpp>
 #include <Fw/Types/format.hpp>
+#include <cassert>
 #include <cstdio>
+#include <cstdlib>
 
 #if FW_ASSERT_LEVEL == FW_FILEID_ASSERT
 #define fileIdFs "Assert: 0x%08" PRIx32 ":%" PRI_FwSizeType ""
 #else
 #define fileIdFs "Assert: \"%s:%" PRI_FwSizeType "\""
 #endif
 
+void Fw::defaultDoAssert() {
+    assert(0);
+    abort();
+}
+
 void Fw::defaultPrintAssert(const CHAR* msg) {
     // Write to stderr w/o formatting
     (void)fputs(msg, stderr);