diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-08-21 22:41:57 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-08-21 22:41:57 -0400 |
| commit | dda9819d932a73ec1c9a07e4e10b3c2ed2a356bb (patch) | |
| tree | 517632342b56d506aeb36ef7046be8085f4c1a22 /src/arch/sparc/isa/formats/branch.isa | |
| parent | 3fa57c21f5ffc5148f4fa8b19fb67b6ee9bbf16f (diff) | |
| download | gem5-dda9819d932a73ec1c9a07e4e10b3c2ed2a356bb.tar.xz | |
Fix annulled unconditional branches
--HG--
extra : convert_revision : 698b0ce38c7a47306f97df2cc80cdae4a51b22c7
Diffstat (limited to 'src/arch/sparc/isa/formats/branch.isa')
| -rw-r--r-- | src/arch/sparc/isa/formats/branch.isa | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/arch/sparc/isa/formats/branch.isa b/src/arch/sparc/isa/formats/branch.isa index 8a3f05173..2c206354b 100644 --- a/src/arch/sparc/isa/formats/branch.isa +++ b/src/arch/sparc/isa/formats/branch.isa @@ -224,7 +224,6 @@ let {{ // Primary format for branch instructions: def format Branch(code, *opt_flags) {{ - code = re.sub(r'handle_annul', handle_annul, code) (usesImm, code, immCode, rString, iString) = splitOutImm(code) iop = InstObjParams(name, Name, 'Branch', code, opt_flags) @@ -246,7 +245,14 @@ def format Branch(code, *opt_flags) {{ def format BranchN(bits, code, *opt_flags) {{ code = re.sub(r'handle_annul', handle_annul, code) codeBlk = CodeBlock(code) - iop = InstObjParams(name, Name, "BranchNBits<%d>" % bits, codeBlk, opt_flags) + new_opt_flags = [] + for flag in opt_flags: + if flag == ',a': + name += ',a' + Name += 'Annul' + else: + new_opt_flags += flag + iop = InstObjParams(name, Name, "BranchNBits<%d>" % bits, codeBlk, new_opt_flags) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) exec_output = BranchExecute.subst(iop) |