summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2007-06-11 23:10:58 -0700
committerNathan Binkert <binkertn@umich.edu>2007-06-11 23:10:58 -0700
commit125237d357be7f2c5adf03da8dcf352ccad32954 (patch)
tree7f59e6d6e5e5a87f25592707221a4524c8ea11b0 /src
parentd14256f9bae4f808c832318c6e9baa294313655d (diff)
downloadgem5-125237d357be7f2c5adf03da8dcf352ccad32954.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/cpu/FuncUnit.py6
-rw-r--r--src/cpu/op_class.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cpu/FuncUnit.py b/src/cpu/FuncUnit.py
index 541bdbd83..ad2d1b87b 100644
--- 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 f7ef49c0f..02cb4a08a 100644
--- 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",