Changeset 22566 in vbox for trunk/src

Timestamp:

Aug 28, 2009 6:25:32 PM (16 years ago)

Author:

vboxsync

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

51593

Message:

IPRT/thread/solaris: Backed out changes to RTThreadPreempt* made in r51399 and related buildfixes.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• thread-r0drv-solaris.c (modified) (3 diffs)
• vbi/thread-r0drv-solaris.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include <iprt/err.h>
 #include <iprt/mp.h>
+
 
 
@@ -143 +144 @@
 {
     AssertPtr(pState);
-    Assert(pState->uOldPil == UINT32_MAX);
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
 
     kpreempt_disable();
-/// @todo check out splr and splx on S10!
-//    if (ASMIntAreEnabled())
-        pState->uOldPil = splr(ipltospl(DISP_LEVEL));
-//    else
-//    {
-//        /* splr doesn't restore the interrupt flag on S10. */
-//        pState->uOldPil = getpil();
-//        if (pState->uOldPil < DISP_LEVEL)
-//            pState->uOldPil = splx(DISP_LEVEL);
-//    }
-    Assert(pState->uOldPil != UINT32_MAX);
     RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
@@ -164 +155 @@
 {
     AssertPtr(pState);
-    Assert(pState->uOldPil != UINT32_MAX);
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
     RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
 
     kpreempt_enable();
-    splx(pState->uOldPil);
-
-    pState->uOldPil = UINT32_MAX;
 }
 

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

@@ -41 +41 @@
 #include <iprt/err.h>
 #include <iprt/mp.h>
+
 
 
@@ -115 +116 @@
 {
     AssertPtr(pState);
-//    Assert(pState->uOldPil == UINT32_MAX);
-
+    Assert(pState->u32Reserved == 0);
+    pState->u32Reserved = 42;
     vbi_preempt_disable();
-/// @todo check out splr and splx on S10!
-//    if (ASMIntAreEnabled())
-        //pState->uOldPil = splr(ipltospl(DISP_LEVEL));
-//        pState->uOldPil = splr(ipltospl(LOCK_LEVEL - 1));  //temporary
-//    else
-//    {
-//        /* splr doesn't restore the interrupt flag on S10. */
-//        pState->uOldPil = getpil();
-//        if (pState->uOldPil < DISP_LEVEL)
-//            pState->uOldPil = splx(DISP_LEVEL);
-//    }
-
-//    Assert(pState->uOldPil != UINT32_MAX);
     RT_ASSERT_PREEMPT_CPUID_DISABLE(pState);
 }
@@ -138 +126 @@
 {
     AssertPtr(pState);
-//    Assert(pState->uOldPil != UINT32_MAX);
+    Assert(pState->u32Reserved == 42);
+    pState->u32Reserved = 0;
     RT_ASSERT_PREEMPT_CPUID_RESTORE(pState);
-
     vbi_preempt_enable();
-//    splx(pState->uOldPil);
-
-//    pState->uOldPil = UINT32_MAX;
 }