Merge zizzer:/bk/newmem

into  pb15.local:/Users/ali/work/m5.newmem

--HG--
extra : convert_revision : 0aa2fadf8978ae30ebe4fde03c525e6b9115117a

diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 83b9138b4ee50e7f71819ca6f7c69387d7e481dd..79dbcc86c45889dcc5332c58ba21856cd7a734a5 100644 (file)
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -121,17 +121,12 @@ findMsbSet(uint64_t val) {
     int msb = 0;
     if (!val)
         return 0;
-    if (bits(val, 63,32)) msb += 32;
-    val >>= 32;
-    if (bits(val, 31,16)) msb += 16;
-    val >>= 16;
-    if (bits(val, 15,8)) msb += 8;
-    val >>= 8;
-    if (bits(val, 7,4)) msb += 4;
-    val >>= 4;
-    if (bits(val, 3,2)) msb += 2;
-    val >>= 2;
-    if (bits(val, 1,1)) msb += 1;
+    if (bits(val, 63,32)) { msb += 32; val >>= 32; }
+    if (bits(val, 31,16)) { msb += 16; val >>= 16; }
+    if (bits(val, 15,8))  { msb += 8;  val >>= 8;  }
+    if (bits(val, 7,4))   { msb += 4;  val >>= 4;  }
+    if (bits(val, 3,2))   { msb += 2;  val >>= 2;  }
+    if (bits(val, 1,1))   { msb += 1; }
     return msb;
 }