diff options
Diffstat (limited to 'src/mem')
-rw-r--r-- | src/mem/protocol/MESI_CMP_directory.slicc | 7 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-L1cache.sm (renamed from src/mem/protocol/MESI_CMP_directory-L1cache.sm) | 0 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-L2cache.sm (renamed from src/mem/protocol/MESI_CMP_directory-L2cache.sm) | 0 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-dir.sm (renamed from src/mem/protocol/MESI_CMP_directory-dir.sm) | 2 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-dma.sm (renamed from src/mem/protocol/MESI_CMP_directory-dma.sm) | 0 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level-msg.sm (renamed from src/mem/protocol/MESI_CMP_directory-msg.sm) | 0 | ||||
-rw-r--r-- | src/mem/protocol/MESI_Two_Level.slicc | 7 | ||||
-rw-r--r-- | src/mem/protocol/SConsopts | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/mem/protocol/MESI_CMP_directory.slicc b/src/mem/protocol/MESI_CMP_directory.slicc deleted file mode 100644 index 37ac0a424..000000000 --- a/src/mem/protocol/MESI_CMP_directory.slicc +++ /dev/null @@ -1,7 +0,0 @@ -protocol "MESI_CMP_directory"; -include "RubySlicc_interfaces.slicc"; -include "MESI_CMP_directory-msg.sm"; -include "MESI_CMP_directory-L1cache.sm"; -include "MESI_CMP_directory-L2cache.sm"; -include "MESI_CMP_directory-dir.sm"; -include "MESI_CMP_directory-dma.sm"; diff --git a/src/mem/protocol/MESI_CMP_directory-L1cache.sm b/src/mem/protocol/MESI_Two_Level-L1cache.sm index bd56b5660..bd56b5660 100644 --- a/src/mem/protocol/MESI_CMP_directory-L1cache.sm +++ b/src/mem/protocol/MESI_Two_Level-L1cache.sm diff --git a/src/mem/protocol/MESI_CMP_directory-L2cache.sm b/src/mem/protocol/MESI_Two_Level-L2cache.sm index 2b174bf76..2b174bf76 100644 --- a/src/mem/protocol/MESI_CMP_directory-L2cache.sm +++ b/src/mem/protocol/MESI_Two_Level-L2cache.sm diff --git a/src/mem/protocol/MESI_CMP_directory-dir.sm b/src/mem/protocol/MESI_Two_Level-dir.sm index 9418b75ac..9e503309e 100644 --- a/src/mem/protocol/MESI_CMP_directory-dir.sm +++ b/src/mem/protocol/MESI_Two_Level-dir.sm @@ -34,7 +34,7 @@ // Copied here by aep 12/14/07 -machine(Directory, "MESI_CMP_filter_directory protocol") +machine(Directory, "MESI Two Level directory protocol") : DirectoryMemory * directory, MemoryControl * memBuffer, Cycles to_mem_ctrl_latency = 1, diff --git a/src/mem/protocol/MESI_CMP_directory-dma.sm b/src/mem/protocol/MESI_Two_Level-dma.sm index 8032c0bec..8032c0bec 100644 --- a/src/mem/protocol/MESI_CMP_directory-dma.sm +++ b/src/mem/protocol/MESI_Two_Level-dma.sm diff --git a/src/mem/protocol/MESI_CMP_directory-msg.sm b/src/mem/protocol/MESI_Two_Level-msg.sm index 85a54c1f2..85a54c1f2 100644 --- a/src/mem/protocol/MESI_CMP_directory-msg.sm +++ b/src/mem/protocol/MESI_Two_Level-msg.sm diff --git a/src/mem/protocol/MESI_Two_Level.slicc b/src/mem/protocol/MESI_Two_Level.slicc new file mode 100644 index 000000000..b5bf104df --- /dev/null +++ b/src/mem/protocol/MESI_Two_Level.slicc @@ -0,0 +1,7 @@ +protocol "MESI_Two_Level"; +include "RubySlicc_interfaces.slicc"; +include "MESI_Two_Level-msg.sm"; +include "MESI_Two_Level-L1cache.sm"; +include "MESI_Two_Level-L2cache.sm"; +include "MESI_Two_Level-dir.sm"; +include "MESI_Two_Level-dma.sm"; diff --git a/src/mem/protocol/SConsopts b/src/mem/protocol/SConsopts index 95b043bc5..923f032fb 100644 --- a/src/mem/protocol/SConsopts +++ b/src/mem/protocol/SConsopts @@ -33,7 +33,7 @@ import os Import('*') all_protocols.extend([ - 'MESI_CMP_directory', + 'MESI_Two_Level', 'MI_example', 'MOESI_CMP_directory', 'MOESI_CMP_token', |