Changeset 25528 in vbox for trunk/src/VBox/Runtime/r0drv/os2

Timestamp:

Dec 20, 2009 11:24:59 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56201

Message:

IPRT,SUPDrv,++: AssertMsg[12] -> AssertMsg1Weak, AssertMsg1, AssertMsg2Weak, AssertMsg2, AssertMsg2WeakV and AssertMsg2V. Doing more of the assertion machinery in common/misc/assert.cpp to avoid code duplication (ring-0). Major SUPDrv version bump.

File:

• trunk/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp

@@ -40 +40 @@
 #include <VBox/log.h>
 
+#include "internal/assert.h"
+
 
 /*******************************************************************************
@@ -49 +51 @@
 extern size_t g_cchRTAssertMsg;
 
+
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -55 +58 @@
 
 
-/**
- * The 1st part of an assert message.
- *
- * @param   pszExpr     Expression. Can be NULL.
- * @param   uLine       Location line number.
- * @param   pszFile     Location file name.
- * @param   pszFunction Location function name.
- * @remark  This API exists in HC Ring-3 and GC.
- */
-RTDECL(void)    AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
+void rtR0AssertNativeMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
-#ifdef IN_GUEST_R0
-    RTLogBackdoorPrintf("\n!!Assertion Failed!!\n"
-                        "Expression: %s\n"
-                        "Location  : %s(%d) %s\n",
-                        pszExpr, pszFile, uLine, pszFunction);
-#endif
-
 #if defined(DEBUG_bird)
     RTLogComPrintf("\n!!Assertion Failed!!\n"
@@ -88 +75 @@
 
 
-/**
- * The 2nd (optional) part of an assert message.
- *
- * @param   pszFormat   Printf like format string.
- * @param   ...         Arguments to that string.
- * @remark  This API exists in HC Ring-3 and GC.
- */
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
+void rtR0AssertNativeMsg2V(const char *pszFormat, va_list va)
 {
-    va_list va;
-
-#ifdef IN_GUEST_R0
-    va_start(va, pszFormat);
-    RTLogBackdoorPrintfV(pszFormat, va);
-    va_end(va);
-#endif
-
 #if defined(DEBUG_bird)
-    va_start(va, pszFormat);
-    RTLogComPrintfV(pszFormat, va);
-    va_end(va);
+    va_list vaCopy;
+    va_copy(vaCopy, va);
+    RTLogComPrintfV(pszFormat, vaCopy);
+    va_end(vaCopy);
 #endif