Changeset 5285

Timestamp:

10/14/07 01:55:58 (1 year ago)

Author:

vboxsync

Message:

deal with the centaur cpuid stuff.

Files:

• trunk/include/VBox/cpum.h (modified) (1 diff)
• trunk/include/VBox/vm.h (modified) (1 diff)
• trunk/include/VBox/vm.mac (modified) (2 diffs)
• trunk/src/VBox/VMM/CPUM.cpp (modified) (11 diffs)
• trunk/src/VBox/VMM/CPUMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/CPUMInternal.mac (modified) (2 diffs)
• trunk/src/VBox/VMM/PATM/PATMA.asm (modified) (3 diffs)
• trunk/src/VBox/VMM/PATM/PATMA.h (modified) (2 diffs)
• trunk/src/VBox/VMM/PATM/PATMA.mac (modified) (3 diffs)
• trunk/src/VBox/VMM/PATM/PATMPatch.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (4 diffs)

trunk/include/VBox/cpum.h

@@ -291 +291 @@
-CPUMDECL(GCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdStdGCPtr(PVM pVM);
-CPUMDECL(GCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdExtGCPtr(PVM pVM);
+CPUMDECL(GCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurGCPtr(PVM pVM);
-CPUMDECL(GCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdDefGCPtr(PVM pVM);
-CPUMDECL(uint32_t)  CPUMGetGuestCpuIdStdMax(PVM pVM);
-CPUMDECL(uint32_t)  CPUMGetGuestCpuIdExtMax(PVM pVM);
+CPUMDECL(uint32_t)  CPUMGetGuestCpuIdCentaurMax(PVM pVM);
-CPUMDECL(CPUMSELREGHID *) CPUMGetGuestTRHid(PVM pVM);
-/** @} */

trunk/include/VBox/vm.h

@@ -357 +357 @@
-#endif
-#ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
-584
+606
-#else
-24 : 3552
+56 : 3584
-#endif
-    } cpum;

trunk/include/VBox/vm.mac

@@ -6 +6 @@
-;
-;  Copyright (C) 2006-2007 innotek GmbH
- 
+
-;  This file is part of VirtualBox Open Source Edition (OSE), as
-;  available from http://www.virtualbox.org. This file is free software;
@@ -79 +79 @@
-    alignb 32
-%ifdef VBOX_WITH_HYBIRD_32BIT_KERNEL
+    .cpum                 resb 3106
+%elif HC_ARCH_BITS == 32
+    .cpum                 resb 3456
+%else
-    .cpum                 resb 3584
-%elif HC_ARCH_BITS == 32 
-    .cpum                 resb 3424
-%else
-    .cpum                 resb 3552
-%endif
-    .vmm                  resb 1024

trunk/src/VBox/VMM/CPUM.cpp

@@ -46 +46 @@
-*******************************************************************************/
-/** The saved state version. */
-3
+4
-
-
@@ -194 +194 @@
-     * Get the host CPUIDs.
-     */
-
+RT_
-        ASMCpuId(i,
-                 &pCPUM->aGuestCpuIdStd[i].eax, &pCPUM->aGuestCpuIdStd[i].ebx,
-                 &pCPUM->aGuestCpuIdStd[i].ecx, &pCPUM->aGuestCpuIdStd[i].edx);
-
+RT_
-        ASMCpuId(0x80000000 + i,
-                 &pCPUM->aGuestCpuIdExt[i].eax, &pCPUM->aGuestCpuIdExt[i].ebx,
-                 &pCPUM->aGuestCpuIdExt[i].ecx, &pCPUM->aGuestCpuIdExt[i].edx);
+    for (i = 0; i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur); i++)
+        ASMCpuId(0xc0000000 + i,
+                 &pCPUM->aGuestCpuIdCentaur[i].eax, &pCPUM->aGuestCpuIdCentaur[i].ebx,
+                 &pCPUM->aGuestCpuIdCentaur[i].ecx, &pCPUM->aGuestCpuIdCentaur[i].edx);
+
-
-    /*
@@ -246 +251 @@
-                                       | 0;
-
-#if 1 /* we didn't used to do this, but I guess we should */
-    /* ASSUMES that this is ALWAYS the AMD define feature set if present. */
-    pCPUM->aGuestCpuIdExt[1].edx      &= X86_CPUID_AMD_FEATURE_EDX_FPU
@@ -270 +274 @@
-                                       | X86_CPUID_AMD_FEATURE_EDX_FXSR
-                                       | X86_CPUID_AMD_FEATURE_EDX_FFXSR
-definitely no
+not ye
-                                       | X86_CPUID_AMD_FEATURE_EDX_3DNOW_EX
-                                       | X86_CPUID_AMD_FEATURE_EDX_3DNOW
@@ -276 +280 @@
-    pCPUM->aGuestCpuIdExt[1].ecx      &= 0//X86_CPUID_AMD_FEATURE_ECX_SVM    - not virtualized.
-                                       | 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    /*
-     * Hide HTT, multicode, SMP, whatever.
@@ -298 +288 @@
-
-    /*
-
-
+
+
+
+
+
-     */
-    ASMCpuId(pCPUM->aGuestCpuIdStd[0].eax + 10,
@@ -305 +298 @@
-             &pCPUM->GuestCpuIdDef.ecx, &pCPUM->GuestCpuIdDef.edx);
-
+    /*
+     * Limit it the number of entries and fill the remaining with the defaults.
+     *
+     * The limits are masking off stuff about power saving and similar, this
+     * is perhaps a bit crudely done as there is probably some relatively harmless
+     * info too in these leaves (like words about having a constant TSC).
+     */
-    if (pCPUM->aGuestCpuIdStd[0].eax > 2)
-        pCPUM->aGuestCpuIdStd[0].eax = 2;
-
-
-
-
-
-
-
-
-
-
+
-        pCPUM->aGuestCpuIdStd[i] = pCPUM->GuestCpuIdDef;
-
+
+
+
+
+
+
+
-        pCPUM->aGuestCpuIdExt[i] = pCPUM->GuestCpuIdDef;
+
+    /*
+     * Centaur stuff (VIA).
+     *
+     * 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...
+     */
+    if (    pCPUM->aGuestCpuIdCentaur[0].eax >= UINT32_C(0xc0000000)
+        &&  pCPUM->aGuestCpuIdCentaur[0].eax <= UINT32_C(0xc0000004))
+    {
+        pCPUM->aGuestCpuIdCentaur[0].eax = UINT32_C(0xc0000001);
+        pCPUM->aGuestCpuIdCentaur[1].edx = 0; /* all features hidden */
+        for (i = 2; i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur); i++)
+            pCPUM->aGuestCpuIdCentaur[i] = pCPUM->GuestCpuIdDef;
+    }
+    else
+        for (i = 0; i < RT_ELEMENTS(pCPUM->aGuestCpuIdCentaur); i++)
+            pCPUM->aGuestCpuIdCentaur[i] = pCPUM->GuestCpuIdDef;
+
-
-    /*
@@ -361 +378 @@
-
-        /* next */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-        pCpuId = &pCPUM->aGuestCpuIdExt[0];
-        cElements = ELEMENTS(pCPUM->aGuestCpuIdExt);
-        i = 0x80000000;
-    }
-
@@ -536 +562 @@
-    SSMR3PutMem(pSSM, &pVM->cpum.s.aGuestCpuIdExt[0], sizeof(pVM->cpum.s.aGuestCpuIdExt));
-
+    SSMR3PutU32(pSSM, ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur));
+    SSMR3PutMem(pSSM, &pVM->cpum.s.aGuestCpuIdCentaur[0], sizeof(pVM->cpum.s.aGuestCpuIdCentaur));
+
-    SSMR3PutMem(pSSM, &pVM->cpum.s.GuestCpuIdDef, sizeof(pVM->cpum.s.GuestCpuIdDef));
-
@@ -587 +616 @@
-        return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-    SSMR3GetMem(pSSM, &pVM->cpum.s.aGuestCpuIdExt[0], sizeof(pVM->cpum.s.aGuestCpuIdExt));
+
+    rc = SSMR3GetU32(pSSM, &cElements); AssertRCReturn(rc, rc);
+    if (cElements != RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur))
+        return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
+    SSMR3GetMem(pSSM, &pVM->cpum.s.aGuestCpuIdCentaur[0], sizeof(pVM->cpum.s.aGuestCpuIdCentaur));
-
-    SSMR3GetMem(pSSM, &pVM->cpum.s.GuestCpuIdDef, sizeof(pVM->cpum.s.GuestCpuIdDef));
@@ -1491 +1525 @@
-                        (uECX >> 0) & 0xff);
-    }
+
+
+    /*
+     * Centaur.
+     */
+    unsigned cCentaurMax = pVM->cpum.s.aGuestCpuIdCentaur[0].eax & 0xffff;
+
+    pHlp->pfnPrintf(pHlp,
+                    "\n"
+                    "         RAW Centaur CPUIDs\n"
+                    "     Function  eax      ebx      ecx      edx\n");
+    for (unsigned i = 0; i <= RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur); i++)
+    {
+        Guest = pVM->cpum.s.aGuestCpuIdCentaur[i];
+        ASMCpuId(0xc0000000 | i, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
+
+        pHlp->pfnPrintf(pHlp,
+                        "Gst: %08x  %08x %08x %08x %08x%s\n"
+                        "Hst:           %08x %08x %08x %08x\n",
+                        0xc0000000 | i, Guest.eax, Guest.ebx, Guest.ecx, Guest.edx,
+                        i <= cCentaurMax ? "" : "*",
+                        Host.eax, Host.ebx, Host.ecx, Host.edx);
+    }
+
+    /*
+     * Understandable output
+     */
+    if (iVerbosity && cCentaurMax >= 0)
+    {
+        Guest = pVM->cpum.s.aGuestCpuIdCentaur[0];
+        pHlp->pfnPrintf(pHlp,
+                        "Centaur Supports:                0xc0000000-%#010x\n",
+                        Guest.eax);
+    }
+
+    if (iVerbosity && cCentaurMax >= 1)
+    {
+        ASMCpuId(0xc0000001, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
+        uint32_t uEdxGst = pVM->cpum.s.aGuestCpuIdExt[1].edx;
+        uint32_t uEdxHst = Host.edx;
+
+        if (iVerbosity == 1)
+        {
+            pHlp->pfnPrintf(pHlp, "Centaur Features EDX:           ");
+            if (uEdxGst & RT_BIT(0))   pHlp->pfnPrintf(pHlp, " AIS");
+            if (uEdxGst & RT_BIT(1))   pHlp->pfnPrintf(pHlp, " AIS-E");
+            if (uEdxGst & RT_BIT(2))   pHlp->pfnPrintf(pHlp, " RNG");
+            if (uEdxGst & RT_BIT(3))   pHlp->pfnPrintf(pHlp, " RNG-E");
+            if (uEdxGst & RT_BIT(4))   pHlp->pfnPrintf(pHlp, " LH");
+            if (uEdxGst & RT_BIT(5))   pHlp->pfnPrintf(pHlp, " FEMMS");
+            if (uEdxGst & RT_BIT(6))   pHlp->pfnPrintf(pHlp, " ACE");
+            if (uEdxGst & RT_BIT(7))   pHlp->pfnPrintf(pHlp, " ACE-E");
+            /* possibly indicating MM/HE and MM/HE-E on older chips... */
+            if (uEdxGst & RT_BIT(8))   pHlp->pfnPrintf(pHlp, " ACE2");
+            if (uEdxGst & RT_BIT(9))   pHlp->pfnPrintf(pHlp, " ACE2-E");
+            if (uEdxGst & RT_BIT(10))  pHlp->pfnPrintf(pHlp, " PHE");
+            if (uEdxGst & RT_BIT(11))  pHlp->pfnPrintf(pHlp, " PHE-E");
+            if (uEdxGst & RT_BIT(12))  pHlp->pfnPrintf(pHlp, " PMM");
+            if (uEdxGst & RT_BIT(13))  pHlp->pfnPrintf(pHlp, " PMM-E");
+            for (unsigned iBit = 14; iBit < 32; iBit++)
+                if (uEdxGst & RT_BIT(iBit))
+                    pHlp->pfnPrintf(pHlp, " %d", iBit);
+            pHlp->pfnPrintf(pHlp, "\n");
+        }
+        else
+        {
+            pHlp->pfnPrintf(pHlp, "Mnemonic - Description                 = guest (host)\n");
+            pHlp->pfnPrintf(pHlp, "AIS - Alternate Instruction Set        = %d (%d)\n",  !!(uEdxGst & RT_BIT( 0)),  !!(uEdxHst & RT_BIT( 0)));
+            pHlp->pfnPrintf(pHlp, "AIS-E - AIS enabled                    = %d (%d)\n",  !!(uEdxGst & RT_BIT( 1)),  !!(uEdxHst & RT_BIT( 1)));
+            pHlp->pfnPrintf(pHlp, "RNG - Random Number Generator          = %d (%d)\n",  !!(uEdxGst & RT_BIT( 2)),  !!(uEdxHst & RT_BIT( 2)));
+            pHlp->pfnPrintf(pHlp, "RNG-E - RNG enabled                    = %d (%d)\n",  !!(uEdxGst & RT_BIT( 3)),  !!(uEdxHst & RT_BIT( 3)));
+            pHlp->pfnPrintf(pHlp, "LH - LongHaul MSR 0000_110Ah           = %d (%d)\n",  !!(uEdxGst & RT_BIT( 4)),  !!(uEdxHst & RT_BIT( 4)));
+            pHlp->pfnPrintf(pHlp, "FEMMS - FEMMS                          = %d (%d)\n",  !!(uEdxGst & RT_BIT( 5)),  !!(uEdxHst & RT_BIT( 5)));
+            pHlp->pfnPrintf(pHlp, "ACE - Advanced Cryptography Engine     = %d (%d)\n",  !!(uEdxGst & RT_BIT( 6)),  !!(uEdxHst & RT_BIT( 6)));
+            pHlp->pfnPrintf(pHlp, "ACE-E - ACE enabled                    = %d (%d)\n",  !!(uEdxGst & RT_BIT( 7)),  !!(uEdxHst & RT_BIT( 7)));
+            /* possibly indicating MM/HE and MM/HE-E on older chips... */
+            pHlp->pfnPrintf(pHlp, "ACE2 - Advanced Cryptography Engine 2  = %d (%d)\n",  !!(uEdxGst & RT_BIT( 8)),  !!(uEdxHst & RT_BIT( 8)));
+            pHlp->pfnPrintf(pHlp, "ACE2-E - ACE enabled                   = %d (%d)\n",  !!(uEdxGst & RT_BIT( 9)),  !!(uEdxHst & RT_BIT( 9)));
+            pHlp->pfnPrintf(pHlp, "PHE - Hash Engine                      = %d (%d)\n",  !!(uEdxGst & RT_BIT(10)),  !!(uEdxHst & RT_BIT(10)));
+            pHlp->pfnPrintf(pHlp, "PHE-E - PHE enabled                    = %d (%d)\n",  !!(uEdxGst & RT_BIT(11)),  !!(uEdxHst & RT_BIT(11)));
+            pHlp->pfnPrintf(pHlp, "PMM - Montgomery Multiplier            = %d (%d)\n",  !!(uEdxGst & RT_BIT(12)),  !!(uEdxHst & RT_BIT(12)));
+            pHlp->pfnPrintf(pHlp, "PMM-E - PMM enabled                    = %d (%d)\n",  !!(uEdxGst & RT_BIT(13)),  !!(uEdxHst & RT_BIT(13)));
+            for (unsigned iBit = 14; iBit < 32; iBit++)
+                if ((uEdxGst | uEdxHst) & RT_BIT(iBit))
+                    pHlp->pfnPrintf(pHlp, "Bit %d                                 = %d (%d)\n",  !!(uEdxGst & RT_BIT(iBit)),  !!(uEdxHst & RT_BIT(iBit)));
+            pHlp->pfnPrintf(pHlp, "\n");
+        }
+    }
-}
-

trunk/src/VBox/VMM/CPUMInternal.h

@@ -332 +332 @@
-    /** The extended set of CpuId leafs. */
-    CPUMCPUID               aGuestCpuIdExt[10];
+    /** The centaur set of CpuId leafs. */
+    CPUMCPUID               aGuestCpuIdCentaur[2];
-    /** The default set of CpuId leafs. */
-    CPUMCPUID               GuestCpuIdDef;

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -6 +6 @@
-;
-;  Copyright (C) 2006-2007 innotek GmbH
- 
+
-;  This file is part of VirtualBox Open Source Edition (OSE), as
-;  available from http://www.virtualbox.org. This file is free software;
@@ -382 +382 @@
-    .aGuestCpuIdStd       resb    16*5
-    .aGuestCpuIdExt       resb    16*10
+    .aGuestCpuIdCentaur   resb    16*2
-    .GuestCpuIdDef        resb    16
-

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -5 +5 @@
-
-;  Copyright (C) 2006-2007 innotek GmbH
- 
+
-;  This file is part of VirtualBox Open Source Edition (OSE), as
-;  available from http://www.virtualbox.org. This file is free software;
@@ -1533 +1533 @@
-    cmp     eax, PATM_CPUID_EXT_MAX
-    jb      cpuid_ext
+    cmp     eax, 0xc0000000
+    jb      cpuid_def
+    cmp     eax, PATM_CPUID_CENTAUR_MAX
+    jb      cpuid_centaur
-
-cpuid_def:
@@ -1541 +1545 @@
-    mov     edx, PATM_CPUID_STD_PTR
-    jmp     cpuid_calc
+
-cpuid_ext:
-    and     eax, 0ffh                   ; strictly speaking not necessary.
-    mov     edx, PATM_CPUID_EXT_PTR
+    jmp     cpuid_calc
+
+cpuid_centaur:
+    and     eax, 0ffh                   ; strictly speaking not necessary.
+    mov     edx, PATM_CPUID_CENTAUR_PTR
+
-cpuid_calc:
-    lea     eax, [ss:eax * 4]              ; 4 entries...

trunk/src/VBox/VMM/PATM/PATMA.h

@@ -50 +50 @@
-#define PATM_CALL_PATCH_TARGET_ADDR             0xF1ABCD18
-#define PATM_CALL_RETURN_ADDR                   0xF1ABCD19
+#define PATM_CPUID_CENTAUR_PTR                  0xF1ABCD1a
-
-/* Anything larger doesn't require a fixup */
@@ -64 +65 @@
-#define PATM_LOOKUP_AND_JUMP_FUNCTION           0xF1ABCE09    /** Relative address of global PATM lookup and jump function. */
-#define PATM_IRET_FUNCTION                      0xF1ABCE0A    /** Relative address of global PATM iret function. */
+#define PATM_CPUID_CENTAUR_MAX                  0xF1ABCE0B
-
-// everything except IOPL, NT, IF, VM, VIF, VIP and RF

trunk/src/VBox/VMM/PATM/PATMA.mac

@@ -6 +6 @@
-;
-;  Copyright (C) 2006-2007 innotek GmbH
- 
+
-;  This file is part of VirtualBox Open Source Edition (OSE), as
-;  available from http://www.virtualbox.org. This file is free software;
@@ -48 +48 @@
-%define PATM_CALL_PATCH_TARGET_ADDR             0xF1ABCD18
-%define PATM_CALL_RETURN_ADDR                   0xF1ABCD19
+%define PATM_CPUID_CENTAUR_PTR                  0xF1ABCD1A
-
-;/* Anything larger doesn't require a fixup */
@@ -62 +63 @@
-%define PATM_LOOKUP_AND_JUMP_FUNCTION           0xF1ABCE09   ; /** Relative address of global PATM lookup and jump function. */
-%define PATM_IRET_FUNCTION                      0xF1ABCE0A   ; /** Relative address of global PATM iret function. */
+%define PATM_CPUID_CENTAUR_MAX                  0xF1ABCE0B
-
-

trunk/src/VBox/VMM/PATM/PATMPatch.cpp

@@ -234 +234 @@
-                    break;
-
+                case PATM_CPUID_CENTAUR_PTR:
+                    dest = CPUMGetGuestCpuIdCentaurGCPtr(pVM);
+                    break;
+
-                case PATM_CPUID_DEF_PTR:
-                    dest = CPUMGetGuestCpuIdDefGCPtr(pVM);
@@ -244 +248 @@
-                case PATM_CPUID_EXT_MAX:
-                    dest = CPUMGetGuestCpuIdExtMax(pVM);
+                    break;
+
+                case PATM_CPUID_CENTAUR_MAX:
+                    dest = CPUMGetGuestCpuIdCentaurMax(pVM);
-                    break;
-
@@ -1282 +1290 @@
-
-    Log(("patmPatchGenMovFromSS %VGv\n", pCurInstrGC));
-
+
-    Assert(pPatch->flags & PATMFL_CODE32);
-

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

@@ -801 +801 @@
-    if (iLeaf < ELEMENTS(pVM->cpum.s.aGuestCpuIdStd))
-        pCpuId = &pVM->cpum.s.aGuestCpuIdStd[iLeaf];
-
+RT_
-        pCpuId = &pVM->cpum.s.aGuestCpuIdExt[iLeaf - UINT32_C(0x80000000)];
+    else if (iLeaf - UINT32_C(0xc0000000) < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur))
+        pCpuId = &pVM->cpum.s.aGuestCpuIdCentaur[iLeaf - UINT32_C(0xc0000000)];
-    else
-        pCpuId = &pVM->cpum.s.GuestCpuIdDef;
@@ -842 +844 @@
-
-/**
+ * Gets a pointer to the array of centaur CPUID leafs.
+ *
+ * CPUMGetGuestCpuIdCentaurMax() give the size of the array.
+ *
+ * @returns Pointer to the centaur CPUID leafs (read-only).
+ * @param   pVM         The VM handle.
+ * @remark  Intended for PATM.
+ */
+CPUMDECL(GCPTRTYPE(PCCPUMCPUID)) CPUMGetGuestCpuIdCentaurGCPtr(PVM pVM)
+{
+    return GCPTRTYPE(PCCPUMCPUID)VM_GUEST_ADDR(pVM, &pVM->cpum.s.aGuestCpuIdCentaur[0]);
+}
+
+/**
- * Gets a pointer to the default CPUID leaf.
- *
@@ -860 +876 @@
- * @remark  Intended for PATM.
- */
- 
-
-
+
+
+RT_
-}
-
@@ -872 +888 @@
- * @remark  Intended for PATM.
- */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-