diff options
| -rw-r--r-- | src/mem/slicc/symbols/StateMachine.py | 3 | ||||
| -rw-r--r-- | src/mem/slicc/symbols/Transition.py | 11 | ||||
| -rw-r--r-- | src/mem/slicc/symbols/Type.py | 13 |
3 files changed, 7 insertions, 20 deletions
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index d908f00c6..578d3ae0b 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -1253,8 +1253,7 @@ ${ident}_Controller::doTransitionWorker(${ident}_Event event, case_sorter = [] res = trans.resources for key,val in res.iteritems(): - if key.type.ident != "DNUCAStopTable": - val = ''' + val = ''' if (!%s.areNSlotsAvailable(%s)) return TransitionResult_ResourceStall; ''' % (key.code, val) diff --git a/src/mem/slicc/symbols/Transition.py b/src/mem/slicc/symbols/Transition.py index 4a7a72a6c..901d4a0e8 100644 --- a/src/mem/slicc/symbols/Transition.py +++ b/src/mem/slicc/symbols/Transition.py @@ -42,13 +42,10 @@ class Transition(Symbol): for action in self.actions: for var,value in action.resources.iteritems(): - if var.type.ident != "DNUCAStopTable": - num = int(value) - if var in self.resources: - num += int(value) - self.resources[var] = str(num) - else: - self.resources[var] = value + num = int(value) + if var in self.resources: + num += int(value) + self.resources[var] = str(num) def __repr__(self): return "[Transition: (%r, %r) -> %r, %r]" % \ diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py index 29b68f2c5..dc5448430 100644 --- a/src/mem/slicc/symbols/Type.py +++ b/src/mem/slicc/symbols/Type.py @@ -72,18 +72,12 @@ class Type(Symbol): self["networkmessage"] = "yes" # FIXME - all of the following id comparisons are fragile hacks - if self.ident in ("CacheMemory", "NewCacheMemory", - "TLCCacheMemory", "DNUCACacheMemory", - "DNUCABankCacheMemory", "L2BankCacheMemory", - "CompressedCacheMemory", "PrefetchCacheMemory"): + if self.ident in ("CacheMemory"): self["cache"] = "yes" - if self.ident in ("TBETable", "DNUCATBETable", "DNUCAStopTable"): + if self.ident in ("TBETable"): self["tbe"] = "yes" - if self.ident == "NewTBETable": - self["newtbe"] = "yes" - if self.ident == "TimerTable": self["timer"] = "yes" @@ -96,9 +90,6 @@ class Type(Symbol): if self.ident == "Prefetcher": self["prefetcher"] = "yes" - if self.ident == "DNUCA_Movement": - self["mover"] = "yes" - self.isMachineType = (ident == "MachineType") self.isStateDecl = ("state_decl" in self) |