Rename enum from OpType to OpClass so it's consistent with the

real thing.  Also rename the null case to something that can
be a C++ symbol.

--HG--
extra : convert_revision : e3bfc4065b59c21f613e486d234711c48d7c9070

diff --git a/src/cpu/FuncUnit.py b/src/cpu/FuncUnit.py
index 541bdbd835968d7775acc27ffd96024afa6881db..ad2d1b87b9f28bb3f7d2591830d9c3cfcd6ebac2 100644 (file)
--- a/src/cpu/FuncUnit.py
+++ b/src/cpu/FuncUnit.py
@@ -29,15 +29,15 @@
 from m5.SimObject import SimObject
 from m5.params import *
 
-class OpType(Enum):
-    vals = ['(null)', 'IntAlu', 'IntMult', 'IntDiv', 'FloatAdd',
+class OpClass(Enum):
+    vals = ['No_OpClass', 'IntAlu', 'IntMult', 'IntDiv', 'FloatAdd',
             'FloatCmp', 'FloatCvt', 'FloatMult', 'FloatDiv', 'FloatSqrt',
             'MemRead', 'MemWrite', 'IprAccess', 'InstPrefetch']
 
 class OpDesc(SimObject):
     type = 'OpDesc'
     issueLat = Param.Int(1, "cycles until another can be issued")
-    opClass = Param.OpType("type of operation")
+    opClass = Param.OpClass("type of operation")
     opLat = Param.Int(1, "cycles until result is available")
 
 class FUDesc(SimObject):

diff --git a/src/cpu/op_class.cc b/src/cpu/op_class.cc
index f7ef49c0f6278bf75a30993536529e9838c1594a..02cb4a08ac4b7c577338b3d1accf21a907eada08 100644 (file)
--- a/src/cpu/op_class.cc
+++ b/src/cpu/op_class.cc
@@ -34,7 +34,7 @@
 const char *
 opClassStrings[Num_OpClasses] =
 {
-    "(null)",
+    "No_OpClass",
     "IntAlu",
     "IntMult",
     "IntDiv",