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

target/i386: [tcg] Port to tb_stop

Browse source 
Incrementally paves the way towards using the generic instruction translation
loop.

Backports commit 47e981b42553f00110024c33897354f9014e83e9 from qemu
This commit is contained in:
Lluís Vilanova 2018-03-04 17:27:37 -05:00 committed by Lioncash
parent bea36e432c
commit 75ddf81d2c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qemu/target/i386/translate.c
View file

@ -9265,8 +9265,6 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
/* if irq were inhibited with HF_INHIBIT_IRQ_MASK, we clear /* if irq were inhibited with HF_INHIBIT_IRQ_MASK, we clear
the flag and abort the translation to give the irqs a the flag and abort the translation to give the irqs a
chance to happen */ chance to happen */
gen_jmp_im(dc, pc_next - dc->cs_base);
gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY; dc->base.is_jmp = DISAS_TOO_MANY;
} else if ((dc->base.tb->cflags & CF_USE_ICOUNT) } else if ((dc->base.tb->cflags & CF_USE_ICOUNT)
&& ((dc->base.pc_next & TARGET_PAGE_MASK) && ((dc->base.pc_next & TARGET_PAGE_MASK)
@ -9279,18 +9277,24 @@ static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu)
If current instruction already crossed the bound - it's ok, If current instruction already crossed the bound - it's ok,
because an exception hasn't stopped this code. because an exception hasn't stopped this code.
*/ */
gen_jmp_im(dc, pc_next - dc->cs_base);
gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY; dc->base.is_jmp = DISAS_TOO_MANY;
} else if ((pc_next - dc->base.pc_first) >= (TARGET_PAGE_SIZE - 32)) { } else if ((pc_next - dc->base.pc_first) >= (TARGET_PAGE_SIZE - 32)) {
gen_jmp_im(dc, pc_next - dc->cs_base);
gen_eob(dc);
dc->base.is_jmp = DISAS_TOO_MANY; dc->base.is_jmp = DISAS_TOO_MANY;
} }
dc->base.pc_next = pc_next; dc->base.pc_next = pc_next;
} }
static void i386_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
{
DisasContext *dc = container_of(dcbase, DisasContext, base);
if (dc->base.is_jmp == DISAS_TOO_MANY) {
gen_jmp_im(dc, dc->base.pc_next - dc->cs_base);
gen_eob(dc);
}
}
/* generate intermediate code for basic block 'tb'. */ /* generate intermediate code for basic block 'tb'. */
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
{ {
@ -9375,20 +9379,26 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
/* if single step mode, we generate only one instruction and /* if single step mode, we generate only one instruction and
generate an exception */ generate an exception */
if (dc->base.singlestep_enabled) { if (dc->base.singlestep_enabled) {
gen_jmp_im(dc, dc->base.pc_next - dc->cs_base); dc->base.is_jmp = DISAS_TOO_MANY;
gen_eob(dc);
break; break;
} }
/* if too long translation, stop generation too */ /* if too long translation, stop generation too */
if (tcg_op_buf_full(tcg_ctx) || if (tcg_op_buf_full(tcg_ctx) ||
num_insns >= max_insns) { num_insns >= max_insns) {
gen_jmp_im(dc, dc->base.pc_next - dc->cs_base); dc->base.is_jmp = DISAS_TOO_MANY;
gen_eob(dc);
block_full = true; block_full = true;
break; break;
} }
}
// Unicorn: if'd out
#if 0
if (singlestep) {
dc->base.is_jmp = DISAS_TOO_MANY;
break;
}
#endif
}
i386_tr_tb_stop(&dc->base, cs);
//if (tb->cflags & CF_LAST_IO) { //if (tb->cflags & CF_LAST_IO) {
// gen_io_end(); // gen_io_end();
//} //}