Changeset 106544 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Oct 21, 2024 7:48:53 AM (3 months ago)

Author:

vboxsync

Message:

Runtime/r0drv/nt/initterm-r0drv-nt.cpp: Make it build on win.arm64, disable QuantumEnd and DpcQueueDepth hack on ARM, they shouldn't be required there, bugref:10732

File:

• trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp (modified) (7 diffs)

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

@@ -40 +40 @@
 *********************************************************************************************************************************/
 #include "the-nt-kernel.h"
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+# include <iprt/asm-arm.h>
+#else
+# error "Port me"
+#endif
 #include <iprt/dbg.h>
 #include <iprt/errcore.h>
@@ -47 +53 @@
 #include "internal-r0drv-nt.h"
 #include "symdb.h"
+#if !defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86)
+# define RTNTSDB_NO_DATA
+#endif
 #include "symdbdata.h"
 
@@ -267 +276 @@
     __except(EXCEPTION_EXECUTE_HANDLER)
     {
+#ifndef RTNTSDB_NO_DATA
         DbgPrint("IPRT: %#d Exception\n", pSet - &g_artNtSdbSets[0]);
+#endif
         return false;
     }
@@ -350 +361 @@
     GET_SYSTEM_ROUTINE(MmAllocatePagesForMdlEx);
     GET_SYSTEM_ROUTINE(MmFreePagesFromMdl);
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     GET_SYSTEM_ROUTINE(MmMapLockedPagesSpecifyCache);
+#else
+    /* MmMapLockedPagesSpecifyCache is a pre processor macro on arm64. */ 
+    g_pfnrtMmMapLockedPagesSpecifyCache = (decltype(MmMapLockedPagesSpecifyCache) *)RTR0DbgKrnlInfoGetSymbol(hKrnlInfo, NULL, "MmMapLockedPagesSpecifyCache");
+#endif
     GET_SYSTEM_ROUTINE(MmAllocateContiguousMemorySpecifyCache);
     GET_SYSTEM_ROUTINE(MmSecureVirtualMemory);
@@ -387 +403 @@
 
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     /*
      * HACK ALERT! (and déjà vu warning - remember win32k.sys on OS/2?)
@@ -423 +440 @@
     __try /* Warning. This try/except statement may provide some false safety. */
     {
-#if defined(RT_ARCH_X86)
+# if defined(RT_ARCH_X86)
         PKPCR    pPcr   = (PKPCR)__readfsdword(RT_UOFFSETOF(KPCR,SelfPcr));
         pbPrcb = (uint8_t *)pPcr->Prcb;
-#elif defined(RT_ARCH_AMD64)
+# elif defined(RT_ARCH_AMD64)
         PKPCR    pPcr   = (PKPCR)__readgsqword(RT_UOFFSETOF(KPCR,Self));
         pbPrcb = (uint8_t *)pPcr->CurrentPrcb;
-#else
-# error "port me"
+# else
+#  error "port me"
         pbPrcb = NULL;
-#endif
+# endif
     }
     __except(EXCEPTION_EXECUTE_HANDLER)
@@ -500 +517 @@
     KeLowerIrql(OldIrql); /* Lowering the IRQL early in the hope that we may catch exceptions below. */
 
-#ifndef IN_GUEST
+# ifndef IN_GUEST
     if (!g_offrtNtPbQuantumEnd && !g_offrtNtPbDpcQueueDepth)
         DbgPrint("IPRT: Neither _KPRCB::QuantumEnd nor _KPRCB::DpcQueueDepth was not found! Kernel %u.%u %u %s\n",
                  OsVerInfo.uMajorVer, OsVerInfo.uMinorVer, OsVerInfo.uBuildNo, OsVerInfo.fChecked ? "checked" : "free");
-# ifdef DEBUG
+#  ifdef DEBUG
     else
         DbgPrint("IPRT: _KPRCB:{.QuantumEnd=%x/%d, .DpcQueueDepth=%x/%d} Kernel %u.%u %u %s\n",
                  g_offrtNtPbQuantumEnd, g_cbrtNtPbQuantumEnd, g_offrtNtPbDpcQueueDepth, g_offrtNtPbDpcQueueDepth,
                  OsVerInfo.uMajorVer, OsVerInfo.uMinorVer, OsVerInfo.uBuildNo, OsVerInfo.fChecked ? "checked" : "free");
+#  endif
 # endif
-#endif
+#endif /* RT_ARCH_AMD64 || RT_ARCH_X86 */
 
     /*