Changeset 19499 in vbox for trunk

Timestamp:

May 7, 2009 6:10:25 PM (16 years ago)

Author:

vboxsync

Message:

TMInternal.h: Made TMTIMER::offShcduleNext volatile and switched from ASMAtomicXchgSize to ASMAtomicXchgU32 for updating the state.

File:

• trunk/src/VBox/VMM/TMInternal.h (modified) (5 diffs)

trunk/src/VBox/VMM/TMInternal.h

@@ -27 +27 @@
 #include <iprt/time.h>
 #include <iprt/timer.h>
+#include <iprt/assert.h>
 #include <VBox/stam.h>
 #include <VBox/pdmcritsect.h>
@@ -166 +167 @@
     volatile TMTIMERSTATE   enmState;
     /** Timer relative offset to the next timer in the schedule list. */
-    int32_t                 offScheduleNext;
+    int32_t volatile        offScheduleNext;
 
     /** Timer relative offset to the next timer in the chain. */
@@ -189 +190 @@
 #endif
 } TMTIMER;
+AssertCompileMemberSize(TMTIMER, enmState, sizeof(uint32_t));
 
 
@@ -196 +198 @@
 #if 1
 # define TM_SET_STATE(pTimer, state) \
-    ASMAtomicXchgSize(&(pTimer)->enmState, state)
+    ASMAtomicWriteU32((uint32_t volatile *)&(pTimer)->enmState, state)
 #else
 # define TM_SET_STATE(pTimer, state) \
-    do { Log(("%s: %p: %d -> %d\n", __FUNCTION__, (pTimer), (pTimer)->enmState, state)); \
-         ASMAtomicXchgSize(&(pTimer)->enmState, state);\
+    do { \
+        uint32_t uOld1 = (pTimer)->enmState; \
+        Log(("%s: %p: %d -> %d\n", __FUNCTION__, (pTimer), (pTimer)->enmState, state)); \
+        uint32_t uOld2 = ASMAtomicXchgU32((uint32_t volatile *)&(pTimer)->enmState, state); \
+        Assert(uOld1 == uOld2); \
     } while (0)
 #endif
@@ -209 +214 @@
 #if 1
 # define TM_TRY_SET_STATE(pTimer, StateNew, StateOld, fRc) \
-    ASMAtomicCmpXchgSize(&(pTimer)->enmState, StateNew, StateOld, fRc)
+    (fRc) = ASMAtomicCmpXchgU32((uint32_t volatile *)&(pTimer)->enmState, StateNew, StateOld)
 #else
 # define TM_TRY_SET_STATE(pTimer, StateNew, StateOld, fRc) \
-    do { ASMAtomicCmpXchgSize(&(pTimer)->enmState, StateNew, StateOld, fRc); \
+    do { (fRc) = ASMAtomicCmpXchgU32((uint32_t volatile *)&(pTimer)->enmState, StateNew, StateOld); \
          Log(("%s: %p: %d -> %d %RTbool\n", __FUNCTION__, (pTimer), StateOld, StateNew, fRc)); \
     } while (0)