Changeset 2633 in vbox

Timestamp:

May 14, 2007 7:09:51 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21158

Message:

added PDMDevHlpQueryCPUId()

Location:

trunk

Files:

• include/VBox/pdm.h (modified) (2 diffs)
• src/VBox/VMM/PDMDevice.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)

trunk/include/VBox/pdm.h

@@ -5335 +5335 @@
     DECLR3CALLBACKMEMBER(int, pfnCMOSRead,(PPDMDEVINS pDevIns, unsigned iReg, uint8_t *pu8Value));
 
+    /**
+     * Query CPUID.
+     *
+     * @param   pDevIns     Device instance.
+     * @param   iLeaf       The CPUID leaf to get.
+     * @param   pEax        Where to store the EAX value.
+     * @param   pEbx        Where to store the EBX value.
+     * @param   pEcx        Where to store the ECX value.
+     * @param   pEdx        Where to store the EDX value.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnQueryCPUId,(PPDMDEVINS pDevIns, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx));
+
     /** @} */
 
@@ -6051 +6063 @@
     return pDevIns->pDevHlp->pfnCMOSRead(pDevIns, iReg, pu8Value);
 }
+
+/**
+ * @copydoc PDMDEVHLP::pfnQueryCPUId
+ */
+DECLINLINE(void) PDMDevHlpQueryCPUId(PPDMDEVINS pDevIns, uint32_t iLeaf, uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
+{
+    pDevIns->pDevHlp->pfnQueryCPUId(pDevIns, iLeaf, pEax, pEbx, pEcx, pEdx);
+}
 #endif /* IN_RING3 */
 

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -161 +161 @@
 static DECLCALLBACK(int) pdmR3DevHlp_CMOSWrite(PPDMDEVINS pDevIns, unsigned iReg, uint8_t u8Value);
 static DECLCALLBACK(int) pdmR3DevHlp_CMOSRead(PPDMDEVINS pDevIns, unsigned iReg, uint8_t *pu8Value);
+static DECLCALLBACK(void) pdmR3DevHlp_QueryCPUId(PPDMDEVINS pDevIns, uint32_t iLeaf,
+                                                 uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx);
 
 static DECLCALLBACK(PVM) pdmR3DevHlp_Untrusted_GetVM(PPDMDEVINS pDevIns);
@@ -191 +193 @@
 static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_CMOSWrite(PPDMDEVINS pDevIns, unsigned iReg, uint8_t u8Value);
 static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_CMOSRead(PPDMDEVINS pDevIns, unsigned iReg, uint8_t *pu8Value);
+static DECLCALLBACK(void) pdmR3DevHlp_Untrusted_QueryCPUId(PPDMDEVINS pDevIns, uint32_t iLeaf,
+                                                           uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx);
 
 /** @} */
@@ -351 +355 @@
     pdmR3DevHlp_CMOSWrite,
     pdmR3DevHlp_CMOSRead,
+    pdmR3DevHlp_QueryCPUId,
     PDM_DEVHLP_VERSION /* the end */
 };
@@ -436 +441 @@
     pdmR3DevHlp_Untrusted_CMOSWrite,
     pdmR3DevHlp_Untrusted_CMOSRead,
+    pdmR3DevHlp_Untrusted_QueryCPUId,
     PDM_DEVHLP_VERSION /* the end */
 };
@@ -3502 +3508 @@
 
 
+/** @copydoc PDMDEVHLP::pfnQueryCPUId */
+static DECLCALLBACK(void) pdmR3DevHlp_QueryCPUId(PPDMDEVINS pDevIns, uint32_t iLeaf,
+                                                 uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3GetCPUApicHlp_ClearInterruptFF: caller='%s'/%d: fEnabled=%RTbool\n",
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, fEnabled));
+    CPUMGetGuestCpuId(pDevIns->Internal.s.pVMHC, iLeaf, pEax, pEbx, pEcx, pEdx);
+}
 
 
@@ -3795 +3810 @@
 
 
+/** @copydoc PDMDEVHLP::pfnQueryCPUId */
+static DECLCALLBACK(void) pdmR3DevHlp_Untrusted_QueryCPUId(PPDMDEVINS pDevIns, uint32_t iLeaf,
+                                                           uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
+}
 
 
@@ -3908 +3930 @@
         CPUMClearGuestCpuIdFeature(pDevIns->Internal.s.pVMHC, CPUMCPUIDFEATURE_APIC);
 }
-
 
 #ifdef VBOX_WITH_PDM_LOCK

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

@@ -900 +900 @@
          */
         case CPUMCPUIDFEATURE_APIC:
-            /* Don't enable the Local APIC for non-{Intel,AMD} CPUs. Linux (checked with 2.4.26
-             * and 2.6.21, see apic.c, detect_init_APIC()) gets confused otherwiese. Of course
-             * this is a bug in the Linux code (it should trust the CPUID instruction) but Windows
-             * is also known for such assumptions.
-             * On the other hand we could depend on the APIC set in the host's CPUID but this APIC
-             * might be (soft) disabled and we want to provide an APIC to the guest if possible. */
-            if (  (   (   pVM->cpum.s.aGuestCpuIdStd[0].ebx == 0x756e6547 /* Genu */
-                       && pVM->cpum.s.aGuestCpuIdStd[0].ecx == 0x6c65746e /* ineI */
-                       && pVM->cpum.s.aGuestCpuIdStd[0].edx == 0x49656e69 /* ntel */)
-                   || (   pVM->cpum.s.aGuestCpuIdStd[0].ebx == 0x68747541 /* Auth */
-                       && pVM->cpum.s.aGuestCpuIdStd[0].ecx == 0x69746e65 /* enti */
-                       && pVM->cpum.s.aGuestCpuIdStd[0].edx == 0x444d4163 /* cAMD */))
-                && pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
+            if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)
                 pVM->cpum.s.aGuestCpuIdStd[1].edx |= X86_CPUID_FEATURE_EDX_APIC;
             if (    pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001