Changeset 5463 in vbox

Timestamp:

Oct 24, 2007 3:11:06 AM (18 years ago)

Author:

vboxsync

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

25637

Message:

Fixed link error. Added an alignment dummy.

Location:

trunk

Files:

• include/iprt/time.h (modified) (8 diffs)
• src/VBox/Runtime/common/time/timesup.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/time/timesupA.asm (modified) (1 diff)

trunk/include/iprt/time.h

@@ -746 +746 @@
     DECLCALLBACKMEMBER(uint64_t, pfnRediscover)(PRTTIMENANOTSDATA pData);
 
+    /** Just a dummy alignment member. */
+    void               *pvDummy;
+
     /** Number of 1ns steps because of overshooting the period. */
     uint32_t            c1nsSteps;
@@ -756 +759 @@
 } RTTIMENANOTSDATA;
 
+#ifndef IN_RING3
 /**
  * The Ring-3 layout of the RTTIMENANOTSDATA structure.
@@ -764 +768 @@
     DECLR3CALLBACKMEMBER(void, pfnBad,(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS));
     DECLR3CALLBACKMEMBER(uint64_t, pfnRediscover,(PRTTIMENANOTSDATA pData));
+    RTR3PTR             pvDummy;
     uint32_t            c1nsSteps;
     uint32_t            cExpired;
@@ -769 +774 @@
     uint32_t            cUpdateRaces;
 } RTTIMENANOTSDATAR3;
-
+#else
+typedef RTTIMENANOTSDATA RTTIMENANOTSDATAR3;
+#endif
+
+#ifndef IN_RING0
 /**
  * The Ring-3 layout of the RTTIMENANOTSDATA structure.
@@ -778 +787 @@
     DECLR0CALLBACKMEMBER(void, pfnBad,(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS));
     DECLR0CALLBACKMEMBER(uint64_t, pfnRediscover,(PRTTIMENANOTSDATA pData));
+    RTR0PTR             pvDummy;
     uint32_t            c1nsSteps;
     uint32_t            cExpired;
@@ -783 +793 @@
     uint32_t            cUpdateRaces;
 } RTTIMENANOTSDATAR0;
-
+#else
+typedef RTTIMENANOTSDATA RTTIMENANOTSDATAR0;
+#endif
+
+#ifndef IN_GC
 /**
  * The GC layout of the RTTIMENANOTSDATA structure.
@@ -792 +806 @@
     DECLGCCALLBACKMEMBER(void, pfnBad,(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS));
     DECLGCCALLBACKMEMBER(uint64_t, pfnRediscover,(PRTTIMENANOTSDATA pData));
+    RTGCPTR             pvDummy;
     uint32_t            c1nsSteps;
     uint32_t            cExpired;
@@ -797 +812 @@
     uint32_t            cUpdateRaces;
 } RTTIMENANOTSDATAGC;
+#else
+typedef RTTIMENANOTSDATA RTTIMENANOTSDATAGC;
+#endif
 
 /** Internal RTTimeNanoTS worker (assembly). */

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

@@ -56 +56 @@
     /* .pfnBad        = */ rtTimeNanoTSInternalBitch,
     /* .pfnRediscover = */ rtTimeNanoTSInternalRediscover,
+    /* .pvDummy       = */ NULL,
     /* .c1nsSteps     = */ 0,
     /* .cExpired      = */ 0,
@@ -115 +116 @@
         return rtTimeNanoTSInternalRediscover(pData);
     NOREF(pData);
+#if defined(IN_RING3) /** @todo Add ring-0 RTTimeSystemNanoTS to all hosts. */
     return RTTimeSystemNanoTS();
+#else
+    return 0;
+#endif
 }
 

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

@@ -28 +28 @@
     .pfnBad             RTCCPTR_RES 1
     .pfnRediscover      RTCCPTR_RES 1
+    .pvDummy            RTCCPTR_RES 1
     .c1nsSteps          resd 1
     .cExpired           resd 1