diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 09:57:15 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 16:44:21 +0000 |
| commit | bc42d2fa8bc7fc2bd610011993ac168e8f5f41d3 (patch) | |
| tree | 27fb9d9889a55c2fe43dd27610fa353bd4eea238 /src/mem/slicc | |
| parent | 31dff7faa0a0be22e70376a49748cf4b8f1eb5f9 (diff) | |
| download | gem5-bc42d2fa8bc7fc2bd610011993ac168e8f5f41d3.tar.xz | |
python: Replace orderdict with collections.OrderedDict
Python 2.7 and newer has support for ordered dictionaries in the
standard library. Remove this custom class.
Change-Id: I4b720405aa3c4ce8d5c0b401eefe744a85ac3a3e
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/16362
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/mem/slicc')
| -rw-r--r-- | src/mem/slicc/symbols/StateMachine.py | 12 | ||||
| -rw-r--r-- | src/mem/slicc/symbols/Type.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index cbcc7924a..330cc0369 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -26,7 +26,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from m5.util import orderdict +from collections import OrderedDict from slicc.symbols.Symbol import Symbol from slicc.symbols.Var import Var @@ -78,10 +78,10 @@ class StateMachine(Symbol): if str(param.type_ast.type) == "Prefetcher": self.prefetchers.append(var) - self.states = orderdict() - self.events = orderdict() - self.actions = orderdict() - self.request_types = orderdict() + self.states = OrderedDict() + self.events = OrderedDict() + self.actions = OrderedDict() + self.request_types = OrderedDict() self.transitions = [] self.in_ports = [] self.functions = [] @@ -1303,7 +1303,7 @@ ${ident}_Controller::doTransitionWorker(${ident}_Event event, ''') # This map will allow suppress generating duplicate code - cases = orderdict() + cases = OrderedDict() for trans in self.transitions: case_string = "%s_State_%s, %s_Event_%s" % \ diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py index 37c0b16c7..162c1ab04 100644 --- a/src/mem/slicc/symbols/Type.py +++ b/src/mem/slicc/symbols/Type.py @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from m5.util import orderdict +from collections import OrderedDict from slicc.util import PairContainer from slicc.symbols.Symbol import Symbol @@ -89,9 +89,9 @@ class Type(Symbol): self.isStateDecl = ("state_decl" in self) self.statePermPairs = [] - self.data_members = orderdict() + self.data_members = OrderedDict() self.methods = {} - self.enums = orderdict() + self.enums = OrderedDict() @property def isPrimitive(self): |