yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-23 06:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Move ss check to init_disas_context

Browse source 
We can check for single-step just once.

Backports commit f7708456aac23a8bb8864b12bcf1f20c6e4b7045 from qemu
This commit is contained in:
Richard Henderson 2018-03-04 20:34:31 -05:00 committed by Lioncash
parent dd36ec2bbf
commit 23d769c856
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12093,6 +12093,11 @@ static int arm_tr_init_disas_context(DisasContextBase *dcbase,
dc->next_page_start =
(dc->base.pc_first & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE;
/* If architectural single step active, limit to 1. */
if (is_singlestepping(dc)) {
max_insns = 1;
}
tcg_ctx->cpu_F0s = tcg_temp_new_i32(tcg_ctx);
tcg_ctx->cpu_F1s = tcg_temp_new_i32(tcg_ctx);
tcg_ctx->cpu_F0d = tcg_temp_new_i64(tcg_ctx);
@ -12252,11 +12257,9 @@ static void arm_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
* Also stop translation when a page boundary is reached. This
* ensures prefetch aborts occur at the right place. */
if (is_singlestepping(dc)) {
dc->base.is_jmp = DISAS_TOO_MANY;
} else if ((dc->pc >= dc->next_page_start) ||
((dc->pc >= dc->next_page_start - 3) &&
insn_crosses_page(env, dc))) {
if (dc->pc >= dc->next_page_start ||
(dc->pc >= dc->next_page_start - 3 &&
insn_crosses_page(env, dc))) {
/* We want to stop the TB if the next insn starts in a new page,
* or if it spans between this page and the next. This means that
* if we're looking at the last halfword in the page we need to