Changeset 25275 in vbox for trunk/include/VBox

Timestamp:

Dec 9, 2009 3:58:31 PM (15 years ago)

Author:

vboxsync

Message:

SUPDrv: Added SUPGetGIP and added a fNativeLoader indicator to SUPLDROPEN (VBOX_WITH_NATIVE_R0_LOADER).

File:

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

trunk/include/VBox/sup.h

@@ -220 +220 @@
 extern DECLEXPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
 #elif defined(IN_RING0)
+# if 0 /* VBOX_WITH_NATIVE_R0_LOADER */
+#  define g_pSUPGlobalInfoPage          (SUPGetGIP())
+# else
 extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
-# if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
+#  if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
 /** 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.) */
-DECLINLINE(PSUPGLOBALINFOPAGE) SUPGetGIP(void)
+DECLINLINE(PSUPGLOBALINFOPAGE) SUPGetGIPHlp(void)
 {
     PSUPGLOBALINFOPAGE pGIP;
@@ -231 +234 @@
     return pGIP;
 }
-#  define g_pSUPGlobalInfoPage          (SUPGetGIP())
-# else
-#  define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
+#   define g_pSUPGlobalInfoPage          (SUPGetGIPHlp())
+#  else
+#   define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
+#  endif
 # endif
 #else
@@ -239 +243 @@
 #endif
 
+/**
+ * Gets the GIP pointer.
+ *
+ * @returns Pointer to the GIP or NULL.
+ */
+SUPDECL(PSUPGLOBALINFOPAGE)             SUPGetGIP(void);
 
 /**