Changeset 49355 in vbox for trunk

Timestamp:

Nov 1, 2013 8:25:19 AM (11 years ago)

Author:

vboxsync

Message:

VMM/CPUM: MSR_P4_LASTBRANCH_* is not Intel-specific

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (5 diffs)

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

@@ -1113 +1113 @@
          * well, at least bulldozer have them.  Windows 7 is querying them.
          * XP has been observed querying MSR_IA32_MC0_CTL.
+         * XP64 has been observed querying MSR_P4_LASTBRANCH_0 (also on AMD).
          */
         case MSR_IA32_BIOS_SIGN_ID:         /* fam/mod >= 6_01 */
@@ -1120 +1121 @@
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MC0_STATUS:
+        case MSR_P4_LASTBRANCH_0:
+        case MSR_P4_LASTBRANCH_1:
+        case MSR_P4_LASTBRANCH_2:
+        case MSR_P4_LASTBRANCH_3:
             *puValue = 0;
             break;
@@ -1130 +1135 @@
         case MSR_P5_MC_TYPE:
         case MSR_P4_LASTBRANCH_TOS: /** @todo Are these branch regs still here on more recent CPUs? The documentation doesn't mention them for several archs. */
-        case MSR_P4_LASTBRANCH_0:
-        case MSR_P4_LASTBRANCH_1:
-        case MSR_P4_LASTBRANCH_2:
-        case MSR_P4_LASTBRANCH_3:
         case MSR_IA32_PERFEVTSEL0:          /* NetWare 6.5 wants the these four. (Bet on AMD as well.) */
         case MSR_IA32_PERFEVTSEL1:
@@ -1289 +1290 @@
 VMMDECL(int) CPUMSetGuestMsr(PVMCPU pVCpu, uint32_t idMsr, uint64_t uValue)
 {
-    LogFlow(("CPUSetGuestMsr: %#x <- %#llx\n", idMsr, uValue));
+    LogFlow(("CPUMSetGuestMsr: %#x <- %#llx\n", idMsr, uValue));
 
     /*
@@ -1484 +1485 @@
         case MSR_IA32_DEBUGCTL:
             /** @todo virtualize DEBUGCTL and relatives */
-            break;
-
-        case 0x1db:  /* quick fix for winxp64. */
             break;