Changeset 29281 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 9, 2010 11:40:43 PM (15 years ago)

Author:

vboxsync

Message:

iprt/r0drv/solaris: asm*.h fixes.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• RTLogWriteDebugger-r0drv-solaris.c (modified) (2 diffs)
• initterm-r0drv-solaris.c (modified) (3 diffs)
• spinlock-r0drv-solaris.c (modified) (7 diffs)
• vbi/thread-r0drv-solaris.c (modified) (2 diffs)
• vbi/timer-r0drv-solaris.c (modified) (1 diff)

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

@@ -34 +34 @@
 
 #include <iprt/asm.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/assert.h>
 
@@ -43 +46 @@
         AssertBreakpoint();
     if (    !g_frtSolarisSplSetsEIF
-        ||  ASMIntAreEnabled())
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+        ||  ASMIntAreEnabled()
+#else
+/* PORTME: Check if interrupts are enabled, if applicable. */
+#endif
+        )
         cmn_err(CE_CONT, pch);
     return;

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

@@ -33 +33 @@
 
 #include <iprt/err.h>
-#include <iprt/asm.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include "internal/initterm.h"
 
@@ -53 +55 @@
     if (!rc)
     {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         /*
          * Detech whether spl*() is preserving the interrupt flag or not.
@@ -65 +68 @@
             g_frtSolarisSplSetsEIF = true;
         ASMSetFlags(uOldFlags);
+#else
+        /* PORTME: See if the amd64/x86 problem applies to this architecture. */
+#endif
 
         return VINF_SUCCESS;

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

@@ -34 +34 @@
 
 #include <iprt/asm.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -117 +120 @@
     Assert(pThis->u32Magic == RTSPINLOCK_MAGIC);
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     pTmp->uFlags = ASMIntDisableFlags();
+#else
+    pTmp->uFlags = 0;
+#endif
     mutex_enter(&pThis->Mtx);
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     Assert(!ASMIntAreEnabled());
+#endif
     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
 }
@@ -136 +145 @@
 
     mutex_exit(&pThis->Mtx);
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     ASMSetFlags(pTmp->uFlags);
+#endif
 
     RT_ASSERT_PREEMPT_CPUID();
@@ -149 +160 @@
     Assert(pThis->u32Magic == RTSPINLOCK_MAGIC);
     NOREF(pTmp);
-#ifdef RT_STRICT
+#if defined(RT_STRICT) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
     bool fIntsOn = ASMIntAreEnabled();
 #endif
@@ -155 +166 @@
     mutex_enter(&pThis->Mtx);
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     AssertMsg(fIntsOn == ASMIntAreEnabled(), ("fIntsOn=%RTbool\n", fIntsOn));
+#endif
 
     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
@@ -170 +183 @@
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
     NOREF(pTmp);
-#ifdef RT_STRICT
+#if defined(RT_STRICT) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86))
     bool fIntsOn = ASMIntAreEnabled();
 #endif
@@ -176 +189 @@
     mutex_exit(&pThis->Mtx);
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     AssertMsg(fIntsOn == ASMIntAreEnabled(), ("fIntsOn=%RTbool\n", fIntsOn));
+#endif
     RT_ASSERT_PREEMPT_CPUID();
 }

trunk/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c

@@ -33 +33 @@
 #include <iprt/thread.h>
 
-#include <iprt/asm.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -79 +81 @@
     if (!vbi_is_preempt_enabled())
         return false;
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     if (!ASMIntAreEnabled())
         return false;
+#endif
     if (getpil() >= DISP_LEVEL)
         return false;

trunk/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c

@@ -170 +170 @@
      */
     RTTimerStop(pTimer);
-    ASMAtomicWriteU32(pTimer, ~RTTIMER_MAGIC);
+    ASMAtomicWriteU32(&pTimer->u32Magic, ~RTTIMER_MAGIC);
     RTMemFree(pTimer);
     return VINF_SUCCESS;