Changeset 108368 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Feb 25, 2025 1:17:32 PM (2 months ago)

Author:

vboxsync

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

167729

Message:

VMM/IEM: More work on targeting arm. jiraref:VBP-1531

File:

• trunk/src/VBox/VMM/VMMR3/IEMR3.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/IEMR3.cpp

@@ -37 +37 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/ssm.h>
-/** @todo this isn't sustainable.   */
-#if defined(VBOX_VMM_TARGET_ARMV8)
-# include "IEMInternal-armv8.h"
-#else
-# include "IEMInternal.h"
-#endif
+#include "IEMInternal.h"
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/vmapi.h>
@@ -129 +124 @@
 #endif
 
-#if !defined(VBOX_VMM_TARGET_ARMV8) && !defined(VBOX_WITHOUT_CPUID_HOST_CALL)
+#if defined(VBOX_VMM_TARGET_X86) && !defined(VBOX_WITHOUT_CPUID_HOST_CALL)
     /** @cfgm{/IEM/CpuIdHostCall, boolean, false}
      * Controls whether the custom VBox specific CPUID host call interface is
@@ -2003 +1998 @@
         if (CPUMAreInterruptsInhibitedByNmiEx(&pVCpu->cpum.GstCtx))
             fFlags |= IEMTB_F_INHIBIT_NMI;
-        if ((IEM_F_MODE_CPUMODE_MASK & fFlags) != IEMMODE_64BIT)
+        if ((IEM_F_MODE_X86_CPUMODE_MASK & fFlags) != IEMMODE_64BIT)
         {
             int64_t const offFromLim = (int64_t)pVCpu->cpum.GstCtx.cs.u32Limit - (int64_t)pVCpu->cpum.GstCtx.eip;