From: Joel Hestness <jthestness@gmail.com>
Date: Tue, 9 Apr 2013 21:25:29 +0000 (-0500)
Subject: Ruby: Add field to slicc machine for generic type
X-Git-Tag: stable_2013_06_16~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e98c3c227da0b7c4a3e11e64eb80386727b3fa1c;p=gem5.git

Ruby: Add field to slicc machine for generic type

This allows you to have (i.e.) an L2 cache that is not named "L2Cache"
but is still a GenericMachineType_L2Cache. This is particularly
helpful if the protocol has multiple L2 controllers.
---

diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py
index 6ee48ba8b..1c2177ce1 100644
--- a/src/mem/slicc/symbols/Type.py
+++ b/src/mem/slicc/symbols/Type.py
@@ -540,9 +540,11 @@ ConvertMachToGenericMach(MachineType machType)
 {
 ''')
             for enum in self.enums.itervalues():
+                genericType = self.enums[enum.ident].get('genericType',
+                                                         enum.ident)
                 code('''
       if (machType == MachineType_${{enum.ident}})
-          return GenericMachineType_${{enum.ident}};
+          return GenericMachineType_${{genericType}};
 ''')
             code('''
       panic("cannot convert to a GenericMachineType");