Changeset 18720 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Apr 5, 2009 3:16:56 PM (16 years ago)

Author:

vboxsync

Message:

DevVGA: Count IOMMMIOMapMMIO2Page calls, fix signed/unsigned compare warning from uint16_t.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (7 diffs)

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

@@ -1198 +1198 @@
         {
             /** @todo only allow read access (doesn't work now) */
+            STAM_COUNTER_INC(&s->StatMapPage);
             IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), GCPhys, s->GCPhysVRAM + addr, X86_PTE_RW|X86_PTE_P);
             /* Set as dirty as write accesses won't be noticed now. */
@@ -1330 +1331 @@
                 && !vga_is_dirty(s, addr))
             {
+                STAM_COUNTER_INC(&s->StatMapPage);
                 IOMMMIOMapMMIO2Page(PDMDevHlpGetVM(s->CTX_SUFF(pDevIns)), GCPhys, s->GCPhysVRAM + addr, X86_PTE_RW | X86_PTE_P);
                 s->fRemappedVGA = true;
@@ -1386 +1388 @@
         if (((++s->cLatchAccesses) & s->uMaskLatchAccess) == s->uMaskLatchAccess)
         {
-            static uint32_t aMask[5]  = {0x3ff, 0x1ff, 0x7f, 0x3f, 0x1f};
-            static uint64_t aDelta[5]  = {10000000, 5000000, 2500000, 1250000, 625000};
+            static uint32_t const s_aMask[5]  = {   0x3ff,   0x1ff,    0x7f,    0x3f,   0x1f};
+            static uint64_t const s_aDelta[5] = {10000000, 5000000, 2500000, 1250000, 625000};
             if (PDMDevHlpCanEmulateIoBlock(s->CTX_SUFF(pDevIns)))
             {
@@ -1395 +1397 @@
                 * to the recompiler
                 */
-                if (u64CurTime - s->u64LastLatchedAccess < aDelta[s->iMask])
+                if (u64CurTime - s->u64LastLatchedAccess < s_aDelta[s->iMask])
                 {
                     s->u64LastLatchedAccess = 0;
-                    s->iMask                = RT_MIN(s->iMask + 1, RT_ELEMENTS(aMask) - 1);
-                    s->uMaskLatchAccess     = aMask[s->iMask];
+                    s->iMask                = RT_MIN(s->iMask + 1U, RT_ELEMENTS(s_aMask) - 1U);
+                    s->uMaskLatchAccess     = s_aMask[s->iMask];
                     s->cLatchAccesses       = s->uMaskLatchAccess - 1;
                     return VINF_EM_RAW_EMULATE_IO_BLOCK;
@@ -1405 +1407 @@
                 if (s->u64LastLatchedAccess)
                 {
-                    Log2(("Reset mask (was %d) delta %RX64 (limit %x)\n", s->iMask, u64CurTime - s->u64LastLatchedAccess, aDelta[s->iMask]));
+                    Log2(("Reset mask (was %d) delta %RX64 (limit %x)\n", s->iMask, u64CurTime - s->u64LastLatchedAccess, s_aDelta[s->iMask]));
                     if (s->iMask)
                         s->iMask--;
-                    s->uMaskLatchAccess     = aMask[s->iMask];
+                    s->uMaskLatchAccess     = s_aMask[s->iMask];
                 }
                 s->u64LastLatchedAccess = u64CurTime;
@@ -1416 +1418 @@
                 s->u64LastLatchedAccess = 0;
                 s->iMask                = 0;
-                s->uMaskLatchAccess     = aMask[s->iMask];
+                s->uMaskLatchAccess     = s_aMask[s->iMask];
                 s->cLatchAccesses       = 0;
             }
@@ -6185 +6187 @@
     STAM_REG(pVM, &pThis->StatRZMemoryWrite,    STAMTYPE_PROFILE, "/Devices/VGA/RZ/MMIO-Write", STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryWrite() body.");
     STAM_REG(pVM, &pThis->StatR3MemoryWrite,    STAMTYPE_PROFILE, "/Devices/VGA/R3/MMIO-Write", STAMUNIT_TICKS_PER_CALL, "Profiling of the VGAGCMemoryWrite() body.");
+    STAM_REG(pVM, &pThis->StatMapPage,          STAMTYPE_COUNTER, "/Devices/VGA/MapPageCalls",  STAMUNIT_OCCURENCES,     "Calls to IOMMMIOMapMMIO2Page.");
 
     /* Init latched access mask. */