Changeset 60433 in vbox for trunk/src/VBox/Devices/PC/BIOS/pciutil.c

Timestamp:

Apr 11, 2016 5:14:35 PM (9 years ago)

Author:

vboxsync

Message:

PCBIOS: 286 fixes, improved the BIOSORG checking as overflows in this area are hard to figure out.

File:

• trunk/src/VBox/Devices/PC/BIOS/pciutil.c (modified) (8 diffs)

trunk/src/VBox/Devices/PC/BIOS/pciutil.c

@@ -45 +45 @@
 
 
+#if VBOX_BIOS_CPU >= 80386
 /* Warning: Destroys high bits of ECX. */
 uint16_t pci_find_class(uint16_t op, uint32_t dev_class, uint16_t start_bdf);
-#pragma aux pci_find_class =    \
+# pragma aux pci_find_class =    \
     ".386"                  \
     "shl    ecx, 16"        \
@@ -57 +58 @@
     "found:"                \
     parm [ax] [cx dx] [si] value [bx];
+#endif
 
 uint16_t pci_find_dev(uint16_t op, uint16_t dev_id, uint16_t ven_id, uint16_t start_bdf);
@@ -77 +79 @@
     parm [ax] [bx] [di] value [cx];
 
+#if VBOX_BIOS_CPU >= 80386
 /* Warning: Destroys high bits of ECX. */
 uint32_t pci_read_cfgd(uint16_t op, uint16_t bus_dev_fn, uint16_t reg);
-#pragma aux pci_read_cfgd = \
+# pragma aux pci_read_cfgd = \
     ".386"                  \
     "int    0x1a"           \
@@ -85 +88 @@
     "shr    ecx, 16"        \
     parm [ax] [bx] [di] value [cx ax];
+#endif
 
 uint8_t pci_write_cfgb(uint16_t op, uint16_t bus_dev_fn, uint16_t reg, uint8_t val);
@@ -96 +100 @@
     parm [ax] [bx] [di] [cx];
 
+#if VBOX_BIOS_CPU >= 80386
 /* Warning: Destroys high bits of ECX. */
 uint8_t pci_write_cfgd(uint16_t op, uint16_t bus_dev_fn, uint16_t reg, uint32_t val);
-#pragma aux pci_write_cfgd = \
+# pragma aux pci_write_cfgd = \
     ".386"                  \
     "xchg   cx, dx"         \
@@ -105 +110 @@
     "int    0x1a"           \
     parm [ax] [bx] [di] [dx cx];
+#endif
 
 
@@ -119 +125 @@
 uint16_t pci_find_classcode(uint32_t dev_class)
 {
+#if VBOX_BIOS_CPU >= 80386
     return pci_find_class((PCIBIOS_ID << 8) | PCIBIOS_FIND_CLASS_CODE, dev_class, 0);
+#else
+    return UINT16_C(0xffff);
+#endif
 }
 
@@ -134 +144 @@
 uint32_t pci_read_config_dword(uint8_t bus, uint8_t dev_fn, uint8_t reg)
 {
+#if VBOX_BIOS_CPU >= 80386
     return pci_read_cfgd((PCIBIOS_ID << 8) | PCIBIOS_READ_CONFIG_DWORD, (bus << 8) | dev_fn, reg);
+#else
+    return pci_read_cfgw((PCIBIOS_ID << 8) | PCIBIOS_READ_CONFIG_WORD, (bus << 8) | dev_fn, reg)
+        || ((uint32_t)pci_read_cfgw((PCIBIOS_ID << 8) | PCIBIOS_READ_CONFIG_WORD, (bus << 8) | dev_fn, reg + 2) << 16);
+#endif
 }