yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-29 18:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Honour MDCR_EL2.TDE when routing exceptions due to BKPT/BRK

Browse source 
The MDCR_EL2.TDE bit allows the exception level targeted by debug
exceptions to be set to EL2 for code executing at EL0. We handle
this in the arm_debug_target_el() function, but this is only used for
hardware breakpoint and watchpoint exceptions, not for the exception
generated when the guest executes an AArch32 BKPT or AArch64 BRK
instruction. We don't have enough information for a translate-time
equivalent of arm_debug_target_el(), so instead make BKPT and BRK
call a special purpose helper which can do the routing, rather than
the generic exception_with_syndrome helper.

Backports commit c900a2e62dd6dde11c8f5249b638caad05bb15be from qemu
This commit is contained in:
Peter Maydell 2018-03-25 16:30:22 -04:00 committed by Lioncash
parent ecd2ecb590
commit 7a3ee5fd95
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
18 changed files with 52 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/aarch64.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_aarch64
#define helper_divu_i64 helper_divu_i64_aarch64
#define helper_double_saturate helper_double_saturate_aarch64
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_aarch64
#define helper_exception_internal helper_exception_internal_aarch64
#define helper_exception_return helper_exception_return_aarch64
#define helper_exception_with_syndrome helper_exception_with_syndrome_aarch64

1
qemu/aarch64eb.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_aarch64eb
#define helper_divu_i64 helper_divu_i64_aarch64eb
#define helper_double_saturate helper_double_saturate_aarch64eb
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_aarch64eb
#define helper_exception_internal helper_exception_internal_aarch64eb
#define helper_exception_return helper_exception_return_aarch64eb
#define helper_exception_with_syndrome helper_exception_with_syndrome_aarch64eb

1
qemu/arm.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_arm
#define helper_divu_i64 helper_divu_i64_arm
#define helper_double_saturate helper_double_saturate_arm
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_arm
#define helper_exception_internal helper_exception_internal_arm
#define helper_exception_return helper_exception_return_arm
#define helper_exception_with_syndrome helper_exception_with_syndrome_arm

1
qemu/armeb.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_armeb
#define helper_divu_i64 helper_divu_i64_armeb
#define helper_double_saturate helper_double_saturate_armeb
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_armeb
#define helper_exception_internal helper_exception_internal_armeb
#define helper_exception_return helper_exception_return_armeb
#define helper_exception_with_syndrome helper_exception_with_syndrome_armeb

1
qemu/header_gen.py
View file

