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

target/i386: [tcg] Port to init_disas_context

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

Backports commit 9761d39b09c4beb1340bf3074be3d3e0a5d453a4 from qemu
This commit is contained in:
Lluís Vilanova 2018-03-04 14:58:32 -05:00 committed by Lioncash
parent 4babc3ff64
commit 8896a2887e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9145,22 +9145,14 @@ void tcg_x86_init(struct uc_struct *uc)
} }
} }
/* generate intermediate code for basic block 'tb'. */ static int i386_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cpu,
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb) int max_insns)
{ {
CPUX86State *env = cs->env_ptr; DisasContext *dc = container_of(dcbase, DisasContext, base);
CPUX86State *env = cpu->env_ptr;
TCGContext *tcg_ctx = env->uc->tcg_ctx; TCGContext *tcg_ctx = env->uc->tcg_ctx;
DisasContext dc1, *dc = &dc1; uint32_t flags = dc->base.tb->flags;
uint32_t flags; target_ulong cs_base = dc->base.tb->cs_base;
target_ulong cs_base;
int num_insns = 0;
int max_insns;
bool block_full = false;
/* generate intermediate code */
dc->base.pc_first = tb->pc;
cs_base = tb->cs_base;
flags = tb->flags;
dc->uc = env->uc; dc->uc = env->uc;
dc->pe = (flags >> HF_PE_SHIFT) & 1; dc->pe = (flags >> HF_PE_SHIFT) & 1;
@ -9172,11 +9164,9 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
dc->cpl = (flags >> HF_CPL_SHIFT) & 3; dc->cpl = (flags >> HF_CPL_SHIFT) & 3;
dc->iopl = (flags >> IOPL_SHIFT) & 3; dc->iopl = (flags >> IOPL_SHIFT) & 3;
dc->tf = (flags >> TF_SHIFT) & 1; dc->tf = (flags >> TF_SHIFT) & 1;
dc->base.singlestep_enabled = cs->singlestep_enabled;
dc->last_cc_op = dc->cc_op = CC_OP_DYNAMIC; dc->last_cc_op = dc->cc_op = CC_OP_DYNAMIC;
dc->cc_op_dirty = false; dc->cc_op_dirty = false;
dc->cs_base = cs_base; dc->cs_base = cs_base;
dc->base.tb = tb;
dc->popl_esp_hack = 0; dc->popl_esp_hack = 0;
/* select memory access functions */ /* select memory access functions */
dc->mem_index = 0; dc->mem_index = 0;
@ -9194,7 +9184,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
dc->code64 = (flags >> HF_CS64_SHIFT) & 1; dc->code64 = (flags >> HF_CS64_SHIFT) & 1;
#endif #endif
dc->flags = flags; dc->flags = flags;
dc->jmp_opt = !(dc->tf || cs->singlestep_enabled || dc->jmp_opt = !(dc->tf || dc->base.singlestep_enabled ||
(flags & HF_INHIBIT_IRQ_MASK)); (flags & HF_INHIBIT_IRQ_MASK));
/* Do not optimize repz jumps at all in icount mode, because /* Do not optimize repz jumps at all in icount mode, because
rep movsS instructions are execured with different paths rep movsS instructions are execured with different paths
@ -9206,7 +9196,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
record/replay modes and there will always be an record/replay modes and there will always be an
additional step for ecx=0 when icount is enabled. additional step for ecx=0 when icount is enabled.
*/ */
dc->repz_opt = !dc->jmp_opt;// && !use_icount; UNICORN: Commented out dc->repz_opt = !dc->jmp_opt && !(dc->base.tb->cflags & CF_USE_ICOUNT);
#if 0 #if 0
/* check addseg logic */ /* check addseg logic */
if (!dc->addseg && (dc->vm86 || !dc->pe || !dc->code32)) if (!dc->addseg && (dc->vm86 || !dc->pe || !dc->code32))
@ -9232,6 +9222,24 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
// done with initializing TCG variables // done with initializing TCG variables
env->uc->init_tcg = true; env->uc->init_tcg = true;
return max_insns;
}
/* generate intermediate code for basic block 'tb'. */
void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
{
CPUX86State *env = cs->env_ptr;
DisasContext dc1, *dc = &dc1;
TCGContext *tcg_ctx = env->uc->tcg_ctx;
int num_insns = 0;
int max_insns;
bool block_full = false;
/* generate intermediate code */
dc->base.singlestep_enabled = cs->singlestep_enabled;
dc->base.tb = tb;
dc->base.is_jmp = DISAS_NEXT;
dc->base.pc_first = tb->pc;
dc->base.pc_next = dc->base.pc_first; dc->base.pc_next = dc->base.pc_first;
// early check to see if the address of this block is the until address // early check to see if the address of this block is the until address
@ -9252,6 +9260,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
if (max_insns > TCG_MAX_INSNS) { if (max_insns > TCG_MAX_INSNS) {
max_insns = TCG_MAX_INSNS; max_insns = TCG_MAX_INSNS;
} }
max_insns = i386_tr_init_disas_context(&dc->base, cs, max_insns);
// Unicorn: trace this block on request // Unicorn: trace this block on request
// Only hook this block if the previous block was not truncated due to space // Only hook this block if the previous block was not truncated due to space
@ -9299,7 +9308,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb)
the flag and abort the translation to give the irqs a the flag and abort the translation to give the irqs a
change to be happen */ change to be happen */
if (dc->tf || dc->base.singlestep_enabled || if (dc->tf || dc->base.singlestep_enabled ||
(flags & HF_INHIBIT_IRQ_MASK)) { (dc->base.tb->flags & HF_INHIBIT_IRQ_MASK)) {
gen_jmp_im(dc, dc->base.pc_next - dc->cs_base); gen_jmp_im(dc, dc->base.pc_next - dc->cs_base);
gen_eob(dc); gen_eob(dc);
break; break;