From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51346 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKy0G-0004AX-7i for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKy0A-0007Ar-QC for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:07 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:30456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKy0A-00079W-Hg for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:02 -0500 From: Peter Maydell Date: Tue, 23 Nov 2010 18:53:42 +0000 Message-Id: <1290538431-13170-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> References: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 03/12] target-arm: Handle 'smc' as an undefined instruction List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org From: Adam Lackorzynski 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 --- target-arm/translate.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 947de6d..bf1e643 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); -- 1.6.3.3