diff options
Diffstat (limited to 'src/mem/protocol')
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-msg.sm | 4 | ||||
-rw-r--r-- | src/mem/protocol/MI_example-msg.sm | 8 | ||||
-rw-r--r-- | src/mem/protocol/MOESI_CMP_directory-msg.sm | 4 | ||||
-rw-r--r-- | src/mem/protocol/MOESI_CMP_token-msg.sm | 10 | ||||
-rw-r--r-- | src/mem/protocol/MOESI_hammer-msg.sm | 8 | ||||
-rw-r--r-- | src/mem/protocol/Network_test-msg.sm | 2 | ||||
-rw-r--r-- | src/mem/protocol/RubySlicc_Exports.sm | 1 |
7 files changed, 19 insertions, 18 deletions
diff --git a/src/mem/protocol/MESI_Two_Level-msg.sm b/src/mem/protocol/MESI_Two_Level-msg.sm index 85a54c1f2..d7b8b3118 100644 --- a/src/mem/protocol/MESI_Two_Level-msg.sm +++ b/src/mem/protocol/MESI_Two_Level-msg.sm @@ -57,7 +57,7 @@ enumeration(CoherenceResponseType, desc="...") { } // RequestMsg -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; RubyAccessMode AccessMode, desc="user/supervisor access type"; @@ -86,7 +86,7 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") { } // ResponseMsg -structure(ResponseMsg, desc="...", interface="NetworkMessage") { +structure(ResponseMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceResponseType Type, desc="Type of response (Ack, Data, etc)"; MachineID Sender, desc="What component sent the data"; diff --git a/src/mem/protocol/MI_example-msg.sm b/src/mem/protocol/MI_example-msg.sm index 568b79786..f7721c6e0 100644 --- a/src/mem/protocol/MI_example-msg.sm +++ b/src/mem/protocol/MI_example-msg.sm @@ -50,7 +50,7 @@ enumeration(CoherenceResponseType, desc="...") { } // RequestMsg (and also forwarded requests) -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; MachineID Requestor, desc="Node who initiated the request"; @@ -74,7 +74,7 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") { } // ResponseMsg (and also unblock requests) -structure(ResponseMsg, desc="...", interface="NetworkMessage") { +structure(ResponseMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceResponseType Type, desc="Type of response (Ack, Data, etc)"; MachineID Sender, desc="Node who sent the data"; @@ -108,7 +108,7 @@ enumeration(DMAResponseType, desc="...", default="DMAResponseType_NULL") { NULL, desc="Invalid"; } -structure(DMARequestMsg, desc="...", interface="NetworkMessage") { +structure(DMARequestMsg, desc="...", interface="Message") { DMARequestType Type, desc="Request type (read/write)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; @@ -127,7 +127,7 @@ structure(DMARequestMsg, desc="...", interface="NetworkMessage") { } } -structure(DMAResponseMsg, desc="...", interface="NetworkMessage") { +structure(DMAResponseMsg, desc="...", interface="Message") { DMAResponseType Type, desc="Response type (DATA/ACK)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; diff --git a/src/mem/protocol/MOESI_CMP_directory-msg.sm b/src/mem/protocol/MOESI_CMP_directory-msg.sm index 6452aa9f9..eaef28f77 100644 --- a/src/mem/protocol/MOESI_CMP_directory-msg.sm +++ b/src/mem/protocol/MOESI_CMP_directory-msg.sm @@ -84,7 +84,7 @@ structure(TriggerMsg, desc="...", interface="Message") { } // RequestMsg (and also forwarded requests) -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; int Len, desc="Length of Request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; @@ -113,7 +113,7 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") { } // ResponseMsg (and also unblock requests) -structure(ResponseMsg, desc="...", interface="NetworkMessage") { +structure(ResponseMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceResponseType Type, desc="Type of response (Ack, Data, etc)"; MachineID Sender, desc="Node who sent the data"; diff --git a/src/mem/protocol/MOESI_CMP_token-msg.sm b/src/mem/protocol/MOESI_CMP_token-msg.sm index 6df417e00..91e8c1dc8 100644 --- a/src/mem/protocol/MOESI_CMP_token-msg.sm +++ b/src/mem/protocol/MOESI_CMP_token-msg.sm @@ -57,7 +57,7 @@ enumeration(CoherenceResponseType, desc="...") { } // PersistentMsg -structure(PersistentMsg, desc="...", interface="NetworkMessage") { +structure(PersistentMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; PersistentRequestType Type, desc="Type of starvation request"; MachineID Requestor, desc="Node who initiated the request"; @@ -78,7 +78,7 @@ structure(PersistentMsg, desc="...", interface="NetworkMessage") { } // RequestMsg -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; MachineID Requestor, desc="Node who initiated the request"; @@ -101,7 +101,7 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") { } // ResponseMsg -structure(ResponseMsg, desc="...", interface="NetworkMessage") { +structure(ResponseMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceResponseType Type, desc="Type of response (Ack, Data, etc)"; MachineID Sender, desc="Node who sent the data"; @@ -134,7 +134,7 @@ enumeration(DMAResponseType, desc="...", default="DMAResponseType_NULL") { NULL, desc="Invalid"; } -structure(DMARequestMsg, desc="...", interface="NetworkMessage") { +structure(DMARequestMsg, desc="...", interface="Message") { DMARequestType Type, desc="Request type (read/write)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; @@ -153,7 +153,7 @@ structure(DMARequestMsg, desc="...", interface="NetworkMessage") { } } -structure(DMAResponseMsg, desc="...", interface="NetworkMessage") { +structure(DMAResponseMsg, desc="...", interface="Message") { DMAResponseType Type, desc="Response type (DATA/ACK)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; diff --git a/src/mem/protocol/MOESI_hammer-msg.sm b/src/mem/protocol/MOESI_hammer-msg.sm index 240b27ed7..12472ad98 100644 --- a/src/mem/protocol/MOESI_hammer-msg.sm +++ b/src/mem/protocol/MOESI_hammer-msg.sm @@ -86,7 +86,7 @@ structure(TriggerMsg, desc="...", interface="Message") { } // RequestMsg (and also forwarded requests) -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; MachineID Requestor, desc="Node who initiated the request"; @@ -113,7 +113,7 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") { } // ResponseMsg (and also unblock requests) -structure(ResponseMsg, desc="...", interface="NetworkMessage") { +structure(ResponseMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceResponseType Type, desc="Type of response (Ack, Data, etc)"; MachineID Sender, desc="Node who sent the data"; @@ -164,7 +164,7 @@ enumeration(DMAResponseType, desc="...", default="DMAResponseType_NULL") { NULL, desc="Invalid"; } -structure(DMARequestMsg, desc="...", interface="NetworkMessage") { +structure(DMARequestMsg, desc="...", interface="Message") { DMARequestType Type, desc="Request type (read/write)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; @@ -183,7 +183,7 @@ structure(DMARequestMsg, desc="...", interface="NetworkMessage") { } } -structure(DMAResponseMsg, desc="...", interface="NetworkMessage") { +structure(DMAResponseMsg, desc="...", interface="Message") { DMAResponseType Type, desc="Response type (DATA/ACK)"; Address PhysicalAddress, desc="Physical address for this request"; Address LineAddress, desc="Line address for this request"; diff --git a/src/mem/protocol/Network_test-msg.sm b/src/mem/protocol/Network_test-msg.sm index d40e74f5f..b4d788823 100644 --- a/src/mem/protocol/Network_test-msg.sm +++ b/src/mem/protocol/Network_test-msg.sm @@ -33,7 +33,7 @@ enumeration(CoherenceRequestType, desc="...") { } // RequestMsg (and also forwarded requests) -structure(RequestMsg, desc="...", interface="NetworkMessage") { +structure(RequestMsg, desc="...", interface="Message") { Address Addr, desc="Physical address for this request"; CoherenceRequestType Type, desc="Type of request (GetS, GetX, PutX, etc)"; MachineID Requestor, desc="Node who initiated the request"; diff --git a/src/mem/protocol/RubySlicc_Exports.sm b/src/mem/protocol/RubySlicc_Exports.sm index 4162800c5..b2a8bcb00 100644 --- a/src/mem/protocol/RubySlicc_Exports.sm +++ b/src/mem/protocol/RubySlicc_Exports.sm @@ -219,6 +219,7 @@ structure(SequencerMsg, desc="...", interface="Message") { DataBlock DataBlk, desc="Data"; int Len, desc="size in bytes of access"; PrefetchBit Prefetch, desc="Is this a prefetch request"; + MessageSizeType MessageSize; bool functionalRead(Packet *pkt) { return testAndRead(PhysicalAddress, DataBlk, pkt); |