Commit 06c949e6 authored by pbrook's avatar pbrook
Browse files

Implement Arm BKPT instruction.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1740 c046a42c-6fe2-441c-8c8c-71466251a162
parent 0240ded8
......@@ -358,14 +358,27 @@ void cpu_loop(CPUARMState *env)
}
break;
case EXCP_SWI:
case EXCP_BKPT:
{
/* system call */
if (env->thumb) {
insn = lduw((void *)(env->regs[15] - 2));
n = insn & 0xff;
if (trapnr == EXCP_BKPT) {
if (env->thumb) {
insn = lduw((void *)(env->regs[15]));
n = insn & 0xff;
env->regs[15] += 2;
} else {
insn = ldl((void *)(env->regs[15]));
n = (insn & 0xf) | ((insn >> 4) & 0xff0);
env->regs[15] += 4;
}
} else {
insn = ldl((void *)(env->regs[15] - 4));
n = insn & 0xffffff;
if (env->thumb) {
insn = lduw((void *)(env->regs[15] - 2));
n = insn & 0xff;
} else {
insn = ldl((void *)(env->regs[15] - 4));
n = insn & 0xffffff;
}
}
if (n == ARM_NR_cacheflush) {
......
......@@ -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.
......
......@@ -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;
......
......@@ -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. */
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment