From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Wed, 15 Jun 2011 00:51:44 +0000 (-0500)
Subject: Ruby: Correct set LONG_BITS and INDEX_SHIFT in class Set.
X-Git-Tag: stable_2012_02_02~274
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bf92329eeea76e4e01c49f31e68c29cdada5985;p=gem5.git

Ruby: Correct set LONG_BITS and INDEX_SHIFT in class Set.
The code for Set class was written under the assumption that
std::numeric_limits<long>::digits returns the number of bits used for
data type long, which was presumed to be either 32 or 64. But return value
is actually one less, that is, it is either 31 or 63. The value is now
being incremented by 1 so as to correctly set it.
---

diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh
index 5481c2ec7..b76c3409d 100644
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -54,7 +54,7 @@ class Set
     long *m_p_nArray;      // an word array to hold the bits in the set
     long m_p_nArray_Static[NUMBER_WORDS_PER_SET];
 
-    static const int LONG_BITS = std::numeric_limits<long>::digits;
+    static const int LONG_BITS = std::numeric_limits<long>::digits + 1;
     static const int INDEX_SHIFT = LONG_BITS == 64 ? 6 : 5;
     static const int INDEX_MASK = (1 << INDEX_SHIFT) - 1;