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

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/solaris/assert-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c

@@ -42 +42 @@
 #include <iprt/string.h>
 
-
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-/** The last assert message, 1st part. */
-RTDATADECL(char)                    g_szRTAssertMsg1[1024];
-/** The last assert message, 2nd part. */
-RTDATADECL(char)                    g_szRTAssertMsg2[2048];
-/** The last assert message, expression. */
-RTDATADECL(const char * volatile)   g_pszRTAssertExpr;
-/** The last assert message, file name. */
-RTDATADECL(const char * volatile)   g_pszRTAssertFile;
-/** The last assert message, line number. */
-RTDATADECL(uint32_t volatile)       g_u32RTAssertLine;
-/** The last assert message, function name. */
-RTDATADECL(const char * volatile)   g_pszRTAssertFunction;
+#include "internal/assert.h"
 
 
-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
-
     uprintf("\r\n!!Assertion Failed!!\r\n"
             "Expression: %s\r\n"
             "Location  : %s(%d) %s\r\n",
             pszExpr, pszFile, uLine, pszFunction);
-
-    RTStrPrintf(g_szRTAssertMsg1, sizeof(g_szRTAssertMsg1),
-                "\n!!Assertion Failed!!\n"
-                "Expression: %s\n"
-                "Location  : %s(%d) %s\n",
-                pszExpr, pszFile, uLine, pszFunction);
-    ASMAtomicUoWritePtr((void * volatile *)&g_pszRTAssertExpr, (void *)pszExpr);
-    ASMAtomicUoWritePtr((void * volatile *)&g_pszRTAssertFile, (void *)pszFile);
-    ASMAtomicUoWritePtr((void * volatile *)&g_pszRTAssertFunction, (void *)pszFunction);
-    ASMAtomicUoWriteU32(&g_u32RTAssertLine, uLine);
 }
 
 
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
+void rtR0AssertNativeMsg2V(const char *pszFormat, va_list va)
 {
     va_list va;
     char    szMsg[256];
-
-#ifdef IN_GUEST_R0
-    va_start(va, pszFormat);
-    RTLogBackdoorPrintfV(pszFormat, va);
-    va_end(va);
-#endif
 
     va_start(va, pszFormat);
@@ -103 +64 @@
     va_end(va);
     uprintf("%s", szMsg);
-
-    va_start(va, pszFormat);
-    RTStrPrintfV(g_szRTAssertMsg2, sizeof(g_szRTAssertMsg2), pszFormat, va);
-    va_end(va);
 }