Changeset 91266 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 15, 2021 10:26:50 PM (4 years ago)

Author:

vboxsync

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

146925

Message:

VMM/CPUM: Moved CPUIDs and MSRs from the hyper heap and into the VM structure (might not be such a great idea for MSRs actually). bugref:10093

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (2 diffs)
• CPUMAllRegs.cpp (modified) (2 diffs)
• MMAllHyper.cpp (modified) (2 diffs)

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

@@ -5517 +5517 @@
      * Binary lookup.
      */
-    uint32_t        cRanges   = pVM->cpum.s.GuestInfo.cMsrRanges;
+    uint32_t        cRanges   = RT_MIN(pVM->cpum.s.GuestInfo.cMsrRanges, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aMsrRanges));
     if (!cRanges)
         return NULL;
-    PCPUMMSRRANGE   paRanges  = pVM->cpum.s.GuestInfo.CTX_SUFF(paMsrRanges);
+    PCPUMMSRRANGE   paRanges  = pVM->cpum.s.GuestInfo.aMsrRanges;
     for (;;)
     {
@@ -5550 +5550 @@
      * Linear lookup to verify the above binary search.
      */
-    uint32_t        cLeft = pVM->cpum.s.GuestInfo.cMsrRanges;
-    PCPUMMSRRANGE   pCur  = pVM->cpum.s.GuestInfo.CTX_SUFF(paMsrRanges);
+    uint32_t        cLeft = RT_MIN(pVM->cpum.s.GuestInfo.cMsrRanges, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aMsrRanges));
+    PCPUMMSRRANGE   pCur  = pVM->cpum.s.GuestInfo.aMsrRanges;
     while (cLeft-- > 0)
     {

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

@@ -781 +781 @@
 PCPUMCPUIDLEAF cpumCpuIdGetLeaf(PVM pVM, uint32_t uLeaf)
 {
-    unsigned            iEnd     = pVM->cpum.s.GuestInfo.cCpuIdLeaves;
+    unsigned            iEnd     = RT_MIN(pVM->cpum.s.GuestInfo.cCpuIdLeaves, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aCpuIdLeaves));
     if (iEnd)
     {
         unsigned        iStart   = 0;
-        PCPUMCPUIDLEAF  paLeaves = pVM->cpum.s.GuestInfo.CTX_SUFF(paCpuIdLeaves);
+        PCPUMCPUIDLEAF  paLeaves = pVM->cpum.s.GuestInfo.aCpuIdLeaves;
         for (;;)
         {
@@ -838 +838 @@
 PCPUMCPUIDLEAF cpumCpuIdGetLeafEx(PVM pVM, uint32_t uLeaf, uint32_t uSubLeaf, bool *pfExactSubLeafHit)
 {
-    unsigned            iEnd     = pVM->cpum.s.GuestInfo.cCpuIdLeaves;
+    unsigned            iEnd     = RT_MIN(pVM->cpum.s.GuestInfo.cCpuIdLeaves, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aCpuIdLeaves));
     if (iEnd)
     {
         unsigned        iStart   = 0;
-        PCPUMCPUIDLEAF  paLeaves = pVM->cpum.s.GuestInfo.CTX_SUFF(paCpuIdLeaves);
+        PCPUMCPUIDLEAF  paLeaves = pVM->cpum.s.GuestInfo.aCpuIdLeaves;
         for (;;)
         {

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

@@ -338 +338 @@
 
 
+#if 0
 /**
  * Duplicates a block of memory.
@@ -359 +360 @@
     return rc;
 }
+#endif