summaryrefslogtreecommitdiff
path: root/src/arch/sparc/isa/formats/mem.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-10-15 20:37:28 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-10-15 20:37:28 -0400
commit7009d0e52339036e1b282b15a29e71863ada020c (patch)
tree57f315b91a0a3302ff574dc3b2070aae90b2176b /src/arch/sparc/isa/formats/mem.isa
parent92fd211a07356a9dec8cb822675c359355e22621 (diff)
downloadgem5-7009d0e52339036e1b282b15a29e71863ada020c.tar.xz
Fix how additional template parameters are handled. Non string parameters are not processed as code.
src/arch/isa_parser.py: Changed the way the extra template parameters are specified. MIPS might need to be adjusted. src/arch/sparc/isa/decoder.isa: Changed how Frd_N was set up. src/arch/sparc/isa/formats/blockmem.isa: Fixed up handling of block memory operations src/arch/sparc/isa/formats/integerop.isa: src/arch/sparc/isa/formats/mem.isa: src/arch/sparc/isa/formats/priv.isa: Fix up extra template parameters. --HG-- extra : convert_revision : ebf850d192193521bb84ca36b577051f74338d23
Diffstat (limited to 'src/arch/sparc/isa/formats/mem.isa')
-rw-r--r--src/arch/sparc/isa/formats/mem.isa8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/sparc/isa/formats/mem.isa b/src/arch/sparc/isa/formats/mem.isa
index 88d39d890..b046bdd1c 100644
--- a/src/arch/sparc/isa/formats/mem.isa
+++ b/src/arch/sparc/isa/formats/mem.isa
@@ -188,11 +188,11 @@ let {{
addrCalcReg = 'EA = Rs1 + Rs2;'
addrCalcImm = 'EA = Rs1 + imm;'
iop = InstObjParams(name, Name, 'Mem', code,
- opt_flags, ("ea_code", addrCalcReg),
- ("priv_check", priv))
+ opt_flags, {"ea_code": addrCalcReg,
+ "priv_check": priv})
iop_imm = InstObjParams(name, Name + 'Imm', 'MemImm', code,
- opt_flags, ("ea_code", addrCalcImm),
- ("priv_check", priv))
+ opt_flags, {"ea_code": addrCalcImm,
+ "priv_check": priv})
header_output = BasicDeclare.subst(iop) + BasicDeclare.subst(iop_imm)
decoder_output = BasicConstructor.subst(iop) + BasicConstructor.subst(iop_imm)
decode_block = ROrImmDecode.subst(iop)