Changeset 10208 in vbox for trunk/src

Timestamp:

Jul 4, 2008 9:17:59 AM (16 years ago)

Author:

vboxsync

Message:

Cpuid 0x800000005 & 0x800000006 contain information about L1, L2 & L3 cache and TLB identifiers. Safe to pass on to the guest.

File:

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

trunk/src/VBox/VMM/CPUM.cpp

@@ -343 +343 @@
 
     /*
-     * Determin the default.
+     * Determine the default.
      *
      * Intel returns values of the highest standard function, while AMD
@@ -352 +352 @@
              &pCPUM->GuestCpuIdDef.eax, &pCPUM->GuestCpuIdDef.ebx,
              &pCPUM->GuestCpuIdDef.ecx, &pCPUM->GuestCpuIdDef.edx);
+
+    /* Cpuid 0x800000005 & 0x800000006 contain information about L1, L2 & L3 cache and TLB identifiers. 
+     * Safe to pass on to the guest.
+     *
+     * Intel: 0x800000005 reserved
+     *        0x800000006 L2 cache information
+     * AMD:   0x800000005 L1 cache information
+     *        0x800000006 L2/L3 cache information
+     */
 
     /*
@@ -365 +374 @@
         pCPUM->aGuestCpuIdStd[i] = pCPUM->GuestCpuIdDef;
 
-    if (pCPUM->aGuestCpuIdExt[0].eax > UINT32_C(0x80000004))
-        pCPUM->aGuestCpuIdExt[0].eax = UINT32_C(0x80000004);
+    if (pCPUM->aGuestCpuIdExt[0].eax > UINT32_C(0x80000006))
+        pCPUM->aGuestCpuIdExt[0].eax = UINT32_C(0x80000006);
     for (i = pCPUM->aGuestCpuIdExt[0].eax >= UINT32_C(0x80000000)
            ? pCPUM->aGuestCpuIdExt[0].eax - UINT32_C(0x80000000) + 1
@@ -376 +385 @@
      * Workaround for missing cpuid(0) patches: If we miss to patch a cpuid(0).eax then
      * Linux tries to determine the number of processors from (cpuid(4).eax >> 26) + 1.
-     * We don't support more than 1 processor.
+     * We currently don't support more than 1 processor.
      */
     pCPUM->aGuestCpuIdStd[4].eax = 0;