From patchwork Sun Jul 4 09:17:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lackorzynski X-Patchwork-Id: 57833 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 7B8D3B6EF3 for ; Sun, 4 Jul 2010 19:19:53 +1000 (EST) Received: from localhost ([127.0.0.1]:53075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OVLMb-00013v-VT for incoming@patchwork.ozlabs.org; Sun, 04 Jul 2010 05:19:49 -0400 Received: from [140.186.70.92] (port=60188 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OVLKM-0000bv-7Q for qemu-devel@nongnu.org; Sun, 04 Jul 2010 05:17:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OVLKK-0003dt-49 for qemu-devel@nongnu.org; Sun, 04 Jul 2010 05:17:30 -0400 Received: from os.inf.tu-dresden.de ([141.76.48.99]:56298) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OVLKJ-0003bA-Ut for qemu-devel@nongnu.org; Sun, 04 Jul 2010 05:17:28 -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.72) id 1OVLKH-00073p-Js for qemu-devel@nongnu.org; Sun, 04 Jul 2010 11:17:25 +0200 Date: Sun, 4 Jul 2010 11:17:23 +0200 From: Adam Lackorzynski To: qemu-devel@nongnu.org Message-ID: <20100704091723.GB14248@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] Resend: 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 Handle smc as an undefined instruction instead of having it wrongly interpreted as some other one. 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 6fcdd7e..9b5d650 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -6346,7 +6346,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);