Changeset 25278 in vbox for trunk/include

Timestamp:

Dec 9, 2009 4:37:00 PM (15 years ago)

Author:

vboxsync

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

55820

Message:

SUPDrv: Major IOC version change - preparing to use the native ring-0 loader on windwos.

File:

• trunk/include/VBox/sup.h (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -219 +219 @@
 #if defined(IN_SUP_R0) || defined(IN_SUP_R3) || defined(IN_SUP_GC)
 extern DECLEXPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
-#elif defined(IN_RING0)
-# if 0 /* VBOX_WITH_NATIVE_R0_LOADER */
-#  define g_pSUPGlobalInfoPage          (SUPGetGIP())
+
+#elif !defined(IN_RING0) || defined(RT_OS_WINDOWS)
+extern DECLIMPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
+
+#else /* IN_RING0 && !RT_OS_WINDOWS */
+# if !defined(__GNUC__) || defined(RT_OS_DARWIN) || !defined(RT_ARCH_AMD64)
+#  define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
 # else
-extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
-#  if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
+#  define g_pSUPGlobalInfoPage          (SUPGetGIPHlp())
 /** Workaround for ELF+GCC problem on 64-bit hosts.
  * (GCC emits a mov with a R_X86_64_32 reloc, we need R_X86_64_64.) */
@@ -234 +237 @@
     return pGIP;
 }
-#   define g_pSUPGlobalInfoPage          (SUPGetGIPHlp())
-#  else
-#   define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
-#  endif
 # endif
-#else
-extern DECLIMPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
+/** The GIP.
+ * We save a level of indirection by exporting the GIP instead of a variable
+ * pointing to it. */
+extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
 #endif