misc: Merge branch 'release-staging-v20.0.0.0' into develop

[gem5.git] / src / mem / ruby / protocol / RubySlicc_Types.sm

diff --git a/src/mem/ruby/protocol/RubySlicc_Types.sm b/src/mem/ruby/protocol/RubySlicc_Types.sm
index e3a136f247564e29392e980eb8e2e275c8ec980b..831a322af97df7576a67a034276d7b3bf1f86eb0 100644 (file)
--- a/src/mem/ruby/protocol/RubySlicc_Types.sm
+++ b/src/mem/ruby/protocol/RubySlicc_Types.sm
@@ -128,7 +128,6 @@ structure (Sequencer, external = "yes") {
   void writeCallbackScFail(Addr, DataBlock);
   bool llscCheckMonitor(Addr);
 
-  void checkCoherence(Addr);
   void evictionCallback(Addr);
   void recordRequestType(SequencerRequestType);
   bool checkResourceAvailable(CacheResourceType, Addr);
@@ -147,7 +146,6 @@ structure (GPUCoalescer, external = "yes") {
                      Cycles, Cycles, Cycles);
   void writeCallback(Addr, MachineType, DataBlock,
                      Cycles, Cycles, Cycles, bool);
-  void checkCoherence(Addr);
   void evictionCallback(Addr);
   void recordCPReadCallBack(MachineID, MachineID);
   void recordCPWriteCallBack(MachineID, MachineID);
@@ -168,7 +166,6 @@ structure (VIPERCoalescer, external = "yes") {
                      Cycles, Cycles, Cycles, bool);
   void invCallback(Addr);
   void wbCallback(Addr);
-  void checkCoherence(Addr);
   void evictionCallback(Addr);
 }
 
@@ -196,6 +193,7 @@ structure(AbstractCacheEntry, primitive="yes", external = "yes") {
 structure (DirectoryMemory, external = "yes") {
   AbstractCacheEntry allocate(Addr, AbstractCacheEntry);
   AbstractCacheEntry lookup(Addr);
+  void deallocate(Addr);
   bool isPresent(Addr);
   void invalidateBlock(Addr);
   void recordRequestType(DirectoryRequestType);