Changeset 100184 in vbox for trunk

Timestamp:

Jun 16, 2023 6:51:39 AM (18 months ago)

Author:

vboxsync

Message:

VMM: Add a CPUMGetGuestArch() method and PDM device helper to make it easier to determine the guest architecture and not having to deal with the massive CPUMMICROARCH enum, bugref:10385

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (3 diffs)
• include/VBox/vmm/pdmdev.h (modified) (2 diffs)
• include/VBox/vmm/vmmr3vtable-def.h (modified) (1 diff)
• include/VBox/vmm/vmmr3vtable.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs-armv8.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR3/VMMR3.def (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -69 +69 @@
     CPUMCPUVENDOR_32BIT_HACK = 0x7fffffff
 } CPUMCPUVENDOR;
+
+
+/**
+ * CPU architecture.
+ */
+typedef enum CPUMARCH
+{
+    /** Invalid zero value. */
+    kCpumArch_Invalid = 0,
+    /** x86 based architecture (includes 64-bit). */
+    kCpumArch_X86,
+    /** ARM based architecture (includs both AArch32 and AArch64). */
+    kCpumArch_Arm,
+
+    /** @todo RiscV, Mips, ... ;). */
+
+    /*
+     * Unknown.
+     */
+    kCpumArch_Unknown,
+
+    kCpumArch_32BitHack = 0x7fffffff
+} CPUMARCH;
 
 
@@ -352 +375 @@
 VMMDECL(uint64_t)       CPUMGetGuestFlatSP(PVMCPU pVCpu);
 VMMDECL(CPUMCPUVENDOR)  CPUMGetGuestCpuVendor(PVM pVM);
+VMMDECL(CPUMARCH)       CPUMGetGuestArch(PCVM pVM);
 VMMDECL(CPUMMICROARCH)  CPUMGetGuestMicroarch(PCVM pVM);
 VMMDECL(void)           CPUMGetGuestAddrWidths(PCVM pVM, uint8_t *pcPhysAddrWidth, uint8_t *pcLinearAddrWidth);
@@ -362 +386 @@
 
 VMMDECL(CPUMCPUVENDOR)  CPUMGetHostCpuVendor(PVM pVM);
+VMMDECL(CPUMARCH)       CPUMGetHostArch(PCVM pVM);
 VMMDECL(CPUMMICROARCH)  CPUMGetHostMicroarch(PCVM pVM);
 

trunk/include/VBox/vmm/pdmdev.h

@@ -4611 +4611 @@
 
     /**
+     * Returns the architecture used for the guest.
+     *
+     * @returns CPU architecture enum.
+     * @param   pDevIns             The device instance.
+     */
+    DECLR3CALLBACKMEMBER(CPUMARCH, pfnCpuGetGuestArch,(PPDMDEVINS pDevIns));
+
+    /**
      * Returns the micro architecture used for the guest.
      *
@@ -7359 +7367 @@
 {
     return pDevIns->CTX_SUFF(pHlp)->pfnPhysChangeMemBalloon(pDevIns, fInflate, cPages, paPhysPage);
+}
+
+/**
+ * @copydoc PDMDEVHLPR3::pfnCpuGetGuestArch
+ */
+DECLINLINE(CPUMARCH) PDMDevHlpCpuGetGuestArch(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnCpuGetGuestArch(pDevIns);
+}
+
+/**
+ * Returns a flag whether the current guest CPU architecture is x86.
+ *
+ * @returns Flag whether the current guest architecture is x86.
+ * @param   pDevIns     The device instance.
+ */
+DECLINLINE(bool) PDMDevHlpCpuIsGuestArchX86(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnCpuGetGuestArch(pDevIns) == kCpumArch_X86;
+}
+
+/**
+ * Returns a flag whether the current guest CPU architecture is ARM.
+ *
+ * @returns Flag whether the current guest architecture is ARM.
+ * @param   pDevIns     The device instance.
+ */
+DECLINLINE(bool) PDMDevHlpCpuIsGuestArchArm(PPDMDEVINS pDevIns)
+{
+    return pDevIns->CTX_SUFF(pHlp)->pfnCpuGetGuestArch(pDevIns) == kCpumArch_Arm;
 }
 

trunk/include/VBox/vmm/vmmr3vtable-def.h

