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

Timestamp:

Oct 24, 2007 2:18:28 AM (17 years ago)

Author:

vboxsync

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

25635

Message:

Made u64Prev a pointer so TM can share it between contexts. Added R3, R0 and GC layouts.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• common/time/timesup.cpp (modified) (1 diff)
• common/time/timesupA.asm (modified) (1 diff)
• common/time/timesupA.mac (modified) (6 diffs)
• common/time/timesupref.h (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -209 +209 @@
         r3/tcp.cpp
 
-#if1of ($(BUILD_TARGET_ARCH),amd64 x86)
-# RuntimeR3_SOURCES += common/time/timesupA.asm
-#else
+if1of ($(BUILD_TARGET_ARCH),amd64 x86)
+ RuntimeR3_SOURCES += common/time/timesupA.asm
+else
  RuntimeR3_SOURCES += common/time/timesupref.cpp
-#endif
+endif
 
 ifdef IPRT_WITH_KLDR
@@ -680 +680 @@
         VBox/strformat-vbox.cpp
 
-#if1of ($(BUILD_TARGET_ARCH),amd64 x86)
-# RuntimeR0_SOURCES += common/time/timesupA.asm
-#else
+if1of ($(BUILD_TARGET_ARCH),amd64 x86)
+ RuntimeR0_SOURCES += common/time/timesupA.asm
+else
  RuntimeR0_SOURCES += common/time/timesupref.cpp
-#endif
+endif
 
 RuntimeR0_SOURCES.win.amd64 = $(RuntimeWin64ASM_SOURCES)
@@ -1010 +1010 @@
         VBox/strformat-vbox.cpp \
 
-#if1of ($(BUILD_TARGET_ARCH),amd64 x86)
-# RuntimeGC_SOURCES += common/time/timesupA.asm
-#else
+if1of ($(BUILD_TARGET_ARCH),amd64 x86)
+ RuntimeGC_SOURCES += common/time/timesupA.asm
+else
  RuntimeGC_SOURCES += common/time/timesupref.cpp
-#endif
+endif
 
 ifeq ($(VBOX_LDR_FMT32),lx)

trunk/src/VBox/Runtime/common/time/timesup.cpp

@@ -47 +47 @@
 *******************************************************************************/
 #ifndef IN_GUEST
+/** The previous timestamp value returned by RTTimeNanoTS. */
+static uint64_t         g_TimeNanoTSPrev = 0;
+
 /** The RTTimeNanoTS data structure that's passed down to the worker functions.  */
 static RTTIMENANOTSDATA g_TimeNanoTSData =
 {
-    /* .u64Prev       = */ 0,
+    /* .pu64Prev      = */ &g_TimeNanoTSPrev,
+    /* .pfnBad        = */ rtTimeNanoTSInternalBitch,
+    /* .pfnRediscover = */ rtTimeNanoTSInternalRediscover,
     /* .c1nsSteps     = */ 0,
     /* .cExpired      = */ 0,
     /* .cBadPrev      = */ 0,
-    /* .cUpdateRaces  = */ 0,
-    /* .pfnBad        = */ rtTimeNanoTSInternalBitch,
-    /* .pfnRediscover = */ rtTimeNanoTSInternalRediscover
+    /* .cUpdateRaces  = */ 0
 };
 

trunk/src/VBox/Runtime/common/time/timesupA.asm

@@ -25 +25 @@
 ;; Keep this in sync with iprt/time.h.
 struc RTTIMENANOTSDATA
-    .u64Prev            resq 1
+    .pu64Prev           RTCCPTR_RES 1
+    .pfnBad             RTCCPTR_RES 1
+    .pfnRediscover      RTCCPTR_RES 1
     .c1nsSteps          resd 1
     .cExpired           resd 1
     .cBadPrev           resd 1
     .cUpdateRaces       resd 1
-    .pfnBad             RTCCPTR_RES 1
-    .pfnRediscover      RTCCPTR_RES 1
 endstruc
 

trunk/src/VBox/Runtime/common/time/timesupA.mac

@@ -104 +104 @@
     ;   RDTSC result, we try to make sure it has completed as well.
     mov     esi, pData
+    mov     esi, [esi + RTTIMENANOTSDATA.pu64Prev]
     mov     ebx, eax
     mov     ecx, edx
-    lock cmpxchg8b [esi + RTTIMENANOTSDATA.u64Prev]
+    lock cmpxchg8b [esi]
     mov     u64PrevNanoTS, eax
     mov     u64PrevNanoTS_Hi, edx
@@ -191 +192 @@
     mov     ecx, edx
     mov     esi, pData
+    mov     esi, [esi + RTTIMENANOTSDATA.pu64Prev]
     mov     eax, u64PrevNanoTS
     mov     edx, u64PrevNanoTS_Hi
-    lock cmpxchg8b [esi + RTTIMENANOTSDATA.u64Prev]
+    lock cmpxchg8b [esi]
     jnz     .UpdateFailed
 
@@ -498 +500 @@
     mov     u32UpdateIntervalTSC, [pGipCPU + SUPGIPCPU.u32UpdateIntervalTSC]
     rdtsc
-    mov     u64PrevNanoTS,        [pData + RTTIMENANOTSDATA.u64Prev]
+    mov     u64PrevNanoTS,        [pData + RTTIMENANOTSDATA.pu64Prev]
+    mov     u64PrevNanoTS,        [u64PrevNanoTS]
     shl     rdx, 32
  %ifdef u64SavedRetNanoTS               ; doing this here saves a tick or so.
@@ -574 +577 @@
 .Update:
     ; if (RT_LIKELY(ASMAtomicCmpXchgU64(&pData->u64Prev, u64RetNanoTS, u64PrevNanoTS)))
+    mov     rbx, [pData + RTTIMENANOTSDATA.pu64Prev]
     mov     rcx, rax
     mov     rax, u64PrevNanoTS
-    lock cmpxchg [pData + RTTIMENANOTSDATA.u64Prev], rcx
+    lock cmpxchg [rbx], rcx
     jnz     .UpdateFailed
 
@@ -691 +695 @@
     lock inc dword [pData + RTTIMENANOTSDATA.cUpdateRaces]
     ; for (i = 0; i < 10; i++)
-    mov     ebx, 10
+    mov     edx, 10
 .UpdateLoop:
     ; if (u64PrevNanoTS >= u64RetNanoTS)
@@ -699 +703 @@
 .UpdateLoopLess:
     ; retry
-    lock cmpxchg [pData + RTTIMENANOTSDATA.u64Prev], rcx
+    lock cmpxchg [rbx], rcx
     jz      .Updated
-    dec     ebx
+    dec     edx
     jnz     .UpdateLoop
     jmp     .Updated

trunk/src/VBox/Runtime/common/time/timesupref.h

@@ -72 +72 @@
         u32NanoTSFactor0 = pGip->u32UpdateIntervalNS;
         u64Delta = ASMReadTSC();
-        u64PrevNanoTS = ASMAtomicReadU64(&pData->u64Prev);
+        u64PrevNanoTS = ASMAtomicReadU64(pData->pu64Prev);
 
 #ifdef NEED_TRANSACTION_ID
@@ -142 +142 @@
     }
 
-    if (RT_LIKELY(ASMAtomicCmpXchgU64(&pData->u64Prev, u64NanoTS, u64PrevNanoTS)))
+    if (RT_LIKELY(ASMAtomicCmpXchgU64(pData->pu64Prev, u64NanoTS, u64PrevNanoTS)))
     {
         /*
@@ -154 +154 @@
         for (int cTries = 25;;)
         {
-            u64PrevNanoTS = ASMAtomicReadU64(&pData->u64Prev);
+            u64PrevNanoTS = ASMAtomicReadU64(pData->pu64Prev);
             if (u64PrevNanoTS >= u64NanoTS)
                 break;
-            if (ASMAtomicCmpXchgU64(&pData->u64Prev, u64NanoTS, u64PrevNanoTS))
+            if (ASMAtomicCmpXchgU64(pData->pu64Prev, u64NanoTS, u64PrevNanoTS))
                 break;
             AssertBreak(--cTries <= 0, );