diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-05-14 23:58:23 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-05-14 23:58:23 -0400 |
| commit | 0a053c7919cb13d216d85784577cbbd4539cd291 (patch) | |
| tree | 785eb25f80e0523531bb6db2558435e3105c427d /arch/sparc/isa/base.isa | |
| parent | 0be3d001c9089b78e334dca6d0c7f1a178cf202f (diff) | |
| parent | 149b724b86ae6cc40d8794123e8359209080f5a9 (diff) | |
| download | gem5-0a053c7919cb13d216d85784577cbbd4539cd291.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 2db5529a9fbe8c62e57cad05f093c915f9713c67
Diffstat (limited to 'arch/sparc/isa/base.isa')
| -rw-r--r-- | arch/sparc/isa/base.isa | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/isa/base.isa b/arch/sparc/isa/base.isa index cb370a3e7..8ea11b40e 100644 --- a/arch/sparc/isa/base.isa +++ b/arch/sparc/isa/base.isa @@ -99,14 +99,16 @@ def template ROrImmDecode {{ let {{ def splitOutImm(code): - matcher = re.compile(r'Rs(?P<rNum>\d)_or_imm(?P<iNum>\d+)') + matcher = re.compile(r'Rs(?P<rNum>\d)_or_imm(?P<iNum>\d+)(?P<typeQual>\.\w+)?') rOrImmMatch = matcher.search(code) if (rOrImmMatch == None): return (False, code, '', '', '') rString = rOrImmMatch.group("rNum") + if (rOrImmMatch.group("typeQual") != None): + rString += rOrImmMatch.group("typeQual") iString = rOrImmMatch.group("iNum") orig_code = code - code = matcher.sub('Rs' + rOrImmMatch.group("rNum"), orig_code) + code = matcher.sub('Rs' + rString, orig_code) imm_code = matcher.sub('imm', orig_code) return (True, code, imm_code, rString, iString) }}; |