Changeset 10569 in vbox

Timestamp:

Jul 12, 2008 3:59:27 PM (17 years ago)

Author:

vboxsync

Message:

Expose cpuid 2-5 minus dangerous bits.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (2 diffs)
• CPUMInternal.h (modified) (1 diff)
• CPUMInternal.mac (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -343 +343 @@
     pCPUM->aGuestCpuIdStd[1].ebx &= 0x0000ffff;
 
+    /* Cpuid 2: 
+     * Intel: Cache and TLB information
+     * AMD:   Reserved
+     * Safe to expose
+     */
+
+    /* Cpuid 3: 
+     * Intel: EAX, EBX - reserved
+     *        ECX, EDX - Processor Serial Number if available, otherwise reserved
+     * AMD:   Reserved
+     * Safe to expose
+     */
+    if (!(pCPUM->aGuestCpuIdStd[1].edx & X86_CPUID_FEATURE_EDX_PSN))
+        pCPUM->aGuestCpuIdStd[3].ecx = pCPUM->aGuestCpuIdStd[3].edx = 0;
+
+    /* Cpuid 4: 
+     * Intel: Deterministic Cache Parameters Leaf
+     *        Note: Depends on the ECX input! -> Feeling rather lazy now, so we just return 0
+     * AMD:   Reserved
+     * Safe to expose, except for EAX:
+     *      Bits 25-14: Maximum number of threads sharing this cache in a physical package (see note)**
+     *      Bits 31-26: Maximum number of processor cores in this physical package**
+     */
+    pCPUM->aGuestCpuIdStd[4].ecx = pCPUM->aGuestCpuIdStd[4].edx = 0;
+    pCPUM->aGuestCpuIdStd[4].eax = pCPUM->aGuestCpuIdStd[4].ebx = 0;
+
+    /* Cpuid 5:     Monitor/mwait Leaf
+     * Intel: ECX, EDX - reserved
+     *        EAX, EBX - Smallest and largest monitor line size
+     * AMD:   EDX - reserved
+     *        EAX, EBX - Smallest and largest monitor line size
+     *        ECX - extensions (ignored for now)
+     * Safe to expose
+     */
+    pCPUM->aGuestCpuIdStd[5].ecx = pCPUM->aGuestCpuIdStd[5].edx = 0;
+
     /*
      * Determine the default.
@@ -739 +775 @@
     uint32_t cElements;
     int rc = SSMR3GetU32(pSSM, &cElements); AssertRCReturn(rc, rc);
-    if (cElements != ELEMENTS(pVM->cpum.s.aGuestCpuIdStd))
+    /* Support old saved states with a smaller standard cpuid array. */
+    if (cElements > ELEMENTS(pVM->cpum.s.aGuestCpuIdStd))
         return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-    SSMR3GetMem(pSSM, &pVM->cpum.s.aGuestCpuIdStd[0], sizeof(pVM->cpum.s.aGuestCpuIdStd));
+    SSMR3GetMem(pSSM, &pVM->cpum.s.aGuestCpuIdStd[0], cElements*sizeof(pVM->cpum.s.aGuestCpuIdStd[0]));
 
     rc = SSMR3GetU32(pSSM, &cElements); AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/CPUMInternal.h

@@ -336 +336 @@
 
     /** The standard set of CpuId leafs. */
-    CPUMCPUID               aGuestCpuIdStd[5];
+    CPUMCPUID               aGuestCpuIdStd[6];
     /** The extended set of CpuId leafs. */
     CPUMCPUID               aGuestCpuIdExt[10];

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -420 +420 @@
 
     ; CPUID leafs
-    .aGuestCpuIdStd       resb    16*5
+    .aGuestCpuIdStd       resb    16*6
     .aGuestCpuIdExt       resb    16*10
     .aGuestCpuIdCentaur   resb    16*4