Changeset 93744 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 14, 2022 9:00:26 PM (3 years ago)

Author:

vboxsync

Message:

VMM: More arm64 adjustments. bugref:9898

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllAImplC.cpp (modified) (5 diffs)
• TMAllVirtual.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllAImplC.cpp

@@ -30 +30 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-#ifdef RT_ARCH_X86
+#ifndef RT_ARCH_AMD64
 /**
  * Parity calculation table.
@@ -326 +326 @@
     /* 0xff = 11111111b */ X86_EFL_PF,
 };
-#endif /* RT_ARCH_X86 */
+#endif /* RT_ARCH_AMD64 */
 
 
@@ -378 +378 @@
 
 
-#ifdef RT_ARCH_X86
+#ifndef RT_ARCH_AMD64
 /*
  * There are a few 64-bit on 32-bit things we'd rather do in C.  Actually, doing
@@ -1132 +1132 @@
 
 
-#endif /* RT_ARCH_X86 */
-#ifdef RT_ARCH_X86
+#endif /* !RT_ARCH_AMD64 */
+#ifndef RT_ARCH_AMD64
 
 /* multiplication and division */
@@ -1337 +1337 @@
 
 
-#endif /* RT_ARCH_X86 */
+#endif /* !RT_ARCH_AMD64 */
 
 

trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

@@ -101 +101 @@
          * Determine the new worker.
          */
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         bool const fLFence = RT_BOOL(ASMCpuId_EDX(1) & X86_CPUID_FEATURE_EDX_SSE2);
+#endif
         switch (pGip->u32Mode)
         {
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
             case SUPGIPMODE_SYNC_TSC:
             case SUPGIPMODE_INVARIANT_TSC:
-#ifdef IN_RING0
+# ifdef IN_RING0
                 if (pGip->enmUseTscDelta <= SUPGIPUSETSCDELTA_ROUGHLY_ZERO)
                     pfnWorker = fLFence ? RTTimeNanoTSLFenceSyncInvarNoDelta    : RTTimeNanoTSLegacySyncInvarNoDelta;
                 else
                     pfnWorker = fLFence ? RTTimeNanoTSLFenceSyncInvarWithDelta  : RTTimeNanoTSLegacySyncInvarWithDelta;
-#else
+# else
                 if (pGip->fGetGipCpu & SUPGIPGETCPU_IDTR_LIMIT_MASK_MAX_SET_CPUS)
                     pfnWorker = pGip->enmUseTscDelta <= SUPGIPUSETSCDELTA_PRACTICALLY_ZERO
@@ -132 +135 @@
                               ? fLFence ? RTTimeNanoTSLFenceSyncInvarNoDelta            : RTTimeNanoTSLegacySyncInvarNoDelta
                               : fLFence ? RTTimeNanoTSLFenceSyncInvarWithDeltaUseApicId : RTTimeNanoTSLegacySyncInvarWithDeltaUseApicId;
-#endif
+# endif
                 break;
 
             case SUPGIPMODE_ASYNC_TSC:
-#ifdef IN_RING0
+# ifdef IN_RING0
                 pfnWorker = fLFence ? RTTimeNanoTSLFenceAsync : RTTimeNanoTSLegacyAsync;
-#else
+# else
                 if (pGip->fGetGipCpu & SUPGIPGETCPU_IDTR_LIMIT_MASK_MAX_SET_CPUS)
                     pfnWorker = fLFence ? RTTimeNanoTSLFenceAsyncUseIdtrLim     : RTTimeNanoTSLegacyAsyncUseIdtrLim;
@@ -151 +154 @@
                 else
                     pfnWorker = fLFence ? RTTimeNanoTSLFenceAsyncUseApicId      : RTTimeNanoTSLegacyAsyncUseApicId;
-#endif
+# endif
                 break;
-
+#endif
             default:
                 AssertFatalMsgFailed(("pVM=%p pGip=%p u32Mode=%#x\n", pVM, pGip, pGip->u32Mode));