From patchwork Tue Nov 23 18:53:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 72734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E457AB70AF for ; Wed, 24 Nov 2010 06:08:20 +1100 (EST) Received: from localhost ([127.0.0.1]:51760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKyDx-0002lt-Ab for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 14:08:17 -0500 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 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PKxzz-0003Qw-CL; Tue, 23 Nov 2010 18:53:51 +0000 From: Peter Maydell To: Anthony Liguori , qemu-devel@nongnu.org Date: Tue, 23 Nov 2010 18:53:42 +0000 Message-Id: <1290538431-13170-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> References: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 03/12] target-arm: Handle 'smc' as an undefined instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 Reviewed-by: Nathan Froyd --- 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);