From bd18ac82877072a87745aaf7a104e7bb036c6c66 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 10 Jan 2011 11:11:20 -0800 Subject: ruby: get rid of ruby's Debug.hh Get rid of the Debug class Get rid of ASSERT and use assert Use DPRINTFR for ProtocolTrace --- src/mem/ruby/filters/BulkBloomFilter.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/mem/ruby/filters') diff --git a/src/mem/ruby/filters/BulkBloomFilter.cc b/src/mem/ruby/filters/BulkBloomFilter.cc index bf7f59732..a5daf4f6b 100644 --- a/src/mem/ruby/filters/BulkBloomFilter.cc +++ b/src/mem/ruby/filters/BulkBloomFilter.cc @@ -26,6 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "base/intmath.hh" #include "base/str.hh" #include "mem/ruby/filters/BulkBloomFilter.hh" @@ -98,9 +100,9 @@ BulkBloomFilter::set(const Address& addr) //Address permuted_bits = permute(addr); //int c1 = permuted_bits.bitSelect(0, set_bits-1); int c1 = addr.bitSelect( block_bits+set_bits, (block_bits+2*set_bits) - 1); - //ASSERT(c0 < (m_filter_size/2)); - //ASSERT(c0 + (m_filter_size/2) < m_filter_size); - //ASSERT(c1 < (m_filter_size/2)); + //assert(c0 < (m_filter_size/2)); + //assert(c0 + (m_filter_size/2) < m_filter_size); + //assert(c1 < (m_filter_size/2)); // set v0 bit m_filter[c0 + (m_filter_size/2)] = 1; // set v1 bit @@ -124,9 +126,9 @@ BulkBloomFilter::isSet(const Address& addr) //Address permuted_bits = permute(addr); //int c1 = permuted_bits.bitSelect(0, set_bits-1); int c1 = addr.bitSelect( block_bits+set_bits, (block_bits+2*set_bits) - 1); - //ASSERT(c0 < (m_filter_size/2)); - //ASSERT(c0 + (m_filter_size/2) < m_filter_size); - //ASSERT(c1 < (m_filter_size/2)); + //assert(c0 < (m_filter_size/2)); + //assert(c0 + (m_filter_size/2) < m_filter_size); + //assert(c1 < (m_filter_size/2)); // set v0 bit m_temp_filter[c0 + (m_filter_size/2)] = 1; // set v1 bit -- cgit v1.2.3