mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-i386: Perform set/reset_inhibit_irq inline

Browse Source 
With helpers that can be reused for other things.

Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Richard Henderson 2015-07-06 17:29:59 +01:00
parent f4f1110e4b
commit 7f0b7141b4
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target-i386/cc_helper.c
View File

@ -383,13 +383,3 @@ void helper_sti_vm(CPUX86State *env)
} }
} }
#endif #endif
void helper_set_inhibit_irq(CPUX86State *env)
{
env->hflags |= HF_INHIBIT_IRQ_MASK;
}
void helper_reset_inhibit_irq(CPUX86State *env)
{
env->hflags &= ~HF_INHIBIT_IRQ_MASK;
}

2
target-i386/helper.h
View File

@ -62,8 +62,6 @@ DEF_HELPER_1(cli, void, env)
DEF_HELPER_1(sti, void, env) DEF_HELPER_1(sti, void, env)
DEF_HELPER_1(clac, void, env) DEF_HELPER_1(clac, void, env)
DEF_HELPER_1(stac, void, env) DEF_HELPER_1(stac, void, env)
DEF_HELPER_1(set_inhibit_irq, void, env)
DEF_HELPER_1(reset_inhibit_irq, void, env)
DEF_HELPER_3(boundw, void, env, tl, int) DEF_HELPER_3(boundw, void, env, tl, int)
DEF_HELPER_3(boundl, void, env, tl, int) DEF_HELPER_3(boundl, void, env, tl, int)
DEF_HELPER_1(rsm, void, env) DEF_HELPER_1(rsm, void, env)

37
target-i386/translate.c
View File

@ -2391,14 +2391,36 @@ static void gen_debug(DisasContext *s, target_ulong cur_eip)
s->is_jmp = DISAS_TB_JUMP; s->is_jmp = DISAS_TB_JUMP;
} }
static void gen_set_hflag(DisasContext *s, uint32_t mask)
{
if ((s->flags & mask) == 0) {
TCGv_i32 t = tcg_temp_new_i32();
tcg_gen_ld_i32(t, cpu_env, offsetof(CPUX86State, hflags));
tcg_gen_ori_i32(t, t, mask);
tcg_gen_st_i32(t, cpu_env, offsetof(CPUX86State, hflags));
tcg_temp_free_i32(t);
s->flags |= mask;
}
}
static void gen_reset_hflag(DisasContext *s, uint32_t mask)
{
if (s->flags & mask) {
TCGv_i32 t = tcg_temp_new_i32();
tcg_gen_ld_i32(t, cpu_env, offsetof(CPUX86State, hflags));
tcg_gen_andi_i32(t, t, ~mask);
tcg_gen_st_i32(t, cpu_env, offsetof(CPUX86State, hflags));
tcg_temp_free_i32(t);
s->flags &= ~mask;
}
}
/* generate a generic end of block. Trace exception is also generated /* generate a generic end of block. Trace exception is also generated
if needed */ if needed */
static void gen_eob(DisasContext *s) static void gen_eob(DisasContext *s)
{ {
gen_update_cc_op(s); gen_update_cc_op(s);
if (s->tb->flags & HF_INHIBIT_IRQ_MASK) { gen_reset_hflag(s, HF_INHIBIT_IRQ_MASK);
gen_helper_reset_inhibit_irq(cpu_env);
}
if (s->tb->flags & HF_RF_MASK) { if (s->tb->flags & HF_RF_MASK) {
gen_helper_reset_rf(cpu_env); gen_helper_reset_rf(cpu_env);
} }
@ -5147,8 +5169,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
/* if reg == SS, inhibit interrupts/trace. */ /* if reg == SS, inhibit interrupts/trace. */
/* If several instructions disable interrupts, only the /* If several instructions disable interrupts, only the
_first_ does it */ _first_ does it */
if (!(s->tb->flags & HF_INHIBIT_IRQ_MASK)) gen_set_hflag(s, HF_INHIBIT_IRQ_MASK);
gen_helper_set_inhibit_irq(cpu_env);
s->tf = 0; s->tf = 0;
} }
if (s->is_jmp) { if (s->is_jmp) {
@ -5215,8 +5236,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
/* if reg == SS, inhibit interrupts/trace */ /* if reg == SS, inhibit interrupts/trace */
/* If several instructions disable interrupts, only the /* If several instructions disable interrupts, only the
_first_ does it */ _first_ does it */
if (!(s->tb->flags & HF_INHIBIT_IRQ_MASK)) gen_set_hflag(s, HF_INHIBIT_IRQ_MASK);
gen_helper_set_inhibit_irq(cpu_env);
s->tf = 0; s->tf = 0;
} }
if (s->is_jmp) { if (s->is_jmp) {
@ -6752,8 +6772,7 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
/* interruptions are enabled only the first insn after sti */ /* interruptions are enabled only the first insn after sti */
/* If several instructions disable interrupts, only the /* If several instructions disable interrupts, only the
_first_ does it */ _first_ does it */
if (!(s->tb->flags & HF_INHIBIT_IRQ_MASK)) gen_set_hflag(s, HF_INHIBIT_IRQ_MASK);
gen_helper_set_inhibit_irq(cpu_env);
/* give a chance to handle pending irqs */ /* give a chance to handle pending irqs */
gen_jmp_im(s->pc - s->cs_base); gen_jmp_im(s->pc - s->cs_base);
gen_eob(s); gen_eob(s);