diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-25 12:12:38 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 17:36:12 +0000 |
| commit | 5cd4248672e5cd62cfec4753bd6d6ce666694f1f (patch) | |
| tree | 7b0379ee8f0ff44a76895ff50922becda6a16d40 /src/arch | |
| parent | 5cf312eb5bec50ab2142ce4c7df05d673cd9a716 (diff) | |
| download | gem5-5cd4248672e5cd62cfec4753bd6d6ce666694f1f.tar.xz | |
python: Replace dict.has_key with 'key in dict'
Python 3 has removed dict.has_key in favour of 'key in dict'.
Change-Id: I9852a5f57d672bea815308eb647a0ce45624fad5
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15987
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/arch')
| -rwxr-xr-x | src/arch/isa_parser.py | 2 | ||||
| -rw-r--r-- | src/arch/x86/isa/macroop.isa | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py index 16004c009..48bc23fa3 100755 --- a/src/arch/isa_parser.py +++ b/src/arch/isa_parser.py @@ -142,7 +142,7 @@ class Template(object): del myDict['snippets'] snippetLabels = [l for l in labelRE.findall(template) - if d.snippets.has_key(l)] + if l in d.snippets] snippets = dict([(s, self.parser.mungeSnippet(d.snippets[s])) for s in snippetLabels]) diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa index 33e559c11..7d729618a 100644 --- a/src/arch/x86/isa/macroop.isa +++ b/src/arch/x86/isa/macroop.isa @@ -333,7 +333,7 @@ let {{ noModRMString = "env.setSeg(machInst);\n" def genMacroop(Name, env): blocks = OutputBlocks() - if not macroopDict.has_key(Name): + if not Name in macroopDict: raise Exception, "Unrecognized instruction: %s" % Name macroop = macroopDict[Name] if not macroop.declared: |