Changeset 67766 in vbox

Timestamp:

Jul 4, 2017 8:04:57 AM (8 years ago)

Author:

vboxsync

Message:

VGA: Implemented address wraparound for 16-color VGA modes.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (2 diffs)
• DevVGA.h (modified) (1 diff)
• DevVGATmpl.h (modified) (2 diffs)

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

@@ -2487 +2487 @@
     linesize = pDrv->cbScanline;
 
+    if (!(pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] & VBE_DISPI_ENABLED))
+        pThis->vga_addr_mask = 0x3ffff;
+    else
+        pThis->vga_addr_mask = UINT32_MAX;
+
     y1 = 0;
     y2 = pThis->cr[0x09] & 0x1F;    /* starting row scan count */
@@ -2500 +2505 @@
             addr = (addr & ~(1 << 16)) | ((y1 & 2) << 15);
         }
+        addr &= pThis->vga_addr_mask;
         page0 = addr & ~PAGE_OFFSET_MASK;
         page1 = (addr + bwidth - 1) & ~PAGE_OFFSET_MASK;

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

@@ -255 +255 @@
     uint8_t padding1[2];
     uint32_t line_offset;
+    uint32_t vga_addr_mask;
+    uint32_t padding1a;
     uint32_t line_compare;
     uint32_t start_addr;

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

@@ -263 +263 @@
                                               const uint8_t *s, int width)
 {
-    uint32_t plane_mask, data, v, *palette;
+    uint32_t plane_mask, data, v, *palette, vram_ofs;
     int x;
 
+    vram_ofs = s - s1->vram_ptrR3;
     palette = s1->last_palette;
     plane_mask = mask16[s1->ar[0x12] & 0xf];
     width >>= 3;
     for(x = 0; x < width; x++) {
+        s = s1->vram_ptrR3 + (vram_ofs & s1->vga_addr_mask);
         data = ((uint32_t *)s)[0];
         data &= plane_mask;
@@ -285 +287 @@
         ((PIXEL_TYPE *)d)[7] = palette[(v >> 0) & 0xf];
         d += BPP * 8;
-        s += 4;
+        vram_ofs += 4;
     }
 }