From 49e14940adeea797abd2be4ccda97d0349b22aae Mon Sep 17 00:00:00 2001 From: Adam Lackorzynski Date: Tue, 7 Dec 2010 12:01:44 +0000 Subject: target-arm: Handle 'smc' as an undefined instruction Refine check on bkpt so that smc and undefined instruction encodings are handled as an undefined instruction and trap. Signed-off-by: Adam Lackorzynski Signed-off-by: Peter Maydell Reviewed-by: Nathan Froyd --- target-arm/translate.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'target-arm/translate.c') diff --git a/target-arm/translate.c b/target-arm/translate.c index 947de6d18a..bf1e643b53 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -6346,7 +6346,14 @@ static void disas_arm_insn(CPUState * env, DisasContext *s) dead_tmp(tmp2); store_reg(s, rd, tmp); break; - case 7: /* bkpt */ + case 7: + /* SMC instruction (op1 == 3) + and undefined instructions (op1 == 0 || op1 == 2) + will trap */ + if (op1 != 1) { + goto illegal_op; + } + /* bkpt */ gen_set_condexec(s); gen_set_pc_im(s->pc - 4); gen_exception(EXCP_BKPT); -- cgit v1.2.3