From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58025 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OzQSp-0002qg-3o for qemu-devel@nongnu.org; Sat, 25 Sep 2010 04:50:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OzQSn-0004EK-O0 for qemu-devel@nongnu.org; Sat, 25 Sep 2010 04:50:35 -0400 Received: from os.inf.tu-dresden.de ([141.76.48.99]:51009) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OzQSn-0004Dr-JF for qemu-devel@nongnu.org; Sat, 25 Sep 2010 04:50:33 -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 1OzQSk-0004Eo-Qb for qemu-devel@nongnu.org; Sat, 25 Sep 2010 10:50:30 +0200 Date: Sat, 25 Sep 2010 10:50:28 +0200 From: Adam Lackorzynski Message-ID: <20100925085028.GA5265@os.inf.tu-dresden.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Subject: [Qemu-devel] [PATCH] 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: qemu-devel@nongnu.org Refine check on bkpt so that smc and undefined instruction encodings are handled as an undefined instruction and trap. Signed-off-by: Adam Lackorzynski --- 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 6fcdd7e..9ac1f8b 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.7.1 Adam -- Adam adam@os.inf.tu-dresden.de Lackorzynski http://os.inf.tu-dresden.de/~adam/