@ -973,6 +973,7 @@ symbols = (
'helper_divu_i32',
'helper_divu_i64',
'helper_double_saturate',
'helper_exception_bkpt_insn',
'helper_exception_internal',
'helper_exception_return',
'helper_exception_with_syndrome',

1
qemu/m68k.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_m68k
#define helper_divu_i64 helper_divu_i64_m68k
#define helper_double_saturate helper_double_saturate_m68k
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_m68k
#define helper_exception_internal helper_exception_internal_m68k
#define helper_exception_return helper_exception_return_m68k
#define helper_exception_with_syndrome helper_exception_with_syndrome_m68k

1
qemu/mips.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_mips
#define helper_divu_i64 helper_divu_i64_mips
#define helper_double_saturate helper_double_saturate_mips
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_mips
#define helper_exception_internal helper_exception_internal_mips
#define helper_exception_return helper_exception_return_mips
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips

1
qemu/mips64.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_mips64
#define helper_divu_i64 helper_divu_i64_mips64
#define helper_double_saturate helper_double_saturate_mips64
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_mips64
#define helper_exception_internal helper_exception_internal_mips64
#define helper_exception_return helper_exception_return_mips64
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips64

1
qemu/mips64el.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_mips64el
#define helper_divu_i64 helper_divu_i64_mips64el
#define helper_double_saturate helper_double_saturate_mips64el
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_mips64el
#define helper_exception_internal helper_exception_internal_mips64el
#define helper_exception_return helper_exception_return_mips64el
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips64el

1
qemu/mipsel.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_mipsel
#define helper_divu_i64 helper_divu_i64_mipsel
#define helper_double_saturate helper_double_saturate_mipsel
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_mipsel
#define helper_exception_internal helper_exception_internal_mipsel
#define helper_exception_return helper_exception_return_mipsel
#define helper_exception_with_syndrome helper_exception_with_syndrome_mipsel

1
qemu/powerpc.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_powerpc
#define helper_divu_i64 helper_divu_i64_powerpc
#define helper_double_saturate helper_double_saturate_powerpc
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_powerpc
#define helper_exception_internal helper_exception_internal_powerpc
#define helper_exception_return helper_exception_return_powerpc
#define helper_exception_with_syndrome helper_exception_with_syndrome_powerpc

1
qemu/sparc.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_sparc
#define helper_divu_i64 helper_divu_i64_sparc
#define helper_double_saturate helper_double_saturate_sparc
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_sparc
#define helper_exception_internal helper_exception_internal_sparc
#define helper_exception_return helper_exception_return_sparc
#define helper_exception_with_syndrome helper_exception_with_syndrome_sparc

1
qemu/sparc64.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_sparc64
#define helper_divu_i64 helper_divu_i64_sparc64
#define helper_double_saturate helper_double_saturate_sparc64
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_sparc64
#define helper_exception_internal helper_exception_internal_sparc64
#define helper_exception_return helper_exception_return_sparc64
#define helper_exception_with_syndrome helper_exception_with_syndrome_sparc64

1
qemu/target/arm/helper.h
View file

@ -49,6 +49,7 @@ DEF_HELPER_FLAGS_3(sel_flags, TCG_CALL_NO_RWG_SE,
i32, i32, i32, i32)
DEF_HELPER_2(exception_internal, void, env, i32)
DEF_HELPER_4(exception_with_syndrome, void, env, i32, i32, i32)
DEF_HELPER_2(exception_bkpt_insn, void, env, i32)
DEF_HELPER_1(setend, void, env)
DEF_HELPER_2(wfi, void, env, i32)
DEF_HELPER_1(wfe, void, env)

8
qemu/target/arm/op_helper.c
View file

@ -489,6 +489,14 @@ void HELPER(exception_with_syndrome)(CPUARMState *env, uint32_t excp,
raise_exception(env, excp, syndrome, target_el);
}
/* Raise an EXCP_BKPT with the specified syndrome register value,
* targeting the correct exception level for debug exceptions.
*/
void HELPER(exception_bkpt_insn)(CPUARMState *env, uint32_t syndrome)
{
raise_exception(env, EXCP_BKPT, syndrome, arm_debug_target_el(env));
}
uint32_t HELPER(cpsr_read)(CPUARMState *env)
{
return cpsr_read(env) & ~(CPSR_EXEC | CPSR_RESERVED);

16
qemu/target/arm/translate-a64.c
View file

@ -340,6 +340,19 @@ static void gen_exception_insn(DisasContext *s, int offset, int excp,
s->base.is_jmp = DISAS_NORETURN;
}
static void gen_exception_bkpt_insn(DisasContext *s, int offset,
uint32_t syndrome)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv_i32 tcg_syn;
gen_a64_set_pc_im(s, s->pc - offset);
tcg_syn = tcg_const_i32(tcg_ctx, syndrome);
gen_helper_exception_bkpt_insn(tcg_ctx, tcg_ctx->cpu_env, tcg_syn);
tcg_temp_free_i32(tcg_ctx, tcg_syn);
s->base.is_jmp = DISAS_NORETURN;
}
static void gen_ss_advance(DisasContext *s)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
@ -1907,8 +1920,7 @@ static void disas_exc(DisasContext *s, uint32_t insn)
break;
}
/* BRK */
gen_exception_insn(s, 4, EXCP_BKPT, syn_aa64_bkpt(imm16),
default_exception_el(s));
gen_exception_bkpt_insn(s, 4, syn_aa64_bkpt(imm16));
break;
case 2:
if (op2_ll != 0) {

20
qemu/target/arm/translate.c
View file

@ -1292,6 +1292,19 @@ static void gen_exception_insn(DisasContext *s, int offset, int excp,
s->base.is_jmp = DISAS_NORETURN;
}
static void gen_exception_bkpt_insn(DisasContext *s, int offset, uint32_t syn)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
TCGv_i32 tcg_syn;
gen_set_condexec(s);
gen_set_pc_im(s, s->pc - offset);
tcg_syn = tcg_const_i32(tcg_ctx, syn);
gen_helper_exception_bkpt_insn(tcg_ctx, tcg_ctx->cpu_env, tcg_syn);
tcg_temp_free_i32(tcg_ctx, tcg_syn);
s->base.is_jmp = DISAS_NORETURN;
}
/* Force a TB lookup after an instruction that changes the CPU state. */
static inline void gen_lookup_tb(DisasContext *s)
{
@ -8953,9 +8966,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) // qq
case 1:
/* bkpt */
ARCH(5);
gen_exception_insn(s, 4, EXCP_BKPT,
syn_aa32_bkpt(imm16, false),
default_exception_el(s));
gen_exception_bkpt_insn(s, 4, syn_aa32_bkpt(imm16, false));
break;
case 2:
/* Hypervisor call (v7) */
@ -12191,8 +12202,7 @@ static void disas_thumb_insn(DisasContext *s, uint32_t insn)
{
int imm8 = extract32(insn, 0, 8);
ARCH(5);
gen_exception_insn(s, 2, EXCP_BKPT, syn_aa32_bkpt(imm8, true),
default_exception_el(s));
gen_exception_bkpt_insn(s, 2, syn_aa32_bkpt(imm8, true));
break;
}

1
qemu/x86_64.h
View file

@ -967,6 +967,7 @@
#define helper_divu_i32 helper_divu_i32_x86_64
#define helper_divu_i64 helper_divu_i64_x86_64
#define helper_double_saturate helper_double_saturate_x86_64
#define helper_exception_bkpt_insn helper_exception_bkpt_insn_x86_64
#define helper_exception_internal helper_exception_internal_x86_64
#define helper_exception_return helper_exception_return_x86_64
#define helper_exception_with_syndrome helper_exception_with_syndrome_x86_64