Changeset 104175 in vbox for trunk/src

Timestamp:

Apr 5, 2024 12:19:22 PM (10 months ago)

Author:

vboxsync

Message:

Dev/VGA: Spec considers vbe_start_addr as DWORD offset. bugref:10636

File:

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

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

@@ -389 +389 @@
 DECLINLINE(void) vgaR3ResetDirty(PVGASTATE pThis, RTGCPHYS offVRAMStart, RTGCPHYS offVRAMEnd)
 {
-    Assert(offVRAMStart < pThis->vram_size);
-    Assert(offVRAMEnd <= pThis->vram_size);
-    Assert(offVRAMStart < offVRAMEnd);
+    AssertReturnVoid(offVRAMStart < pThis->vram_size);
+    AssertReturnVoid(offVRAMEnd <= pThis->vram_size);
+    AssertReturnVoid(offVRAMStart < offVRAMEnd);
     ASMBitClearRange(&pThis->bmDirtyBitmap[0], offVRAMStart >> GUEST_PAGE_SHIFT, offVRAMEnd >> GUEST_PAGE_SHIFT);
 }
@@ -960 +960 @@
     else
         offStart += offX * ((cBPP + 7) >> 3);
-    offStart >>= 2;
+
     pThis->vbe_line_offset = RT_MIN(cbLinePitch, pThis->vram_size);
-    pThis->vbe_start_addr  = RT_MIN(offStart, pThis->vram_size);
+    pThis->vbe_start_addr  = RT_MIN(offStart, pThis->vram_size) >> 2;
 
     /* The VBE_DISPI_INDEX_VIRT_HEIGHT is used to prevent setting resolution bigger than