aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2006-02-04 19:35:26 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2006-02-04 19:35:26 +0000
commit06c949e62a098f97bd68a7382eb1953898a11e09 (patch)
tree6b61094e2ea53aa0f9f02a0e74cdc0e84a523739 /target-arm
parent0240ded8bb1580147ed2ff1748df439a3b41e38f (diff)
downloadqemu-06c949e62a098f97bd68a7382eb1953898a11e09.zip
qemu-06c949e62a098f97bd68a7382eb1953898a11e09.tar.gz
qemu-06c949e62a098f97bd68a7382eb1953898a11e09.tar.bz2
Implement Arm BKPT instruction.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1740 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/cpu.h1
-rw-r--r--target-arm/helper.c1
-rw-r--r--target-arm/op.c6
-rw-r--r--target-arm/translate.c13
4 files changed, 21 insertions, 0 deletions
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 3b36839..7cc7da6 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -34,6 +34,7 @@
#define EXCP_DATA_ABORT 4
#define EXCP_IRQ 5
#define EXCP_FIQ 6
+#define EXCP_BKPT 7
/* We currently assume float and double are IEEE single and double
precision respectively.
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 538e17a..5804df8 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -127,6 +127,7 @@ void do_interrupt(CPUARMState *env)
offset = 0;
break;
case EXCP_PREFETCH_ABORT:
+ case EXCP_BKPT:
new_mode = ARM_CPU_MODE_ABT;
addr = 0x0c;
mask = CPSR_A | CPSR_I;
diff --git a/target-arm/op.c b/target-arm/op.c
index 35419a1..acac239 100644
--- a/target-arm/op.c
+++ b/target-arm/op.c
@@ -885,6 +885,12 @@ void OPPROTO op_wfi(void)
cpu_loop_exit();
}
+void OPPROTO op_bkpt(void)
+{
+ env->exception_index = EXCP_BKPT;
+ cpu_loop_exit();
+}
+
/* VFP support. We follow the convention used for VFP instrunctions:
Single precition routines have a "s" suffix, double precision a
"d" suffix. */
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 089fbf2..5f81708 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -1217,6 +1217,12 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
gen_op_addl_T0_T1_saturate();
gen_movl_reg_T0(s, rd);
break;
+ case 7: /* bkpt */
+ gen_op_movl_T0_im((long)s->pc - 4);
+ gen_op_movl_reg_TN[0][15]();
+ gen_op_bkpt();
+ s->is_jmp = DISAS_JUMP;
+ break;
case 0x8: /* signed multiply */
case 0xa:
case 0xc:
@@ -2183,6 +2189,13 @@ static void disas_thumb_insn(DisasContext *s)
gen_bx(s);
break;
+ case 0xe: /* bkpt */
+ gen_op_movl_T0_im((long)s->pc - 2);
+ gen_op_movl_reg_TN[0][15]();
+ gen_op_bkpt();
+ s->is_jmp = DISAS_JUMP;
+ break;
+
default:
goto undef;
}