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
This commit is contained in:
Nathan Binkert 2007-06-11 23:10:58 -07:00
parent d14256f9ba
commit 125237d357
2 changed files with 4 additions and 4 deletions

View file

@ -29,15 +29,15 @@
from m5.SimObject import SimObject from m5.SimObject import SimObject
from m5.params import * from m5.params import *
class OpType(Enum): class OpClass(Enum):
vals = ['(null)', 'IntAlu', 'IntMult', 'IntDiv', 'FloatAdd', vals = ['No_OpClass', 'IntAlu', 'IntMult', 'IntDiv', 'FloatAdd',
'FloatCmp', 'FloatCvt', 'FloatMult', 'FloatDiv', 'FloatSqrt', 'FloatCmp', 'FloatCvt', 'FloatMult', 'FloatDiv', 'FloatSqrt',
'MemRead', 'MemWrite', 'IprAccess', 'InstPrefetch'] 'MemRead', 'MemWrite', 'IprAccess', 'InstPrefetch']
class OpDesc(SimObject): class OpDesc(SimObject):
type = 'OpDesc' type = 'OpDesc'
issueLat = Param.Int(1, "cycles until another can be issued") 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") opLat = Param.Int(1, "cycles until result is available")
class FUDesc(SimObject): class FUDesc(SimObject):

View file

@ -34,7 +34,7 @@
const char * const char *
opClassStrings[Num_OpClasses] = opClassStrings[Num_OpClasses] =
{ {
"(null)", "No_OpClass",
"IntAlu", "IntAlu",
"IntMult", "IntMult",
"IntDiv", "IntDiv",