summaryrefslogtreecommitdiff
path: root/arch/sparc/isa/formats/branch.isa
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-03-16 18:40:54 -0500
committerKorey Sewell <ksewell@umich.edu>2006-03-16 18:40:54 -0500
commit1db74514c23a09997d3f3eabca31a4dc94cec2f7 (patch)
treec28b33bbed1535a72503cdd5f52c39889dd0a449 /arch/sparc/isa/formats/branch.isa
parent805b9cf1d5ace9c02b7bd120ee1bc082f544699d (diff)
parent1d741c48af9f08718d359d9e3b7d3c0bf562a467 (diff)
downloadgem5-1db74514c23a09997d3f3eabca31a4dc94cec2f7.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips --HG-- extra : convert_revision : 02fe0b0170348dc6f6a985c15123806088a8c23e
Diffstat (limited to 'arch/sparc/isa/formats/branch.isa')
-rw-r--r--arch/sparc/isa/formats/branch.isa3
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)
}};