Changeset 5287 in vbox

Timestamp:

Oct 14, 2007 5:30:14 PM (17 years ago)

Author:

vboxsync

Message:

2 more cpuid leaves for the centaur part. letting 0xc0000002 thru unmodified (but static).

Location:

trunk

Files:

trunk/include/VBox/vm.h

-              r5285
+              r5287
 #endif
 #ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
         char        padding[3606];                                  /* multiple of 32 */
+        char        padding[3638];                                  /* multiple of 32 */
 #else
         char        padding[HC_ARCH_BITS == 32 ? 3456 : 3584];      /* multiple of 32 */
+        char        padding[HC_ARCH_BITS == 32 ? 3488 : 3616];      /* multiple of 32 */
 #endif
     } cpum;

-              r5285
+              r5287
     alignb 32
 %ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
     .cpum                 resb 3106
+    .cpum                 resb 3138
 %elif HC_ARCH_BITS == 32
     .cpum                 resb 3456
+    .cpum                 resb 3488
 %else
     .cpum                 resb 3584
+    .cpum                 resb 3616
 %endif
     .vmm                  resb 1024

-              r5285
+              r5287
 *******************************************************************************/
 /** The saved state version. */
 #define CPUM_SAVED_STATE_VERSION    4
+#define CPUM_SAVED_STATE_VERSION    5
 …
      * The important part here (we think) is to make sure the 0xc0000000
      * function returns 0xc0000001. As for the features, we don't currently
+     * let on about any of those...
+     * let on about any of those... 0xc0000002 seems to be some
+     * temperature/hz/++ stuff, include it as well (static).
      */
     if (    pCPUM->aGuestCpuIdCentaur[0].eax >= UINT32_C(0xc0000000)
         &&  pCPUM->aGuestCpuIdCentaur[0].eax <= UINT32_C(0xc0000004))
+    {
         pCPUM->aGuestCpuIdCentaur[0].eax = UINT32_C(0xc0000001);
+        pCPUM->aGuestCpuIdCentaur[0].eax = RT_MIN(pCPUM->aGuestCpuIdCentaur[0].eax, UINT32_C(0xc0000002));
         pCPUM->aGuestCpuIdCentaur[1].edx = 0; /* all features hidden */
+        for (i = 2; i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur); i++)
+        for (i = pCPUM->aGuestCpuIdCentaur[0].eax - UINT32_C(0xc0000000);
+             i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur);
+             i++)
             pCPUM->aGuestCpuIdCentaur[i] = pCPUM->GuestCpuIdDef;
+    }

r5285	r5287
333	333	CPUMCPUID aGuestCpuIdExt[10];
334	334	/** The centaur set of CpuId leafs. */
335		CPUMCPUID aGuestCpuIdCentaur[2];
	335	CPUMCPUID aGuestCpuIdCentaur[4];
336	336	/** The default set of CpuId leafs. */
337	337	CPUMCPUID GuestCpuIdDef;

Note: See TracChangeset for help on using the changeset viewer.