Changeset 98982 in vbox for trunk

Timestamp:

Mar 15, 2023 11:51:47 AM (21 months ago)

Author:

vboxsync

Message:

VMM: More ARMv8 x86/amd64 separation work, get past IEM, bugref:10385 [build fix]

Location:

trunk

Files:

• include/VBox/vmm/iem-x86-amd64.h (modified) (1 diff)
• include/VBox/vmm/iem.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)

trunk/include/VBox/vmm/iem-x86-amd64.h

@@ -49 +49 @@
 /** @addtogroup grp_iem
  * @{ */
+
+/** @name Operand or addressing mode.
+ * @{ */
+typedef uint8_t IEMMODE;
+#define IEMMODE_16BIT 0
+#define IEMMODE_32BIT 1
+#define IEMMODE_64BIT 2
+/** @} */
 
 

trunk/include/VBox/vmm/iem.h

@@ -113 +113 @@
 /** Pointer to a IEMXCPTRAISE type. */
 typedef IEMXCPTRAISE *PIEMXCPTRAISE;
-/** @} */
-
-
-/** @name Operand or addressing mode.
- * @{ */
-typedef uint8_t IEMMODE;
-#define IEMMODE_16BIT 0
-#define IEMMODE_32BIT 1
-#define IEMMODE_64BIT 2
 /** @} */
 

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

@@ -1215 +1215 @@
              pDevIns->pReg->szName, pDevIns->iInstance));
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    uint64_t u64Fsb = 0;
+    AssertReleaseFailed();
+#else
     uint64_t u64Fsb = CPUMGetGuestScalableBusFrequency(pDevIns->Internal.s.pVMR3);
+#endif
 
     Log(("pdmR3DevHlp_CpuGetGuestScalableBusFrequency: caller='%s'/%d: returns %#RX64\n", pDevIns->pReg->szName, pDevIns->iInstance, u64Fsb));