Changeset 2749 in vbox for trunk/src

Timestamp:

May 21, 2007 4:31:41 PM (18 years ago)

Author:

vboxsync

Message:

QueryCPUId -> GetCpuId (it's a wrapper for CPUMGetGuestCpuId).

Location:

trunk/src/VBox

Files:

• Devices/PC/DevAPIC.cpp (modified) (1 diff)
• Devices/PC/DevPcBios.cpp (modified) (4 diffs)
• VMM/PDMDevice.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1710 +1710 @@
      */
     uint32_t u32Eax, u32Ebx, u32Ecx, u32Edx;
-    PDMDevHlpQueryCPUId(pDevIns, 0, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
+    PDMDevHlpGetCpuId(pDevIns, 0, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
     if (u32Eax >= 1)
     {

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -732 +732 @@
 }
 
+
 /**
  * Construct the DMI table.
@@ -815 +816 @@
 }
 
+
 /**
  * Construct the MPS table. Only applicable if IOAPIC is active.
@@ -843 +845 @@
     uint32_t u32CPUSignature = 0x0520; /* default: Pentium 100 */
     uint32_t u32FeatureFlags = 0x0001; /* default: FPU */
-    PDMDevHlpQueryCPUId(pDevIns, 0, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
+    PDMDevHlpGetCpuId(pDevIns, 0, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
     if (u32Eax >= 1)
     {
-        PDMDevHlpQueryCPUId(pDevIns, 1, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
+        PDMDevHlpGetCpuId(pDevIns, 1, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
         u32CPUSignature = u32Eax & 0xfff;
         /* Local APIC will be enabled later so override it here. Since we provide
@@ -883 +885 @@
 
     PMPSIOIRQENTRY pIrqEntry       = (PMPSIOIRQENTRY)(pIOAPICEntry+1);
-    for (int i=0; i<16; i++, pIrqEntry++)
+    for (int i = 0; i < 16; i++, pIrqEntry++)
     {
         pIrqEntry->u8EntryType     = 3; /* I/O interrupt entry */

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(void) pdmR3DevHlp_GetCpuId(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);
@@ -355 +355 @@
     pdmR3DevHlp_CMOSWrite,
     pdmR3DevHlp_CMOSRead,
-    pdmR3DevHlp_QueryCPUId,
+    pdmR3DevHlp_GetCpuId,
     PDM_DEVHLP_VERSION /* the end */
 };
@@ -3508 +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(("pdmR3DevHlp_QueryCPUId: caller='%s'/%d: iLeaf=%d\n",
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iLeaf));
+/** @copydoc PDMDEVHLP::pfnGetCpuId */
+static DECLCALLBACK(void) pdmR3DevHlp_GetCpuId(PPDMDEVINS pDevIns, uint32_t iLeaf,
+                                               uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_GetCpuId: caller='%s'/%d: iLeaf=%d pEax=%p pEbx=%p pEcx=%p pEdx=%p\n",
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iLeaf, pEax, pEbx, pEcx, pEdx));
+    AssertPtr(pEax); AssertPtr(pEbx); AssertPtr(pEcx); AssertPtr(pEdx);
+
     CPUMGetGuestCpuId(pDevIns->Internal.s.pVMHC, iLeaf, pEax, pEbx, pEcx, pEdx);
-}
+
+    LogFlow(("pdmR3DevHlp_GetCpuId: caller='%s'/%d: returns void - *pEax=%#x *pEbx=%#x *pEcx=%#x *pEdx=%#x\n",
+             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, *pEax, *pEbx, *pEcx, *pEdx));
+}
+
+