Changeset 101103 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 13, 2023 11:42:14 AM (15 months ago)

Author:

vboxsync

Message:

VMM: Started implemented the CPU ID parsing and overriding bits as well as logging host and guest CPU features, bugref:10525

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR3/CPUM-armv8.cpp (modified) (4 diffs)
• VMMR3/CPUMR3CpuId-armv8.cpp (added)
• include/CPUMInternal-armv8.h (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -365 +365 @@
         VMMR3/CPUM-armv8.cpp \
         VMMR3/CPUMDbg-armv8.cpp \
+        VMMR3/CPUMR3CpuId-armv8.cpp \
         VMMR3/CPUMR3Db-armv8.cpp \
         VMMR3/DBGF.cpp \

trunk/src/VBox/VMM/VMMR3/CPUM-armv8.cpp

@@ -128 +128 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
+#if defined(RT_ARCH_ARM64)
+/** Host CPU features. */
+DECL_HIDDEN_DATA(CPUHOSTFEATURES) g_CpumHostFeatures;
+#endif
+
 /**
  * System register ranges.
@@ -375 +380 @@
     DBGFR3InfoRegisterInternalEx(pVM, "cpumguest",        "Displays the guest cpu state.",
                                  &cpumR3InfoGuest, DBGFINFO_FLAGS_ALL_EMTS);
+    DBGFR3InfoRegisterInternalEx(pVM, "cpumguestinstr",   "Displays the current guest instruction.",
+                                 &cpumR3InfoGuestInstr, DBGFINFO_FLAGS_ALL_EMTS);
+    DBGFR3InfoRegisterInternal(  pVM, "cpuid",            "Displays the guest cpuid information.",
+                                 &cpumR3CpuIdInfo);
 
     rc = cpumR3DbgInit(pVM);
@@ -949 +958 @@
     if (cCores)
         LogRel(("CPUM: Physical host cores: %u\n", (unsigned)cCores));
-    RT_NOREF(pVM);
-#if 0 /** @todo Someting similar. */
     LogRel(("************************* CPUID dump ************************\n"));
     DBGFR3Info(pVM->pUVM, "cpuid", "verbose", DBGFR3InfoLogRelHlp());
@@ -956 +963 @@
     DBGFR3_INFO_LOG_SAFE(pVM, "cpuid", "verbose"); /* macro */
     LogRel(("******************** End of CPUID dump **********************\n"));
-#endif
 
     /*

trunk/src/VBox/VMM/include/CPUMInternal-armv8.h

@@ -100 +100 @@
 typedef struct CPUM
 {
+    /** The (more) portable CPUID level. */
+    uint8_t                 u8PortableCpuIdLevel;
     /** Indicates that a state restore is pending.
      * This is used to verify load order dependencies (PGM). */
     bool                    fPendingRestore;
-    uint8_t                 abPadding0[7];
+    uint8_t                 abPadding0[6];
 
+    /** Align to 64-byte boundary. */
+    uint8_t                 abPadding1[56];
+
+    /** Host CPU feature information.
+     * Externaly visible via the VM structure, aligned on 64-byte boundrary. */
+    CPUMFEATURES            HostFeatures;
+    /** Guest CPU feature information.
+     * Externaly visible via that VM structure, aligned with HostFeatures. */
+    CPUMFEATURES            GuestFeatures;
     /** Guest CPU info. */
     CPUMINFO                GuestInfo;
-    /** @todo */
+    /** Host CPU ID registers. */
+    CPUMIDREGS              HostIdRegs;
+    /** Guest CPU ID registers. */
+    CPUMIDREGS              GuestIdRegs;
 
     /** @name System register statistics.
@@ -121 +135 @@
 } CPUM;
 #ifndef VBOX_FOR_DTRACE_LIB
-/** @todo Compile time size/alignment assertions. */
+AssertCompileMemberOffset(CPUM, HostFeatures, 64);
+AssertCompileMemberOffset(CPUM, GuestFeatures, 112);
 #endif
 /** Pointer to the CPUM instance data residing in the shared VM structure. */
@@ -159 +174 @@
 DECLHIDDEN(int)       cpumR3DbgInit(PVM pVM);
 DECLHIDDEN(int)       cpumR3SysRegStrictInitChecks(void);
+
+DECLCALLBACK(void)    cpumR3CpuIdInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 # endif