Changeset 53473 in vbox

Timestamp:

Dec 6, 2014 4:01:02 AM (10 years ago)

Author:

vboxsync

Message:

build fix and warnings.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -6167 +6167 @@
     if (   u64DeltaTsc < UINT64_MAX / RT_NS_1SEC
         && u64DeltaNanoTS < UINT32_MAX)
-        pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_1SEC, u64DeltaNanoTS);
+        pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_1SEC, (uint32_t)u64DeltaNanoTS);
     else
     {
@@ -6173 +6173 @@
         if (   u64DeltaTsc < UINT64_MAX / RT_NS_100MS
             && u64DeltaNanoTS / 10 < UINT32_MAX)
-            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_100MS, u64DeltaNanoTS / 10);
+            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_100MS, (uint32_t)(u64DeltaNanoTS / 10));
         else if (   u64DeltaTsc < UINT64_MAX / RT_NS_10MS
                  && u64DeltaNanoTS / 100 < UINT32_MAX)
-            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_10MS, u64DeltaNanoTS / 100);
+            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_10MS, (uint32_t)(u64DeltaNanoTS / 100));
         else if (   u64DeltaTsc < UINT64_MAX / RT_NS_1MS
                  && u64DeltaNanoTS / 1000 < UINT32_MAX)
-            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_1MS, u64DeltaNanoTS / 1000);
+            pGip->u64CpuHz = ASMMultU64ByU32DivByU32(u64DeltaTsc, RT_NS_1MS, (uint32_t)(u64DeltaNanoTS / 1000));
         else /* Screw it. */
             pGip->u64CpuHz = u64DeltaTsc / (u64DeltaNanoTS / RT_NS_1SEC_64);
@@ -7934 +7934 @@
     while (cTries-- > 0)
     {
+        int rc2;
+        uint16_t iCpu;
+
         rc = SUPGetTsc(&uTsc, &idApic);
         if (RT_SUCCESS(rc))
@@ -7943 +7946 @@
 
         /* If we failed to have a TSC-delta, measurement the TSC-delta and retry. */
-        int rc2;
-        uint16_t iCpu;
         AssertMsgReturn(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId),
                         ("idApic=%u ArraySize=%u\n", idApic, RT_ELEMENTS(pGip->aiCpuFromApicId)), VERR_INVALID_CPU_INDEX);