diff options
author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
commit | 141f61d83a23096dcff20df704bdd734c520f535 (patch) | |
tree | ee2383d721a039bb056bd6442a7241aa305d187e /src/mem/ruby/filters/MultiGrainBloomFilter.cc | |
parent | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (diff) | |
download | gem5-141f61d83a23096dcff20df704bdd734c520f535.tar.xz |
ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base
Diffstat (limited to 'src/mem/ruby/filters/MultiGrainBloomFilter.cc')
-rw-r--r-- | src/mem/ruby/filters/MultiGrainBloomFilter.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.cc b/src/mem/ruby/filters/MultiGrainBloomFilter.cc index 24fcd7ead..7b3976473 100644 --- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc +++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/intmath.hh" +#include "base/str.hh" #include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/filters/MultiGrainBloomFilter.hh" @@ -34,19 +36,21 @@ using namespace std; MultiGrainBloomFilter::MultiGrainBloomFilter(string str) { - string tail(str); - - // split into the 2 filter sizes - string head = string_split(tail, '_'); + string head, tail; +#ifndef NDEBUG + bool success = +#endif + split_first(str, head, tail, '_'); + assert(success); // head contains size of 1st bloom filter, tail contains size of // 2nd bloom filter m_filter_size = atoi(head.c_str()); - m_filter_size_bits = log_int(m_filter_size); + m_filter_size_bits = floorLog2(m_filter_size); m_page_filter_size = atoi(tail.c_str()); - m_page_filter_size_bits = log_int(m_page_filter_size); + m_page_filter_size_bits = floorLog2(m_page_filter_size); m_filter.setSize(m_filter_size); m_page_filter.setSize(m_page_filter_size); |