Changeset 106456 in vbox for trunk/src/VBox

Timestamp:

Oct 17, 2024 2:03:57 PM (6 weeks ago)

Author:

vboxsync

Message:

Runtime/r0drv/nt/thread-r0drv-nt.cpp: win.arm64 build fix, bugref:10734

File:

• trunk/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp (modified) (4 diffs)

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

@@ -45 +45 @@
 #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>
 #endif
 #include <iprt/assert.h>
@@ -119 +121 @@
     }
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) /* Not required in ARM as we don't support pre W10 kernels. */
     /*
      * Fallback approach for pre W10 kernels.
@@ -146 +149 @@
     RTCCUINTREG     fSavedFlags  = ASMIntDisableFlags();
 
-#ifdef RT_ARCH_X86
+# ifdef RT_ARCH_X86
     PKPCR       pPcr   = (PKPCR)__readfsdword(RT_UOFFSETOF(KPCR,SelfPcr));
     uint8_t    *pbPrcb = (uint8_t *)pPcr->Prcb;
 
-#elif defined(RT_ARCH_AMD64)
+# elif defined(RT_ARCH_AMD64)
     /* HACK ALERT! The offset is from windbg/vista64. */
     PKPCR       pPcr   = (PKPCR)__readgsqword(RT_UOFFSETOF(KPCR,Self));
     uint8_t    *pbPrcb = (uint8_t *)pPcr->CurrentPrcb;
 
-#else
-# error "port me"
-#endif
+# endif
 
     /* Check QuantumEnd. */
@@ -183 +184 @@
     ASMSetFlags(fSavedFlags);
     return fPending;
+#else
+    AssertFailed();
+    return false;
+#endif
 }