summaryrefslogtreecommitdiff
path: root/src/arch/arm/isa/insts/misc.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:16 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:16 -0500
commite9c8f68c0fcfb72934b852a61671fb94a1927e1d (patch)
tree25c89e490c733f3a3afdd775f2c7a094a69fe4a1 /src/arch/arm/isa/insts/misc.isa
parent05bd3eb4ec3d9fea3dbc46112a47459085d3011c (diff)
downloadgem5-e9c8f68c0fcfb72934b852a61671fb94a1927e1d.tar.xz
ARM: Make undefined instructions obey predication.
Diffstat (limited to 'src/arch/arm/isa/insts/misc.isa')
-rw-r--r--src/arch/arm/isa/insts/misc.isa13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/arch/arm/isa/insts/misc.isa b/src/arch/arm/isa/insts/misc.isa
index ee6330f48..ddf548a19 100644
--- a/src/arch/arm/isa/insts/misc.isa
+++ b/src/arch/arm/isa/insts/misc.isa
@@ -468,6 +468,19 @@ let {{
header_output += BasicDeclare.subst(itIop)
decoder_output += BasicConstructor.subst(itIop)
exec_output += PredOpExecute.subst(itIop)
+ unknownCode = '''
+#if FULL_SYSTEM
+ return new UndefinedInstruction;
+#else
+ return new UndefinedInstruction(machInst, true);
+#endif
+ '''
+ unknownIop = InstObjParams("unknown", "Unknown", "UnknownOp", \
+ { "code": unknownCode,
+ "predicate_test": predicateTest })
+ header_output += BasicDeclare.subst(unknownIop)
+ decoder_output += BasicConstructor.subst(unknownIop)
+ exec_output += PredOpExecute.subst(unknownIop)
ubfxCode = '''
Dest = bits(Op1, imm2, imm1);