diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-16 14:08:31 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-16 14:08:31 -0500 |
| commit | 1d741c48af9f08718d359d9e3b7d3c0bf562a467 (patch) | |
| tree | 088166d7dbb41b065080a4ace70ce91a9aa24039 /arch/sparc/isa/formats/branch.isa | |
| parent | 31a20c88c52f6051575fe760251407d11e5715ba (diff) | |
| parent | 558cc7f775dc404e4152212b5c6459ad9f4bb269 (diff) | |
| download | gem5-1d741c48af9f08718d359d9e3b7d3c0bf562a467.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
arch/sparc/isa/decoder.isa:
SCCS merged
--HG--
extra : convert_revision : 460843b49bc96b3fbc5897828c23f9cf9b010ae0
Diffstat (limited to 'arch/sparc/isa/formats/branch.isa')
| -rw-r--r-- | arch/sparc/isa/formats/branch.isa | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/isa/formats/branch.isa b/arch/sparc/isa/formats/branch.isa index 80101de1b..b9dc960de 100644 --- a/arch/sparc/isa/formats/branch.isa +++ b/arch/sparc/isa/formats/branch.isa @@ -34,7 +34,6 @@ def template BranchExecute {{ { //Attempt to execute the instruction Fault fault = NoFault; - checkPriv; %(op_decl)s; %(op_rd)s; @@ -57,6 +56,6 @@ def format Branch(code, *opt_flags) {{ iop = InstObjParams(name, Name, 'SparcStaticInst', cblk, opt_flags) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) - decode_block = BasicDecodeWithMnemonic.subst(iop) + decode_block = BasicDecode.subst(iop) exec_output = BranchExecute.subst(iop) }}; |