Changeset 22556 in vbox for trunk/src

Timestamp:

Aug 28, 2009 4:20:45 PM (16 years ago)

Author:

vboxsync

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

51583

Message:

RTLogWriteDebugger-r0drv-solaris.c: Don't call cmn_err if interrupts are disabled and spl*() are known to trash (set) EFLAGS::IF. Removed duplicate RTLogWriteDebugger-r0drv-solaris.c file in vbi.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c (modified) (2 diffs)
• r0drv/solaris/initterm-r0drv-solaris.c (modified) (1 diff)
• r0drv/solaris/the-solaris-kernel.h (modified) (1 diff)
• r0drv/solaris/vbi/RTLogWriteDebugger-r0drv-solaris.c (deleted)
• r0drv/solaris/vbi/the-solaris-kernel.h (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1411 +1411 @@
         r0drv/mpnotification-r0drv.c \
         r0drv/powernotification-r0drv.c \
+        r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c \
         r0drv/solaris/assert-r0drv-solaris.c \
         r0drv/solaris/initterm-r0drv-solaris.c \
@@ -1427 +1428 @@
         r0drv/solaris/vbi/mp-r0drv-solaris.c \
         r0drv/solaris/vbi/process-r0drv-solaris.c \
-        r0drv/solaris/vbi/RTLogWriteDebugger-r0drv-solaris.c \
         r0drv/solaris/vbi/thread-r0drv-solaris.c \
         r0drv/solaris/vbi/thread2-r0drv-solaris.c \
@@ -1438 +1438 @@
         r0drv/solaris/memobj-r0drv-solaris.c \
         r0drv/solaris/process-r0drv-solaris.c \
-        r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c \
         r0drv/solaris/thread-r0drv-solaris.c \
         r0drv/solaris/thread2-r0drv-solaris.c \

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

@@ -37 +37 @@
 #include <iprt/log.h>
 
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 
@@ -45 +46 @@
     if (pch[cb] != '\0')
         AssertBreakpoint();
-    cmn_err(CE_CONT, pch);
+    if (    !g_frtSolarisSplSetsEIF
+        ||  ASMIntAreEnabled())
+        cmn_err(CE_CONT, pch);
     return;
 }

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

@@ -37 +37 @@
 
 #include <iprt/err.h>
+#include <iprt/asm.h>
 #include "internal/initterm.h"
 
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+/** Indicates that the spl routines (and therefore a bunch of other ones too)
+ * will set EFLAGS::IF and break code that disables interrupts.  */
+bool g_frtSolarisSplSetsEIF = false;
 
 
 int rtR0InitNative(void)
 {
+    /*
+     * Detech whether spl*() is preserving the interrupt flag or not.
+     * This is a problem on S10.
+     */
+    RTCCUINTREG uOldFlags = ASMIntDisableFlags();
+    int iOld = splr(DISP_LEVEL);
+    if (ASMIntAreEnabled())
+        g_frtSolarisSplSetsEIF = true;
+    splx(iOld);
+    if (ASMIntAreEnabled())
+        g_frtSolarisSplSetsEIF = true;
+    ASMSetFlags(uOldFlags);
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

@@ -64 +64 @@
 
 RT_C_DECLS_BEGIN
-extern struct ddi_dma_attr g_SolarisX86PhysMemLimits;
+extern bool                 g_frtSolarisSplSetsEIF;
+extern struct ddi_dma_attr  g_SolarisX86PhysMemLimits;
 extern uintptr_t kernelbase;
 RT_C_DECLS_END

trunk/src/VBox/Runtime/r0drv/solaris/vbi/the-solaris-kernel.h

@@ -58 +58 @@
 #include <iprt/cdefs.h>
 
+RT_C_DECLS_BEGIN
+extern bool                 g_frtSolarisSplSetsEIF;
+RT_C_DECLS_END
+
 #endif