Changeset 60477 in vbox for trunk

Timestamp:

Apr 13, 2016 2:51:05 PM (9 years ago)

Author:

vboxsync

Message:

VMM/APIC: Avoid using 'else' when 'if' block returns whenever possible.

File:

• trunk/src/VBox/VMM/VMMAll/APICAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp

@@ -749 +749 @@
         return RT_BOOL(u8Ldr & fDest & XAPIC_LDR_FLAT_LOGICAL_ID);
     }
-    else
-    {
-        /*
-         * In clustered logical mode, the 8-bit logical ID in the LDR is interpreted as follows:
-         *    - High 4 bits is the cluster ID.
-         *    - Low 4 bits: each bit represents a unique APIC within the cluster.
-         */
-        Assert(enmDestFormat == XAPICDESTFORMAT_CLUSTER);
-        uint8_t const u8Ldr = pXApicPage->ldr.u.u8LogicalApicId;
-        if (XAPIC_LDR_CLUSTERED_GET_CLUSTER_ID(u8Ldr) == (fDest & XAPIC_LDR_CLUSTERED_CLUSTER_ID))
-            return RT_BOOL(u8Ldr & fDest & XAPIC_LDR_CLUSTERED_LOGICAL_ID);
-        return false;
-    }
+
+    /*
+     * In clustered logical mode, the 8-bit logical ID in the LDR is interpreted as follows:
+     *    - High 4 bits is the cluster ID.
+     *    - Low 4 bits: each bit represents a unique APIC within the cluster.
+     */
+    Assert(enmDestFormat == XAPICDESTFORMAT_CLUSTER);
+    uint8_t const u8Ldr = pXApicPage->ldr.u.u8LogicalApicId;
+    if (XAPIC_LDR_CLUSTERED_GET_CLUSTER_ID(u8Ldr) == (fDest & XAPIC_LDR_CLUSTERED_CLUSTER_ID))
+        return RT_BOOL(u8Ldr & fDest & XAPIC_LDR_CLUSTERED_LOGICAL_ID);
+    return false;
 #else
 # error "Implement Pentium and P6 family APIC architectures"