[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] target-arm: Handle 'smc' as an undefined inst
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 03/12] target-arm: Handle 'smc' as an undefined instruction |
Date: |
Tue, 23 Nov 2010 18:53:42 +0000 |
From: Adam Lackorzynski <address@hidden>
Refine check on bkpt so that smc and undefined instruction encodings are
handled as an undefined instruction and trap.
Signed-off-by: Adam Lackorzynski <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
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 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);
--
1.6.3.3
- Re: [Qemu-devel] [PATCH 08/12] ARM: Return correct result for single<->double conversion of NaN, (continued)
[Qemu-devel] [PATCH 01/12] target-arm: Add support for PKHxx in thumb2, Peter Maydell, 2010/11/23
[Qemu-devel] [PATCH 07/12] ARM: Return correct result for float-to-integer conversion of NaN, Peter Maydell, 2010/11/23
[Qemu-devel] [PATCH 03/12] target-arm: Handle 'smc' as an undefined instruction,
Peter Maydell <=