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

Timestamp:

Jun 1, 2012 10:01:22 AM (13 years ago)

Author:

vboxsync

Message:

VGA: Bring GCPhysVRAM into the 21st century.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (3 diffs)
• DevVGA.h (modified) (2 diffs)

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

@@ -4617 +4617 @@
 
     STAM_COUNTER_INC(&pThis->StatUpdateDisp);
-    if (pThis->fHasDirtyBits && pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS32)
+    if (pThis->fHasDirtyBits && pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
     {
         PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
@@ -4647 +4647 @@
 
     /* The dirty bits array has been just cleared, reset handlers as well. */
-    if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS32)
+    if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
         PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
     if (pThis->fRemappedVGA)
@@ -5526 +5526 @@
              || pThis->fR0Enabled)
         &&  pThis->GCPhysVRAM
-        &&  pThis->GCPhysVRAM != NIL_RTGCPHYS32)
+        &&  pThis->GCPhysVRAM != NIL_RTGCPHYS)
     {
         int rc = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);

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

@@ -255 +255 @@
     uint32_t                    u32Marker;
     /** The physical address the VRAM was assigned. */
-    RTGCPHYS32                  GCPhysVRAM;
+    RTGCPHYS                    GCPhysVRAM;
     /** The R0 vram pointer... */
     R0PTRTYPE(uint8_t *)        vram_ptrR0;
@@ -274 +274 @@
     bool                        Padding1[2];
 
-#if HC_ARCH_BITS == 64
+#if HC_ARCH_BITS == 32
     uint32_t                    Padding2;
 #endif