diff options
| -rw-r--r-- | src/mem/protocol/RubySlicc_Types.sm | 1 | ||||
| -rw-r--r-- | src/mem/ruby/system/CacheMemory.hh | 4 | ||||
| -rw-r--r-- | src/mem/ruby/system/WireBuffer.hh | 3 | ||||
| -rw-r--r-- | src/mem/ruby/system/WireBuffer.py | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/mem/protocol/RubySlicc_Types.sm b/src/mem/protocol/RubySlicc_Types.sm index 7d444ab57..cf0f64500 100644 --- a/src/mem/protocol/RubySlicc_Types.sm +++ b/src/mem/protocol/RubySlicc_Types.sm @@ -134,6 +134,7 @@ structure (CacheMemory, external = "yes") { bool cacheAvail(Address); Address cacheProbe(Address); AbstractCacheEntry allocate(Address, AbstractCacheEntry); + void allocateVoid(Address, AbstractCacheEntry); void deallocate(Address); AbstractCacheEntry lookup(Address); bool isTagPresent(Address); diff --git a/src/mem/ruby/system/CacheMemory.hh b/src/mem/ruby/system/CacheMemory.hh index 197ac9f40..e2e9a429e 100644 --- a/src/mem/ruby/system/CacheMemory.hh +++ b/src/mem/ruby/system/CacheMemory.hh @@ -83,6 +83,10 @@ class CacheMemory : public SimObject // find an unused entry and sets the tag appropriate for the address AbstractCacheEntry* allocate(const Address& address, AbstractCacheEntry* new_entry); + void allocateVoid(const Address& address, AbstractCacheEntry* new_entry) + { + allocate(address, new_entry); + } // Explicitly free up this address void deallocate(const Address& address); diff --git a/src/mem/ruby/system/WireBuffer.hh b/src/mem/ruby/system/WireBuffer.hh index 1404f5561..b34488fb1 100644 --- a/src/mem/ruby/system/WireBuffer.hh +++ b/src/mem/ruby/system/WireBuffer.hh @@ -54,7 +54,7 @@ ///////////////////////////////////////////////////////////////////////////// class Consumer; -class Message; // I added this and removed Message.hh +class Message; class WireBuffer : public SimObject { @@ -88,7 +88,6 @@ class WireBuffer : public SimObject void clearStats() const; void printStats(std::ostream& out) const; -// int m_dummy; uint64_t m_msg_counter; private: diff --git a/src/mem/ruby/system/WireBuffer.py b/src/mem/ruby/system/WireBuffer.py index 0bcc291bb..bca19b4df 100644 --- a/src/mem/ruby/system/WireBuffer.py +++ b/src/mem/ruby/system/WireBuffer.py @@ -28,7 +28,6 @@ from m5.params import * from m5.SimObject import SimObject -#from Controller import RubyController class RubyWireBuffer(SimObject): type = 'RubyWireBuffer' |