1 files changed, 14 insertions, 44 deletions

diff --git a/src/mem/protocol/RubySlicc_Types.sm b/src/mem/protocol/RubySlicc_Types.sm
index 3f038031d..aa5648a9e 100644
--- a/src/mem/protocol/RubySlicc_Types.sm
+++ b/src/mem/protocol/RubySlicc_Types.sm
@@ -31,6 +31,7 @@
 
 external_type(DataBlock, desc="..."){
   void clear();
+  void copyPartial(DataBlock, int, int);
 }
 
 external_type(MessageBuffer, buffer="yes", inport="yes", outport="yes");
@@ -48,8 +49,7 @@ external_type(InPort, primitive="yes") {
 external_type(NodeID, default="0");
 external_type(MachineID);
 
-external_type(StoreBuffer);
-
+MessageBuffer getMandatoryQueue(int core_id);
 
 external_type(Set, non_obj="yes") {
   void setSize(int);
@@ -96,53 +96,11 @@ external_type(NetDest, non_obj="yes") {
   MachineID smallestElement(MachineType);
 }
 
-external_type(PersistentTable) {
-  void persistentRequestLock(Address, MachineID, AccessType);
-  void persistentRequestUnlock(Address, MachineID);
-  bool okToIssueStarving(Address);
-  MachineID findSmallest(Address);
-  AccessType typeOfSmallest(Address);
-  void markEntries(Address);
-  bool isLocked(Address);
-  int countStarvingForAddress(Address);
-  int countReadStarvingForAddress(Address);
-}
-
-external_type(NodePersistentTable) {
-  void persistentRequestLock(Address, NodeID, AccessType);
-  void persistentRequestUnlock(Address, NodeID);
-  bool okToIssueStarving(Address);
-  NodeID findSmallest(Address);
-  AccessType typeOfSmallest(Address);
-  void markEntries(Address);
-  bool isLocked(Address);
-  int countStarvingForAddress(Address);
-  int countReadStarvingForAddress(Address);
-}
-
 external_type(Sequencer) {
-  void readCallback(Address, DataBlock, GenericMachineType, PrefetchBit, int);
-  void writeCallback(Address, DataBlock, GenericMachineType, PrefetchBit, int);
-  void readCallback(Address, DataBlock, GenericMachineType, PrefetchBit);
-  void writeCallback(Address, DataBlock, GenericMachineType, PrefetchBit);
   void readCallback(Address, DataBlock);
   void writeCallback(Address, DataBlock);
-  void readCallback(Address);
-  void writeCallback(Address);
-  void readCallbackAbort(Address, int);
-  void writeCallbackAbort(Address, int);
-  void readConflictCallback(Address);
-  void writeConflictCallback(Address);
-  void xactCallback(Address);
-  void updateCurrentVersion();
-  void updateLastCommittedVersion();
-  void systemRecovery();
-  void systemRestart();
   void checkCoherence(Address);
   void profileNack(Address, int, int, uint64);
-  void resetRequestTime(Address, int);
-  bool isReadAborted(Address, int);
-  bool isWriteAborted(Address, int);
 }
 
 external_type(TimerTable, inport="yes") {
@@ -153,4 +111,16 @@ external_type(TimerTable, inport="yes") {
   bool isSet(Address);
 }
 
+external_type(GenericBloomFilter) {
+
+  void clear(int);
+  void increment(Address, int);
+  void decrement(Address, int);
+  void set(Address, int);
+  void unset(Address, int);
+
+  bool isSet(Address, int);
+  int getCount(Address, int);
+}
+