Changeset 41305 in vbox for trunk/src/VBox/Runtime/common/log/log.cpp

Timestamp:

May 15, 2012 11:48:39 AM (13 years ago)

Author:

vboxsync

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

77975

Message:

Runtime/common/log/log: gcc thinks that the address of a variable is always != NULL but this is not true for g_Logger (special case in our RC module loader)

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -2113 +2113 @@
     {
 #ifdef IN_RC
-        pLogger = &g_Logger;
+        /*
+         * XXX gcc assumes that the address of a variable is always > 0 but this
+         * is not always true for g_Logger (special case in our RC loader)
+         */
+        PRTLOGGER pLogger1 = &g_Logger;
+        pLogger = ASMAtomicReadPtrT(&pLogger, PRTLOGGER);
 #else
         pLogger = g_pLogger;
@@ -2159 +2164 @@
 {
 #ifdef IN_RC
-    return &g_Logger;
+    /*
+     * XXX gcc assumes that the address of a variable is always > 0 but this
+     * is not always true for g_Logger (special case in our RC loader)
+     */
+    PRTLOGGER pLogger = &g_Logger;
+    return ASMAtomicReadPtrT(&pLogger, PRTLOGGER);
 
 #else /* !IN_RC */
@@ -2196 +2206 @@
 {
 #ifdef IN_RC
-    return &g_Logger;
+    /*
+     * XXX gcc assumes that the address of a variable is always > 0 but this
+     * is not always true for g_Logger (special case in our RC loader)
+     */
+    PRTLOGGER pLogger = &g_Logger;
+    return ASMAtomicReadPtrT(&pLogger, PRTLOGGER);
 #else
 # ifdef IN_RING0