Changeset 65560 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 1, 2017 8:57:34 AM (8 years ago)

Author:

vboxsync

Message:

DevPciIch9: use RT_MAKE_U64() to be on the safe side

File:

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

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

@@ -1681 +1681 @@
             ich9pciBiosInitWriteConfig(pPciRoot, uBus, uDevFn, u32Address,   UINT32_C(0xffffffff), 4);
             ich9pciBiosInitWriteConfig(pPciRoot, uBus, uDevFn, u32Address+4, UINT32_C(0xffffffff), 4);
-            cbRegSize64  =            ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address,   4);
-            cbRegSize64 |= ((uint64_t)ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address+4, 4) << 32);
+            cbRegSize64 = RT_MAKE_U64(ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address,   4),
+                                      ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address+4, 4));
             cbRegSize64 &= ~UINT64_C(0x0f);
             cbRegSize64 = (~cbRegSize64) + 1;
@@ -1804 +1804 @@
             ich9pciBiosInitWriteConfig(pPciRoot, uBus, uDevFn, u32Address,   UINT32_C(0xffffffff), 4);
             ich9pciBiosInitWriteConfig(pPciRoot, uBus, uDevFn, u32Address+4, UINT32_C(0xffffffff), 4);
-            cbRegSize64  =            ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address,   4);
-            cbRegSize64 |= ((uint64_t)ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address+4, 4) << 32);
+            cbRegSize64 = RT_MAKE_U64(ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address,   4),
+                                      ich9pciBiosInitReadConfig(pPciRoot, uBus, uDevFn, u32Address+4, 4));
             cbRegSize64 &= ~UINT64_C(0x0f);
             cbRegSize64 = (~cbRegSize64) + 1;