From 91a84c5b3cfb888794ac0245c066a4724b9a0871 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 14 Aug 2015 12:04:51 -0500 Subject: ruby: replace Address by Addr This patch eliminates the type Address defined by the ruby memory system. This memory system would now use the type Addr that is in use by the rest of the system. --- src/mem/ruby/filters/MultiBitSelBloomFilter.hh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/mem/ruby/filters/MultiBitSelBloomFilter.hh') diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh index 7edb45953..e43dcd6f1 100644 --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh @@ -34,6 +34,7 @@ #include #include "mem/ruby/common/Address.hh" +#include "mem/ruby/common/TypeDefines.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" class MultiBitSelBloomFilter : public AbstractBloomFilter @@ -43,18 +44,18 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter ~MultiBitSelBloomFilter(); void clear(); - void increment(const Address& addr); - void decrement(const Address& addr); + void increment(Addr addr); + void decrement(Addr addr); void merge(AbstractBloomFilter * other_filter); - void set(const Address& addr); - void unset(const Address& addr); + void set(Addr addr); + void unset(Addr addr); - bool isSet(const Address& addr); - int getCount(const Address& addr); + bool isSet(Addr addr); + int getCount(Addr addr); int getTotalCount(); void print(std::ostream& out) const; - int getIndex(const Address& addr); + int getIndex(Addr addr); int readBit(const int index); void writeBit(const int index, const int value); @@ -65,7 +66,7 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter } private: - int get_index(const Address& addr, int hashNumber); + int get_index(Addr addr, int hashNumber); int hash_bitsel(uint64 value, int index, int jump, int maxBits, int numBits); -- cgit v1.2.3