Changeset 1710 in vbox

Timestamp:

Mar 27, 2007 8:28:34 AM (18 years ago)

Author:

vboxsync

Message:

Fixed support for Linux guest ring 3 in the runtime

Location:

trunk/src/VBox/Runtime

Files:

• r3/init.cpp (modified) (5 diffs)
• timesup.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -40 +40 @@
 #include <iprt/string.h>
 #include <iprt/param.h>
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
 # include <iprt/file.h>
 # include <VBox/sup.h>
@@ -101 +101 @@
     /* no entry log flow, because prefixes and thread may freak out. */
 
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
 # ifdef VBOX
     /*
@@ -117 +117 @@
     }
 # endif  /* VBOX */
-#endif /* !IN_GUEST */
+#endif /* !IN_GUEST and !IN_GUEST_R3 */
 
     /*
@@ -131 +131 @@
     }
 
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
     if (fInitSUPLib)
     {
@@ -148 +148 @@
     g_u64ProgramStartMilliTS = RTTimeMilliTS();
 
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
     /*
      * The threading is initialized we can safely sleep a bit if GIP

trunk/src/VBox/Runtime/timesup.cpp

@@ -36 +36 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
 /** The previously returned nano TS.
  * This handles TSC drift on SMP systems and expired interval.
@@ -63 +63 @@
 DECLINLINE(uint64_t) rtTimeNanoTSInternal(void)
 {
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
     uint64_t    u64Delta;
     uint32_t    u32NanoTSFactor0;
@@ -202 +202 @@
 
     return u64;
-#else /* IN_GUEST */
+#else /* IN_GUEST || IN_GUEST_R3 */
     return RTTimeSystemNanoTS();
-#endif /* IN_GUEST */
+#endif /* IN_GUEST || IN_GUEST_R3 */
 }
 
@@ -230 +230 @@
 
 
-#ifndef IN_GUEST
+#if !defined(IN_GUEST) && !defined(IN_GUEST_R3)
 /**
  * Debugging the time api.