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

Timestamp:

Mar 28, 2018 6:32:43 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HM: Fixes to MSRPM bit accesses. Implemented merging of guest and nested-guest MSRPMs. Other nits and cleanups.

File:

• trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (4 diffs)

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

@@ -317 +317 @@
  *                      returned in @a pbOffMsrpm.
  */
-VMM_INT_DECL(int) HMSvmGetMsrpmOffsetAndBit(uint32_t idMsr, uint16_t *pbOffMsrpm, uint32_t *puMsrpmBit)
+VMM_INT_DECL(int) HMSvmGetMsrpmOffsetAndBit(uint32_t idMsr, uint16_t *pbOffMsrpm, uint8_t *puMsrpmBit)
 {
     Assert(pbOffMsrpm);
@@ -335 +335 @@
     {
         /* Pentium-compatible MSRs. */
-        *pbOffMsrpm = 0;
-        *puMsrpmBit = idMsr << 1;
+        uint32_t const bitoffMsr = idMsr << 1;
+        *pbOffMsrpm = bitoffMsr >> 3;
+        *puMsrpmBit = bitoffMsr & 7;
         return VINF_SUCCESS;
     }
@@ -344 +345 @@
     {
         /* AMD Sixth Generation x86 Processor MSRs. */
-        *pbOffMsrpm = 0x800;
-        *puMsrpmBit = (idMsr - 0xc0000000) << 1;
+        uint32_t const bitoffMsr = (idMsr - 0xc0000000) << 1;
+        *pbOffMsrpm = 0x800 + (bitoffMsr >> 3);
+        *puMsrpmBit = bitoffMsr & 7;
         return VINF_SUCCESS;
     }
@@ -353 +355 @@
     {
         /* AMD Seventh and Eighth Generation Processor MSRs. */
-        *pbOffMsrpm = 0x1000;
-        *puMsrpmBit = (idMsr - 0xc0010000) << 1;
+        uint32_t const bitoffMsr = (idMsr - 0xc0010000) << 1;
+        *pbOffMsrpm = 0x1000 + (bitoffMsr >> 3);
+        *puMsrpmBit = bitoffMsr & 7;
         return VINF_SUCCESS;
     }