Patchwork [03/12] target-arm: Handle 'smc' as an undefined instruction

login
register
mail settings
Submitter Peter Maydell
Date Nov. 23, 2010, 6:53 p.m.
Message ID <1290538431-13170-4-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/72734/
State New
Headers show

Comments

Peter Maydell - Nov. 23, 2010, 6:53 p.m.
From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

Refine check on bkpt so that smc and undefined instruction encodings are
handled as an undefined instruction and trap.

Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target-arm/translate.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Nathan Froyd - Nov. 29, 2010, 6:23 p.m.
On Tue, Nov 23, 2010 at 06:53:42PM +0000, Peter Maydell wrote:
> From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> 
> Refine check on bkpt so that smc and undefined instruction encodings are
> handled as an undefined instruction and trap.
> 
> Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Nathan Froyd <froydnj@codesourcery.com>

-Nathan

Patch

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);