From patchwork Mon May 10 23:01:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lackorzynski X-Patchwork-Id: 52244 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 7894AB7D6A for ; Tue, 11 May 2010 09:01:47 +1000 (EST) Received: from localhost ([127.0.0.1]:53070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBbyo-0002AG-Kk for incoming@patchwork.ozlabs.org; Mon, 10 May 2010 19:01:42 -0400 Received: from [140.186.70.92] (port=39231 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBbyG-00029a-Ht for qemu-devel@nongnu.org; Mon, 10 May 2010 19:01:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OBbyE-0005Py-VR for qemu-devel@nongnu.org; Mon, 10 May 2010 19:01:08 -0400 Received: from os.inf.tu-dresden.de ([141.76.48.99]:36972) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OBbyE-0005Pc-QA for qemu-devel@nongnu.org; Mon, 10 May 2010 19:01:06 -0400 Received: from erwin.inf.tu-dresden.de ([141.76.48.80] helo=os.inf.tu-dresden.de) by os.inf.tu-dresden.de with esmtps (TLSv1:AES128-SHA:128) (Exim 4.71) id 1OBbyC-0004vT-E8 for qemu-devel@nongnu.org; Tue, 11 May 2010 01:01:04 +0200 Date: Tue, 11 May 2010 01:01:02 +0200 From: Adam Lackorzynski To: qemu-devel@nongnu.org Message-ID: <20100510230102.GB352@os.inf.tu-dresden.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH] 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 Signed-off-by: Adam Lackorzynski --- target-arm/translate.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 0eccca5..afd6716 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -6344,7 +6344,11 @@ static void disas_arm_insn(CPUState * env, DisasContext *s) dead_tmp(tmp2); store_reg(s, rd, tmp); break; - case 7: /* bkpt */ + case 7: + /* SMC? */ + if ((insn & 0xfffffff0) == 0xe1600070) + goto illegal_op; + /* bkpt */ gen_set_condexec(s); gen_set_pc_im(s->pc - 4); gen_exception(EXCP_BKPT);