diff -r 53990904220e -r 9a2bcc7b7be1 src/arch/arm/isa/insts/misc.isa --- a/src/arch/arm/isa/insts/misc.isa Fri Aug 13 12:01:45 2010 -0500 +++ b/src/arch/arm/isa/insts/misc.isa Fri Aug 13 12:02:24 2010 -0500 @@ -88,7 +88,7 @@ msrCpsrRegIop = InstObjParams("msr", "MsrCpsrReg", "MsrRegOp", { "code": msrCpsrRegCode, "predicate_test": condPredicateTest }, - ["IsSerializeAfter"]) + ["IsSerializeAfter","IsNonSpeculative"]) header_output += MsrRegDeclare.subst(msrCpsrRegIop) decoder_output += MsrRegConstructor.subst(msrCpsrRegIop) exec_output += PredOpExecute.subst(msrCpsrRegIop) @@ -97,7 +97,7 @@ msrSpsrRegIop = InstObjParams("msr", "MsrSpsrReg", "MsrRegOp", { "code": msrSpsrRegCode, "predicate_test": predicateTest }, - ["IsSerializeAfter"]) + ["IsSerializeAfter","IsNonSpeculative"]) header_output += MsrRegDeclare.subst(msrSpsrRegIop) decoder_output += MsrRegConstructor.subst(msrSpsrRegIop) exec_output += PredOpExecute.subst(msrSpsrRegIop) @@ -112,7 +112,7 @@ msrCpsrImmIop = InstObjParams("msr", "MsrCpsrImm", "MsrImmOp", { "code": msrCpsrImmCode, "predicate_test": condPredicateTest }, - ["IsSerializeAfter"]) + ["IsSerializeAfter","IsNonSpeculative"]) header_output += MsrImmDeclare.subst(msrCpsrImmIop) decoder_output += MsrImmConstructor.subst(msrCpsrImmIop) exec_output += PredOpExecute.subst(msrCpsrImmIop) @@ -121,7 +121,7 @@ msrSpsrImmIop = InstObjParams("msr", "MsrSpsrImm", "MsrImmOp", { "code": msrSpsrImmCode, "predicate_test": predicateTest }, - ["IsSerializeAfter"]) + ["IsSerializeAfter","IsNonSpeculative"]) header_output += MsrImmDeclare.subst(msrSpsrImmIop) decoder_output += MsrImmConstructor.subst(msrSpsrImmIop) exec_output += PredOpExecute.subst(msrSpsrImmIop) @@ -615,7 +615,8 @@ ''' mcr15Iop = InstObjParams("mcr", "Mcr15", "RegRegOp", { "code": mcr15code, - "predicate_test": predicateTest }, []) + "predicate_test": predicateTest }, + ["IsSerializeAfter","IsNonSpeculative"]) header_output += RegRegOpDeclare.subst(mcr15Iop) decoder_output += RegRegOpConstructor.subst(mcr15Iop) exec_output += PredOpExecute.subst(mcr15Iop) @@ -629,7 +630,8 @@ mcr15UserIop = InstObjParams("mcr", "Mcr15User", "RegRegOp", { "code": "MiscDest = Op1", - "predicate_test": predicateTest }, []) + "predicate_test": predicateTest }, + ["IsSerializeAfter","IsNonSpeculative"]) header_output += RegRegOpDeclare.subst(mcr15UserIop) decoder_output += RegRegOpConstructor.subst(mcr15UserIop) exec_output += PredOpExecute.subst(mcr15UserIop) @@ -742,7 +744,8 @@ ''' cpsIop = InstObjParams("cps", "Cps", "ImmOp", { "code": cpsCode, - "predicate_test": predicateTest }, []) + "predicate_test": predicateTest }, + ["IsSerializeAfter","IsNonSpeculative"]) header_output += ImmOpDeclare.subst(cpsIop) decoder_output += ImmOpConstructor.subst(cpsIop) exec_output += PredOpExecute.subst(cpsIop)