Changeset 53470 in vbox for trunk/src/VBox

Timestamp:

Dec 6, 2014 3:55:37 AM (10 years ago)

Author:

vboxsync

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

97200

Message:

timesupA.asm: Disabled SUPTscDeltaApply macro invocation, see review comments in code.

Location:

trunk/src/VBox/Runtime/common/time

Files:

• timesupA.asm (modified) (2 diffs)
• timesupA.mac (modified) (2 diffs)

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

@@ -95 +95 @@
 %include "timesupA.mac"
 
+%undef ASYNC_GIP
+%define INVARIANT_GIP
+%ifdef IN_RC
+ %undef NEED_TRANSACTION_ID
+%endif
+%define rtTimeNanoTSInternalAsm    RTTimeNanoTSLegacyInvariant
+;%include "timesupA.mac"
+;; @todo r=bird: later.
+
 ;
 ; Alternative implementation that employs lfence instead of cpuid.
 ;
-%undef  ASYNC_GIP
+%undef  INVARIANT_GIP
 %define USE_LFENCE
 %define NEED_TRANSACTION_ID
@@ -112 +121 @@
 %include "timesupA.mac"
 
+%undef  ASYNC_GIP
+%define INVARIANT_GIP
+%define NEED_TRANSACTION_ID
+%define rtTimeNanoTSInternalAsm    RTTimeNanoTSLFenceInvariant
+;%include "timesupA.mac"
+;; @todo r=bird: later.
+
 
 %endif ; !IN_GUEST

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

@@ -126 +126 @@
     mov     u32UpdateIntervalTSC, edx
     rdtsc
-    SupTscDeltaApply edi        ; Apply inter-cpu TSC-delta to have the normalized TSC value in edx:eax
+;; @todo r-bird: Deltas are only valid in INVARIANT mode according to SUPDrv.c macro.
+;; edi is pointing to aCpu[0] in INVARIANT and SYNC.  Code does more harm than good atm => disabled.
+;; (Just drop the SUPTscDeltaApply macro btw.)  Sketched what is needed for invariant in timesupA.asm, more work .cpp files in IPRT and VMM.
+;    SUPTscDeltaApply edi        ; Apply inter-cpu TSC-delta to have the normalized TSC value in edx:eax
     mov     ecx, [edi + SUPGIPCPU.u64NanoTS]
     mov     u64CurNanoTS, ecx
@@ -545 +548 @@
     mov     u32UpdateIntervalTSC, [pGipCPU + SUPGIPCPU.u32UpdateIntervalTSC]
     rdtsc
-    SUPTscDeltaApply pGipCPU
+;; @todo r-bird: Deltas are only valid in INVARIANT mode according to SUPDrv.c macro.
+;; pGipCPU is pointing to aCpu[0] in INVARIANT and SYNC.  Code is 32-bit, i.e. inefficient. Code does more harm than good atm => disabled.
+;; (Just drop the SUPTscDeltaApply macro btw.)  Sketched what is needed for invariant in timesupA.asm, more work .cpp files in IPRT and VMM.
+;    SUPTscDeltaApply pGipCPU
     mov     u64PrevNanoTS,        [pData + RTTIMENANOTSDATA.pu64Prev]
     mov     u64PrevNanoTS,        [u64PrevNanoTS]