| Message ID | 20220906100932.343523-9-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/i386: pc-relative translation blocks | expand |
On Tue, Sep 6, 2022 at 12:09 PM Richard Henderson <richard.henderson@linaro.org> wrote: > > Set is_jmp properly in gen_movl_seg_T0, so that the callers > need to nothing special. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > --- > target/i386/tcg/translate.c | 36 +++++------------------------------- > 1 file changed, 5 insertions(+), 31 deletions(-) > > diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c > index 778ee4ed4c..ea35d3e9b4 100644 > --- a/target/i386/tcg/translate.c > +++ b/target/i386/tcg/translate.c > @@ -2432,13 +2432,15 @@ static void gen_movl_seg_T0(DisasContext *s, X86Seg seg_reg) > because ss32 may change. For R_SS, translation must always > stop as a special handling must be done to disable hardware > interrupts for the next instruction */ > - if (seg_reg == R_SS || (CODE32(s) && seg_reg < R_FS)) { > - s->base.is_jmp = DISAS_TOO_MANY; > + if (seg_reg == R_SS) { > + s->base.is_jmp = DISAS_EOB_INHIBIT_IRQ; > + } else if (CODE32(s) && seg_reg < R_FS) { > + s->base.is_jmp = DISAS_EOB_NEXT; > } > } else { > gen_op_movl_seg_T0_vm(s, seg_reg); > if (seg_reg == R_SS) { > - s->base.is_jmp = DISAS_TOO_MANY; > + s->base.is_jmp = DISAS_EOB_INHIBIT_IRQ; > } > } > } > @@ -5682,26 +5684,12 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) > ot = gen_pop_T0(s); > gen_movl_seg_T0(s, reg); > gen_pop_update(s, ot); > - /* Note that reg == R_SS in gen_movl_seg_T0 always sets is_jmp. */ > - if (s->base.is_jmp) { > - gen_update_eip_next(s); > - if (reg == R_SS) { > - s->flags &= ~HF_TF_MASK; > - gen_eob_inhibit_irq(s, true); > - } else { > - gen_eob(s); > - } > - } > break; > case 0x1a1: /* pop fs */ > case 0x1a9: /* pop gs */ > ot = gen_pop_T0(s); > gen_movl_seg_T0(s, (b >> 3) & 7); > gen_pop_update(s, ot); > - if (s->base.is_jmp) { > - gen_update_eip_next(s); > - gen_eob(s); > - } > break; > > /**************************/ > @@ -5748,16 +5736,6 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) > goto illegal_op; > gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); > gen_movl_seg_T0(s, reg); > - /* Note that reg == R_SS in gen_movl_seg_T0 always sets is_jmp. */ > - if (s->base.is_jmp) { > - gen_update_eip_next(s); > - if (reg == R_SS) { > - s->flags &= ~HF_TF_MASK; > - gen_eob_inhibit_irq(s, true); > - } else { > - gen_eob(s); > - } > - } > break; > case 0x8c: /* mov Gv, seg */ > modrm = x86_ldub_code(env, s); > @@ -5956,10 +5934,6 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) > gen_movl_seg_T0(s, op); > /* then put the data */ > gen_op_mov_reg_v(s, ot, reg, s->T1); > - if (s->base.is_jmp) { > - gen_update_eip_next(s); > - gen_eob(s); > - } > break; > > /************************/ > -- > 2.34.1 >
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 778ee4ed4c..ea35d3e9b4 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2432,13 +2432,15 @@ static void gen_movl_seg_T0(DisasContext *s, X86Seg seg_reg) because ss32 may change. For R_SS, translation must always stop as a special handling must be done to disable hardware interrupts for the next instruction */ - if (seg_reg == R_SS || (CODE32(s) && seg_reg < R_FS)) { - s->base.is_jmp = DISAS_TOO_MANY; + if (seg_reg == R_SS) { + s->base.is_jmp = DISAS_EOB_INHIBIT_IRQ; + } else if (CODE32(s) && seg_reg < R_FS) { + s->base.is_jmp = DISAS_EOB_NEXT; } } else { gen_op_movl_seg_T0_vm(s, seg_reg); if (seg_reg == R_SS) { - s->base.is_jmp = DISAS_TOO_MANY; + s->base.is_jmp = DISAS_EOB_INHIBIT_IRQ; } } } @@ -5682,26 +5684,12 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) ot = gen_pop_T0(s); gen_movl_seg_T0(s, reg); gen_pop_update(s, ot); - /* Note that reg == R_SS in gen_movl_seg_T0 always sets is_jmp. */ - if (s->base.is_jmp) { - gen_update_eip_next(s); - if (reg == R_SS) { - s->flags &= ~HF_TF_MASK; - gen_eob_inhibit_irq(s, true); - } else { - gen_eob(s); - } - } break; case 0x1a1: /* pop fs */ case 0x1a9: /* pop gs */ ot = gen_pop_T0(s); gen_movl_seg_T0(s, (b >> 3) & 7); gen_pop_update(s, ot); - if (s->base.is_jmp) { - gen_update_eip_next(s); - gen_eob(s); - } break; /**************************/ @@ -5748,16 +5736,6 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) goto illegal_op; gen_ldst_modrm(env, s, modrm, MO_16, OR_TMP0, 0); gen_movl_seg_T0(s, reg); - /* Note that reg == R_SS in gen_movl_seg_T0 always sets is_jmp. */ - if (s->base.is_jmp) { - gen_update_eip_next(s); - if (reg == R_SS) { - s->flags &= ~HF_TF_MASK; - gen_eob_inhibit_irq(s, true); - } else { - gen_eob(s); - } - } break; case 0x8c: /* mov Gv, seg */ modrm = x86_ldub_code(env, s); @@ -5956,10 +5934,6 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) gen_movl_seg_T0(s, op); /* then put the data */ gen_op_mov_reg_v(s, ot, reg, s->T1); - if (s->base.is_jmp) { - gen_update_eip_next(s); - gen_eob(s); - } break; /************************/
Set is_jmp properly in gen_movl_seg_T0, so that the callers need to nothing special. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/i386/tcg/translate.c | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-)