Skip to contentSkip to conversation

target-arm: Handle 'smc' as an undefined instruction

PATCH In review Adam Lackorzynski 2 participants 2 messages Sep 2, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target-arm: Handle 'smc' as an undefined instruction

Handle smc as an undefined instruction instead of having it wrongly interpreted as some other one.

---
 target-arm/translate.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
target-arm/translate.c +5 -1
index 6fcdd7e..9b5d650 100644
@@ -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);
Signature · 1 line
1.7.1
#1 lore raw

Am 02.09.2010 22:27, schrieb Adam Lackorzynski:

Quoted 13 lines

Handle smc as an undefined instruction instead of having it wrongly interpreted as some other one.

---
  target-arm/translate.c |    6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)
target-arm/translate.c +0 -0
index 6fcdd7e..9b5d650 100644

target-arm/translate.c static void disas_arm_insn(CPUState * env, DisasContext *s) · line 6353

Quoted 9 lines
target-arm/translate.c +4 -1
@@ -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;
 

QEMU's CODING_STYLE requires {} here.

Quoted 5 lines
target-arm/translate.c +1 -0
+            /* bkpt */
              gen_set_condexec(s);
              gen_set_pc_im(s->pc - 4);
              gen_exception(EXCP_BKPT);