CacheMemory: add allocateVoid() that is == allocate() but no return value.

This function duplicates the functionality of allocate() exactly, except that it does not return
a return value.  In protocols where you just want to allocate a block
but do not want that block to be your implicitly passed cache_entry, use this function.
Otherwise, SLICC will complain if you do not consume the pointer returned by allocate(),
and if you do a dummy assignment Entry foo := cache.allocate(address), the C++
compiler will complain of an unused variable.  This is kind of a hack to get around
those issues, but suggestions welcome.
This commit is contained in:
Lisa Hsu 2011-03-31 18:20:12 -07:00
parent d857105b5a
commit 01fc529bb2
4 changed files with 6 additions and 3 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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:

View file

@ -28,7 +28,6 @@
from m5.params import *
from m5.SimObject import SimObject
#from Controller import RubyController
class RubyWireBuffer(SimObject):
type = 'RubyWireBuffer'