diff -r 3008a9248373 -r 2f7caa7a4d08 src/mem/slicc/symbols/Type.py
--- a/src/mem/slicc/symbols/Type.py	Wed Aug 08 10:08:54 2012 -0500
+++ b/src/mem/slicc/symbols/Type.py	Wed Aug 08 10:09:43 2012 -0500
@@ -508,9 +508,11 @@
 {
 ''')
             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");