@@ -370 +370 @@
 VTABLE_ENTRY(CPUMGetHostCpuVendor)
 VTABLE_ENTRY(CPUMGetHostMicroarch)
+VTABLE_ENTRY(CPUMGetGuestCpuVendor)
+VTABLE_ENTRY(CPUMGetGuestArch)
+VTABLE_ENTRY(CPUMGetGuestMicroarch)
 
 VTABLE_RESERVED(pfnCPUMR3Reserved1)

trunk/include/VBox/vmm/vmmr3vtable.h

@@ -72 +72 @@
 
 /** Magic and version for the VMM vtable.  (Magic: Emmet Cohen)   */
-#define VMMR3VTABLE_MAGIC_VERSION         RT_MAKE_U64(0x19900525, 0x00040000)
+#define VMMR3VTABLE_MAGIC_VERSION         RT_MAKE_U64(0x19900525, 0x00050000)
 /** Compatibility mask: These bits must match - magic and major version. */
 #define VMMR3VTABLE_MAGIC_VERSION_MASK    RT_MAKE_U64(0xffffffff, 0xffff0000)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs-armv8.cpp

@@ -173 +173 @@
 
 /**
+ * Gets the guest CPU architecture.
+ *
+ * @returns CPU architecture.
+ * @param   pVM     The cross context VM structure.
+ */
+VMMDECL(CPUMARCH) CPUMGetGuestArch(PCVM pVM)
+{
+    RT_NOREF(pVM);
+    return kCpumArch_Arm; /* Static as we are in the ARM VMM module here. */
+}
+
+
+/**
  * Gets the guest CPU microarchitecture.
  *

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

@@ -1097 +1097 @@
 {
     return (CPUMCPUVENDOR)pVM->cpum.s.GuestFeatures.enmCpuVendor;
+}
+
+
+/**
+ * Gets the guest CPU architecture.
+ *
+ * @returns CPU architecture.
+ * @param   pVM     The cross context VM structure.
+ */
+VMMDECL(CPUMARCH) CPUMGetGuestArch(PCVM pVM)
+{
+    RT_NOREF(pVM);
+    return kCpumArch_X86; /* Static as we are in the x86 VMM module here. */
 }
 

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

@@ -1193 +1193 @@
     Log(("pdmR3DevHlp_PhysChangeMemBalloon: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnCpuGetGuestArch} */
+static DECLCALLBACK(CPUMARCH) pdmR3DevHlp_CpuGetGuestArch(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    LogFlow(("pdmR3DevHlp_CpuGetGuestArch: caller='%s'/%d\n",
+             pDevIns->pReg->szName, pDevIns->iInstance));
+
+    CPUMARCH enmArch = CPUMGetGuestArch(pVM);
+
+    Log(("pdmR3DevHlp_CpuGetGuestArch: caller='%s'/%d: returns %u\n", pDevIns->pReg->szName, pDevIns->iInstance, enmArch));
+    return enmArch;
 }
 
@@ -5197 +5212 @@
     pdmR3DevHlp_PhysBulkGCPhys2CCPtrReadOnly,
     pdmR3DevHlp_PhysBulkReleasePageMappingLocks,
+    pdmR3DevHlp_CpuGetGuestArch,
     pdmR3DevHlp_CpuGetGuestMicroarch,
     pdmR3DevHlp_CpuGetGuestAddrWidths,
@@ -5595 +5611 @@
     pdmR3DevHlp_PhysBulkGCPhys2CCPtrReadOnly,
     pdmR3DevHlp_PhysBulkReleasePageMappingLocks,
+    pdmR3DevHlp_CpuGetGuestArch,
     pdmR3DevHlp_CpuGetGuestMicroarch,
     pdmR3DevHlp_CpuGetGuestAddrWidths,
@@ -6313 +6330 @@
     pdmR3DevHlp_PhysBulkGCPhys2CCPtrReadOnly,
     pdmR3DevHlp_PhysBulkReleasePageMappingLocks,
+    pdmR3DevHlp_CpuGetGuestArch,
     pdmR3DevHlp_CpuGetGuestMicroarch,
     pdmR3DevHlp_CpuGetGuestAddrWidths,

trunk/src/VBox/VMM/VMMR3/VMMR3.def

@@ -107 +107 @@
 
     CPUMGetHostMicroarch
+    CPUMGetGuestArch
     CPUMGetGuestMicroarch