changeset 154338c2c6f6 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=154338c2c6f6
description:
ARM: Add a DataOp format so data op definitions can be aggregated.
diffstat:
1 file changed, 47 insertions(+)
src/arch/arm/isa/formats/pred.isa | 47 +++++++++++++++++++++++++++++++++++++
diffs (64 lines):
diff -r 588457e03a81 -r 154338c2c6f6 src/arch/arm/isa/formats/pred.isa
--- a/src/arch/arm/isa/formats/pred.isa Sat Jun 27 00:30:23 2009 -0700
+++ b/src/arch/arm/isa/formats/pred.isa Wed Jul 01 22:10:58 2009 -0700
@@ -57,6 +57,20 @@
}
}};
+def template DataDecode {{
+ if (machInst.opcode4 == 0) {
+ if (machInst.sField == 0)
+ return new %(class_name)sImm(machInst);
+ else
+ return new %(class_name)sImmCc(machInst);
+ } else {
+ if (machInst.sField == 0)
+ return new %(class_name)s(machInst);
+ else
+ return new %(class_name)sCc(machInst);
+ }
+}};
+
let {{
calcCcCode = '''
@@ -78,6 +92,39 @@
}};
+def format DataOp(code, icValue, ivValue) {{
+ code += "resTemp = resTemp;"
+ regCode = re.sub(r'op2', 'shift_rm_rs(Rm, Rs, \
+ shift, Cpsr<29:0>)', code)
+ immCode = re.sub(r'op2', 'shift_rm_imm(Rm, shift_size, \
+ shift, Cpsr<29:0>)', code)
+ regIop = InstObjParams(name, Name, 'PredIntOp',
+ {"code": regCode,
+ "predicate_test": predicateTest})
+ immIop = InstObjParams(name, Name + "Imm", 'PredIntOp',
+ {"code": immCode,
+ "predicate_test": predicateTest})
+ regCcIop = InstObjParams(name, Name + "Cc", 'PredIntOp',
+ {"code": regCode + calcCcCode % vars(),
+ "predicate_test": predicateTest})
+ immCcIop = InstObjParams(name, Name + "ImmCc", 'PredIntOp',
+ {"code": immCode + calcCcCode % vars(),
+ "predicate_test": predicateTest})
+ header_output = BasicDeclare.subst(regIop) + \
+ BasicDeclare.subst(immIop) + \
+ BasicDeclare.subst(regCcIop) + \
+ BasicDeclare.subst(immCcIop)
+ decoder_output = BasicConstructor.subst(regIop) + \
+ BasicConstructor.subst(immIop) + \
+ BasicConstructor.subst(regCcIop) + \
+ BasicConstructor.subst(immCcIop)
+ exec_output = PredOpExecute.subst(regIop) + \
+ PredOpExecute.subst(immIop) + \
+ PredOpExecute.subst(regCcIop) + \
+ PredOpExecute.subst(immCcIop)
+ decode_block = DataDecode.subst(regIop)
+}};
+
def format PredOp(code, *opt_flags) {{
iop = InstObjParams(name, Name, 'PredOp',
{"code": code,
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev