diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-01-04 00:03:30 -0600 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-01-04 00:03:30 -0600 |
commit | 9853ef6651e76883615595bf76f983ed43234f96 (patch) | |
tree | 56b3410497dbad5e4cbac88bc91ee6234d0438e5 /src | |
parent | a212844f6785f896b268b678f0018528c0ecfdc7 (diff) | |
download | gem5-9853ef6651e76883615595bf76f983ed43234f96.tar.xz |
ruby: some small changes
Diffstat (limited to 'src')
-rw-r--r-- | src/mem/ruby/common/NetDest.cc | 10 | ||||
-rw-r--r-- | src/mem/ruby/common/NetDest.hh | 2 | ||||
-rw-r--r-- | src/mem/ruby/system/DirectoryMemory.cc | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc index 97788345c..f7508f1da 100644 --- a/src/mem/ruby/common/NetDest.cc +++ b/src/mem/ruby/common/NetDest.cc @@ -275,3 +275,13 @@ NetDest::print(std::ostream& out) const out << "]"; } +bool +NetDest::isEqual(const NetDest& n) const +{ + assert(m_bits.size() == n.m_bits.size()); + for (unsigned int i = 0; i < m_bits.size(); ++i) { + if (!m_bits[i].isEqual(n.m_bits[i])) + return false; + } + return true; +} diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh index 5ad1b6100..0e113c269 100644 --- a/src/mem/ruby/common/NetDest.hh +++ b/src/mem/ruby/common/NetDest.hh @@ -66,7 +66,7 @@ class NetDest void broadcast(); void broadcast(MachineType machine); int count() const; - bool isEqual(const NetDest& netDest); + bool isEqual(const NetDest& netDest) const; // return the logical OR of this netDest and orNetDest NetDest OR(const NetDest& orNetDest) const; diff --git a/src/mem/ruby/system/DirectoryMemory.cc b/src/mem/ruby/system/DirectoryMemory.cc index 1cf020910..cb1bf6f90 100644 --- a/src/mem/ruby/system/DirectoryMemory.cc +++ b/src/mem/ruby/system/DirectoryMemory.cc @@ -68,7 +68,7 @@ DirectoryMemory::init() } m_num_directories++; - m_num_directories_bits = floorLog2(m_num_directories); + m_num_directories_bits = ceilLog2(m_num_directories); m_total_size_bytes += m_size_bytes; if (m_numa_high_bit == 0) { |