Changeset 32941 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Oct 6, 2010 11:07:41 AM (14 years ago)

Author:

vboxsync

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

66427

Message:

PCI: safety checks, cleaner code

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -1699 +1699 @@
             return PCIDevGetByte(aDev,  u32Address);
         case 2:
-            return PCIDevGetWord(aDev,  u32Address);
-        default:
+            return PCIDevGetWord(aDev,  u32Address);        
         case 4:
             return PCIDevGetDWord(aDev, u32Address);
+        default:
+            Assert(false);
+            return 0;
     }
 }
@@ -1714 +1716 @@
                                                 uint32_t val, unsigned len)
 {
+    Assert(len <= 4);
+
     if ((u32Address + len) > 256 && (u32Address + len) < 4096)
     {
@@ -1824 +1828 @@
         }
 
+        uint8_t u8Val = (uint8_t)val;
+
         switch (addr)
         {
             case VBOX_PCI_COMMAND: /* Command register, bits 0-7. */
                 fUpdateMappings = true;
-                aDev->config[addr] = val;
+                aDev->config[addr] = u8Val;
                 break;
             case VBOX_PCI_COMMAND+1: /* Command register, bits 8-15. */
                 /* don't change reserved bits (11-15) */
-                val &= UINT32_C(~0xf8);
+                u8Val &= UINT32_C(~0xf8);
                 fUpdateMappings = true;
-                aDev->config[addr] = val;
+                aDev->config[addr] = u8Val;
                 break;
             case VBOX_PCI_STATUS:  /* Status register, bits 0-7. */
                 /* don't change read-only bits => actually all lower bits are read-only */
-                val &= UINT32_C(~0xff);
+                u8Val &= UINT32_C(~0xff);
                 /* status register, low part: clear bits by writing a '1' to the corresponding bit */
-                aDev->config[addr] &= ~val;
+                aDev->config[addr] &= ~u8Val;
                 break;
             case VBOX_PCI_STATUS+1:  /* Status register, bits 8-15. */
                 /* don't change read-only bits */
-                val &= UINT32_C(~0x06);
+                u8Val &= UINT32_C(~0x06);
                 /* status register, high part: clear bits by writing a '1' to the corresponding bit */
-                aDev->config[addr] &= ~val;
+                aDev->config[addr] &= ~u8Val;
                 break;
             default:
                 if (fWritable)
-                    aDev->config[addr] = val;
+                    aDev->config[addr] = u8Val;
         }
         addr++;