Changeset 45305 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 3, 2013 11:15:02 AM (12 years ago)

Author:

vboxsync

Message:

IOM: Adding pVCpu to a lot of calls and moving the lookup caches from VM to VMCPU.

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPCI.cpp (modified) (2 diffs)
• Graphics/DevVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -1840 +1840 @@
 {
     unsigned    i;
-    uint8_t     elcr[2] = {0, 0};
+    uint8_t     elcr[2]  = {0, 0};
     PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
-    PVM         pVM = PDMDevHlpGetVM(pDevIns);
-    Assert(pVM);
+    PVM         pVM      = PDMDevHlpGetVM(pDevIns); Assert(pVM);
+    PVMCPU      pVCpu    = PDMDevHlpGetVMCPU(pDevIns); Assert(pVM);
 
     /*
@@ -1865 +1865 @@
 
     /* Tell to the PIC. */
-    VBOXSTRICTRC rcStrict = IOMIOPortWrite(pVM, 0x4d0, elcr[0], sizeof(uint8_t));
+    VBOXSTRICTRC rcStrict = IOMIOPortWrite(pVM, pVCpu, 0x4d0, elcr[0], sizeof(uint8_t));
     if (rcStrict == VINF_SUCCESS)
-        rcStrict = IOMIOPortWrite(pVM, 0x4d1, elcr[1], sizeof(uint8_t));
+        rcStrict = IOMIOPortWrite(pVM, pVCpu, 0x4d1, elcr[1], sizeof(uint8_t));
     if (rcStrict != VINF_SUCCESS)
     {

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -1215 +1215 @@
             /** @todo only allow read access (doesn't work now) */
             STAM_COUNTER_INC(&pThis->StatMapPage);
-            IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), GCPhys, pThis->GCPhysVRAM + addr, X86_PTE_RW|X86_PTE_P);
+            IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), GCPhys,
+                                pThis->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
             /* Set as dirty as write accesses won't be noticed now. */
             vga_set_dirty(pThis, addr);
@@ -1297 +1298 @@
             {
                 STAM_COUNTER_INC(&pThis->StatMapPage);
-                IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), GCPhys, pThis->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
+                IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(pThis->CTX_SUFF(pDevIns)), GCPhys,
+                                    pThis->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
                 pThis->fRemappedVGA = true;
             }