yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-20 01:38:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Clean up DISAS_UPDATE usage in AArch32 translation code

Browse Source 
AArch32 translation code does not distinguish between DISAS_UPDATE and
DISAS_JUMP. Thus, we cannot use any of them without first updating PC in
CPU state. Furthermore, it is too complicated to update PC in CPU state
before PC gets updated in disas context. So it is hardly possible to
correctly end TB early if is is not likely to be executed before calling
disas_*_insn(), e.g. just after calling breakpoint check helper.

Modify DISAS_UPDATE and DISAS_JUMP usage in AArch32 translation and
apply to them the same semantic as AArch64 translation does:
- DISAS_UPDATE: update PC in CPU state when finishing translation
- DISAS_JUMP: preserve current PC value in CPU state when finishing
translation

This patch fixes a bug in AArch32 breakpoint handling: when
check_breakpoints helper does not generate an exception, ending the TB
early with DISAS_UPDATE couldn't update PC in CPU state and execution
hangs.

Backports commit 577bf808958d06497928c639efaa473bf8c5e099 from qemu
This commit is contained in:
Sergey Fedorov 2018-02-17 17:43:06 -05:00 committed by Lioncash
parent f8c43c69b2
commit 23ece1622c
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qemu/target-arm/translate.c
View File

@ -897,7 +897,7 @@ static inline void gen_bx_im(DisasContext *s, uint32_t addr)
TCGv_i32 tmp;
TCGContext *tcg_ctx = s->uc->tcg_ctx;
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
if (s->thumb != (addr & 1)) {
tmp = tcg_temp_new_i32(tcg_ctx);
tcg_gen_movi_i32(tcg_ctx, tmp, addr & 1);
@ -912,7 +912,7 @@ static inline void gen_bx(DisasContext *s, TCGv_i32 var)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
tcg_gen_andi_i32(tcg_ctx, tcg_ctx->cpu_R[15], var, ~1);
tcg_gen_andi_i32(tcg_ctx, var, var, 1);
store_cpu_field(tcg_ctx, var, thumb);
@ -1100,7 +1100,7 @@ static inline void gen_lookup_tb(DisasContext *s)
{
TCGContext *tcg_ctx = s->uc->tcg_ctx;
tcg_gen_movi_i32(tcg_ctx, tcg_ctx->cpu_R[15], s->pc & ~1);
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
}
static inline void gen_add_data_offset(DisasContext *s, unsigned int insn,
@ -4205,7 +4205,7 @@ static void gen_exception_return(DisasContext *s, TCGv_i32 pc)
tmp = load_cpu_field(s->uc, spsr);
gen_set_cpsr(s, tmp, CPSR_ERET_MASK);
tcg_temp_free_i32(tcg_ctx, tmp);
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
}
/* Generate a v6 exception return. Marks both values as dead. */
@ -4215,7 +4215,7 @@ static void gen_rfe(DisasContext *s, TCGv_i32 pc, TCGv_i32 cpsr)
gen_set_cpsr(s, cpsr, CPSR_ERET_MASK);
tcg_temp_free_i32(tcg_ctx, cpsr);
store_reg(s, 15, pc);
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
}
static void gen_nop_hint(DisasContext *s, int val)
@ -9175,7 +9175,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) // qq
tmp = load_cpu_field(s->uc, spsr);
gen_set_cpsr(s, tmp, CPSR_ERET_MASK);
tcg_temp_free_i32(tcg_ctx, tmp);
s->is_jmp = DISAS_UPDATE;
s->is_jmp = DISAS_JUMP;
}
}
break;
@ -11549,7 +11549,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb)
/* We always get here via a jump, so know we are not in a
conditional execution block. */
gen_exception_internal(dc, EXCP_KERNEL_TRAP);
dc->is_jmp = DISAS_UPDATE;
dc->is_jmp = DISAS_EXC;
break;
}
#else
@ -11557,7 +11557,7 @@ void gen_intermediate_code(CPUARMState *env, TranslationBlock *tb)
/* We always get here via a jump, so know we are not in a
conditional execution block. */
gen_exception_internal(dc, EXCP_EXCEPTION_EXIT);
dc->is_jmp = DISAS_UPDATE;
dc->is_jmp = DISAS_EXC;
break;
}
#endif
@ -11705,7 +11705,8 @@ tb_end:
}
gen_set_label(tcg_ctx, dc->condlabel);
}
if (dc->condjmp || !dc->is_jmp) {
if (dc->condjmp || dc->is_jmp == DISAS_NEXT ||
dc->is_jmp == DISAS_UPDATE) {
gen_set_pc_im(dc, dc->pc);
dc->condjmp = 0;
}
@ -11741,9 +11742,11 @@ tb_end:
case DISAS_NEXT:
gen_goto_tb(dc, 1, dc->pc);
break;
default:
case DISAS_JUMP:
case DISAS_UPDATE:
gen_set_pc_im(dc, dc->pc);
/* fall through */
case DISAS_JUMP:
default:
/* indicate that the hash table must be used to find the next TB */
tcg_gen_exit_tb(tcg_ctx, 0);
break;