Changeset 9212 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

May 29, 2008 9:38:38 AM (17 years ago)

Author:

vboxsync

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

31380

Message:

Major changes for sizeof(RTGCPTR) == uint64_t.
Introduced RCPTRTYPE for pointers valid in raw mode only (RTGCPTR32).

Disabled by default. Enable by adding VBOX_WITH_64_BITS_GUESTS to your LocalConfig.kmk.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (1 diff)
• DevVGA.h (modified) (3 diffs)

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

@@ -5231 +5231 @@
     AssertMsgRC(rc, ("PDMDevHlpMMIO2Register(%#x,) -> %Rrc\n", pData->vram_size, rc));
 
-    rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 0 /* iRegion */, 0 /* off */,  VGA_MAPPING_SIZE, "VGA VRam", &pData->vram_ptrGC);
+    RTGCPTR pGCMapping = 0;
+    rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, 0 /* iRegion */, 0 /* off */,  VGA_MAPPING_SIZE, "VGA VRam", &pGCMapping);
     AssertMsgRC(rc, ("MMR3HyperMapGCPhys(%#x,) -> %Rrc\n", pData->vram_size, rc));
+    Assert(!(pGCMapping >> 32ULL));
+    pData->vram_ptrGC = pGCMapping;
 
     /*

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

@@ -251 +251 @@
     RTGCPHYS32                  GCPhysVRAM;
     /** Pointer to GC vram mapping. */
-    GCPTRTYPE(uint8_t *)        vram_ptrGC;
+    RCPTRTYPE(uint8_t *)        vram_ptrGC;
 /** @todo r=bird: bool not RTUINT (my fault I guess). */
     /** LFB was updated flag. */
@@ -260 +260 @@
     RTUINT                      fR0Enabled;
     /** Pointer to vgaGCLFBAccessHandler(). */
-    RTGCPTR                     GCPtrLFBHandler;
+    RTGCPTR32                   GCPtrLFBHandler;
     /** Flag indicating that there are dirty bits. This is used to optimize the handler resetting. */
     bool                        fHaveDirtyBits;
@@ -268 +268 @@
     R3R0PTRTYPE(PPDMDEVINS)     pDevInsHC;
     /* * Pointer to the device instance - GC Ptr. */
-    /*GCPTRTYPE(PPDMDEVINS)   pDevInsGC;*/
+    /*RCPTRTYPE(PPDMDEVINS)   pDevInsGC;*/
 
     /** The display port base interface. */