Changeset 75275 in vbox

Timestamp:

Nov 6, 2018 11:17:30 AM (6 years ago)

Author:

vboxsync

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

126377

Message:

IPRT/dbgkrnlinfo-r0drv-nt.cpp: Must manually initialize g_pfnMmGetSystemRoutineAddress according to the linker.

File:

• trunk/src/VBox/Runtime/r0drv/nt/dbgkrnlinfo-r0drv-nt.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/nt/dbgkrnlinfo-r0drv-nt.cpp

@@ -144 +144 @@
 /** Pointer to MmGetSystemRoutineAddress.
  * @note Added in NT v5.0. */
-#ifdef IPRT_TARGET_NT4
 static decltype(MmGetSystemRoutineAddress) *g_pfnMmGetSystemRoutineAddress = NULL;
-#else
-static decltype(MmGetSystemRoutineAddress) *g_pfnMmGetSystemRoutineAddress = MmGetSystemRoutineAddress;
-#endif
 /** Info about the ntoskrnl.exe mapping. */
 static RTDBGNTKRNLMODINFO   g_NtOsKrnlInfo = { "ntoskrnl.exe", NULL, NULL, false, 0, 0, 0, 0, 0, NULL, 0, 0, NULL, NULL };
@@ -348 +344 @@
 {
     RTR0DBG_NT_DEBUG_LOG(("rtR0DbgKrnlNtInit: pModInfo=%p\n", pModInfo));
+
+#ifndef IPRT_TARGET_NT4
+    /*
+     * Must manually initialize g_pfnMmGetSystemRoutineAddress, otherwise compiler
+     * generates its own dynamic init code that might not necessarily be called.
+     */
+    g_pfnMmGetSystemRoutineAddress = MmGetSystemRoutineAddress;
+#endif
 
     /*