Changeset 98993 in vbox

Timestamp:

Mar 15, 2023 6:41:59 PM (2 years ago)

Author:

vboxsync

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

156343

Message:

VMM: More ARMv8 x86/amd64 separation work, getting to PGM now, bugref:10385

Location:

trunk

Files:

• include/VBox/vmm/iem-armv8.h (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/IEMR3.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (1 diff)
• src/VBox/VMM/include/IEMInternal-armv8.h (added)

trunk/include/VBox/vmm/iem-armv8.h

@@ -45 +45 @@
  * @{ */
 
+/** @name Instruction mode.
+ * @{ */
+typedef uint8_t IEMMODE;
+/** AARCH64 instruction mode. */
+#define IEMMODE_AARCH64     0
+/** AARCH32 A32 instruction mode. */
+#define IEMMODE_AARCH32_A32 1
+/** AARCH32 T32 (aka Thumb) instruction mode. */
+#define IEMMODE_AARCH32_T32 1
+/** @} */
+
 
 /** The CPUMCTX_EXTRN_XXX mask required to be cleared when interpreting anything.

trunk/include/VBox/vmm/vm.h

@@ -137 +137 @@
      * @remarks This comes first as it allows the use of 8-bit immediates for the
      *          first 64 bytes of the structure, reducing code size a wee bit. */
-#ifdef VMM_INCLUDED_SRC_include_IEMInternal_h /* For PDB hacking. */
+#if defined(VMM_INCLUDED_SRC_include_IEMInternal_h) || defined(VMM_INCLUDED_SRC_include_IEMInternal_armv8_h) /* For PDB hacking. */
     union VMCPUUNIONIEMFULL
 #else
@@ -143 +143 @@
 #endif
     {
-#ifdef VMM_INCLUDED_SRC_include_IEMInternal_h
+#if defined(VMM_INCLUDED_SRC_include_IEMInternal_h) || defined(VMM_INCLUDED_SRC_include_IEMInternal_armv8_h)
         struct IEMCPU       s;
 #endif

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

@@ -35 +35 @@
 #include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/mm.h>
-#include "IEMInternal.h"
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# include "IEMInternal-armv8.h"
+#else
+# include "IEMInternal.h"
+#endif
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/vmapi.h>

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

@@ -4631 +4631 @@
     AssertPtr(pEax); AssertPtr(pEbx); AssertPtr(pEcx); AssertPtr(pEdx);
 
+#ifdef VBOX_VMM_TARGET_ARMV8
+    RT_NOREF(iLeaf, pEax, pEbx, pEcx, pEdx);
+    AssertReleaseFailed();
+#else
     CPUMGetGuestCpuId(VMMGetCpu(pDevIns->Internal.s.pVMR3), iLeaf, 0 /*iSubLeaf*/, -1 /*f64BitMode*/, pEax, pEbx, pEcx, pEdx);
+#endif
 
     LogFlow(("pdmR3DevHlp_GetCpuId: caller='%s'/%d: returns void - *pEax=%#x *pEbx=%#x *pEcx=%#x *pEdx=%#x\n",

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

@@ -171 +171 @@
         return pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
 #else
-    RT_NOREF(pDevIns, idDevice);
+    RT_NOREF(pDevIns, idDevice, pMsiIn, pMsiOut);
 #endif
     return VERR_IOMMU_NOT_PRESENT;