target/arm: Remove offset argument to gen_exception_bkpt_insn
Unlike the other more generic gen_exception{,_internal}_insn interfaces, breakpoints always refer to the current instruction. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20190807045335.1361-10-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
aee828e754
commit
06bcbda3f6
|
@ -268,12 +268,11 @@ static void gen_exception_insn(DisasContext *s, uint64_t pc, int excp,
|
||||||
s->base.is_jmp = DISAS_NORETURN;
|
s->base.is_jmp = DISAS_NORETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gen_exception_bkpt_insn(DisasContext *s, int offset,
|
static void gen_exception_bkpt_insn(DisasContext *s, uint32_t syndrome)
|
||||||
uint32_t syndrome)
|
|
||||||
{
|
{
|
||||||
TCGv_i32 tcg_syn;
|
TCGv_i32 tcg_syn;
|
||||||
|
|
||||||
gen_a64_set_pc_im(s->base.pc_next - offset);
|
gen_a64_set_pc_im(s->pc_curr);
|
||||||
tcg_syn = tcg_const_i32(syndrome);
|
tcg_syn = tcg_const_i32(syndrome);
|
||||||
gen_helper_exception_bkpt_insn(cpu_env, tcg_syn);
|
gen_helper_exception_bkpt_insn(cpu_env, tcg_syn);
|
||||||
tcg_temp_free_i32(tcg_syn);
|
tcg_temp_free_i32(tcg_syn);
|
||||||
|
@ -1900,7 +1899,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* BRK */
|
/* BRK */
|
||||||
gen_exception_bkpt_insn(s, 4, syn_aa64_bkpt(imm16));
|
gen_exception_bkpt_insn(s, syn_aa64_bkpt(imm16));
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
if (op2_ll != 0) {
|
if (op2_ll != 0) {
|
||||||
|
|
|
@ -1258,12 +1258,12 @@ static void gen_exception_insn(DisasContext *s, uint32_t pc, int excp,
|
||||||
s->base.is_jmp = DISAS_NORETURN;
|
s->base.is_jmp = DISAS_NORETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gen_exception_bkpt_insn(DisasContext *s, int offset, uint32_t syn)
|
static void gen_exception_bkpt_insn(DisasContext *s, uint32_t syn)
|
||||||
{
|
{
|
||||||
TCGv_i32 tcg_syn;
|
TCGv_i32 tcg_syn;
|
||||||
|
|
||||||
gen_set_condexec(s);
|
gen_set_condexec(s);
|
||||||
gen_set_pc_im(s, s->base.pc_next - offset);
|
gen_set_pc_im(s, s->pc_curr);
|
||||||
tcg_syn = tcg_const_i32(syn);
|
tcg_syn = tcg_const_i32(syn);
|
||||||
gen_helper_exception_bkpt_insn(cpu_env, tcg_syn);
|
gen_helper_exception_bkpt_insn(cpu_env, tcg_syn);
|
||||||
tcg_temp_free_i32(tcg_syn);
|
tcg_temp_free_i32(tcg_syn);
|
||||||
|
@ -8140,7 +8140,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn)
|
||||||
case 1:
|
case 1:
|
||||||
/* bkpt */
|
/* bkpt */
|
||||||
ARCH(5);
|
ARCH(5);
|
||||||
gen_exception_bkpt_insn(s, 4, syn_aa32_bkpt(imm16, false));
|
gen_exception_bkpt_insn(s, syn_aa32_bkpt(imm16, false));
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
/* Hypervisor call (v7) */
|
/* Hypervisor call (v7) */
|
||||||
|
@ -11566,7 +11566,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn)
|
||||||
{
|
{
|
||||||
int imm8 = extract32(insn, 0, 8);
|
int imm8 = extract32(insn, 0, 8);
|
||||||
ARCH(5);
|
ARCH(5);
|
||||||
gen_exception_bkpt_insn(s, 2, syn_aa32_bkpt(imm8, true));
|
gen_exception_bkpt_insn(s, syn_aa32_bkpt(imm8, true));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue