ruby: added generic dma machine

diff --git a/src/mem/protocol/RubySlicc_Exports.sm b/src/mem/protocol/RubySlicc_Exports.sm
index 2e4a167840299f8379f85b5c74d1ed7f78960461..e8616521a7412da426f9ef8bbd216945e0a0c721 100644 (file)
--- a/src/mem/protocol/RubySlicc_Exports.sm
+++ b/src/mem/protocol/RubySlicc_Exports.sm
@@ -173,6 +173,7 @@ enumeration(GenericMachineType, desc="...", default="GenericMachineType_NULL") {
   L2Cache,     desc="L2 Cache Mach";
   L3Cache,     desc="L3 Cache Mach";
   Directory,   desc="Directory Mach";
+  DMA,         desc="DMA Mach";
   Collector,   desc="Collector Mach";
   L1Cache_wCC, desc="L1 Cache Mach with Cache Coherence (used for miss latency profile)";
   L2Cache_wCC, desc="L1 Cache Mach with Cache Coherence (used for miss latency profile)";

diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
index 1858085cc681657c29b995d40a16d57ee98a80e9..2b7eb8b3b385322fb0e9bf0ad928c84e03900b7e 100644 (file)
--- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
@@ -151,6 +151,9 @@ ConvertMachToGenericMach(MachineType machType)
     if (machType == MachineType_Directory)
         return GenericMachineType_Directory;
 
+    if (machType == MACHINETYPE_DMA_ENUM)
+        return GenericMachineType_DMA;
+
     panic("cannot convert to a GenericMachineType");
 }