Changeset 104244 in vbox

Timestamp:

Apr 9, 2024 7:40:39 AM (8 months ago)

Author:

vboxsync

Message:

Devices/Graphics/DevVGA: Cleanup vbe_ioport_write_data() a little, bugref:10636

File:

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

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

@@ -983 +983 @@
     RT_NOREF(pThisCC, addr);
 
-    if (pThis->vbe_index <= VBE_DISPI_INDEX_NB) {
+    uint16_t const idxVbe = pThis->vbe_index;
+    if (idxVbe <= VBE_DISPI_INDEX_NB)
+    {
+        RT_UNTRUSTED_VALIDATED_FENCE();
+
         bool fRecalculate = false;
-        Log(("VBE: write index=0x%x val=0x%x\n", pThis->vbe_index, val));
-        switch(pThis->vbe_index) {
+        Log(("VBE: write index=0x%x val=0x%x\n", idxVbe, val));
+        switch(idxVbe) {
         case VBE_DISPI_INDEX_ID:
             if (val == VBE_DISPI_ID0 ||
@@ -1001 +1005 @@
                 val == VBE_DISPI_ID_CFG)
             {
-                pThis->vbe_regs[pThis->vbe_index] = val;
+                pThis->vbe_regs[VBE_DISPI_INDEX_ID] = val;
             }
             break;
@@ -1007 +1011 @@
             if (val <= VBE_DISPI_MAX_XRES)
             {
-                pThis->vbe_regs[pThis->vbe_index] = val;
+                pThis->vbe_regs[VBE_DISPI_INDEX_XRES] = val;
                 pThis->vbe_regs[VBE_DISPI_INDEX_VIRT_WIDTH] = val;
                 fRecalculate = true;
@@ -1014 +1018 @@
         case VBE_DISPI_INDEX_YRES:
             if (val <= VBE_DISPI_MAX_YRES)
-                pThis->vbe_regs[pThis->vbe_index] = val;
+                pThis->vbe_regs[VBE_DISPI_INDEX_YRES] = val;
             break;
         case VBE_DISPI_INDEX_BPP:
@@ -1021 +1025 @@
             if (val == 4 || val == 8 || val == 15 ||
                 val == 16 || val == 24 || val == 32) {
-                pThis->vbe_regs[pThis->vbe_index] = val;
+                pThis->vbe_regs[VBE_DISPI_INDEX_BPP] = val;
                 fRecalculate = true;
             }
@@ -1037 +1041 @@
             if (val > max_bank)
                 val = max_bank;
-            pThis->vbe_regs[pThis->vbe_index] = val;
+            pThis->vbe_regs[VBE_DISPI_INDEX_BANK] = val;
             pThis->bank_offset = (val << 16);
 
@@ -1141 +1145 @@
                 pThis->bank_offset = 0;
             }
-            pThis->vbe_regs[pThis->vbe_index] = val;
+            pThis->vbe_regs[VBE_DISPI_INDEX_ENABLE] = val;
             /*
              * LFB video mode is either disabled or changed. Notify the display
@@ -1165 +1169 @@
         case VBE_DISPI_INDEX_Y_OFFSET:
             {
-                pThis->vbe_regs[pThis->vbe_index] = val;
+                pThis->vbe_regs[idxVbe] = val;
                 fRecalculate = true;
             }
@@ -1183 +1187 @@
             break;
         case VBE_DISPI_INDEX_CFG:
-            pThis->vbe_regs[pThis->vbe_index] = val;
+            pThis->vbe_regs[VBE_DISPI_INDEX_CFG] = val;
             break;
         default: