| Message ID | 20220906100932.343523-21-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: > > Subtract cur_insn_len to restart the current insn. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> I wouldn't mind squashing this with the jecxz/loop patch (and the review comments there apply here too). Paolo > --- > target/i386/tcg/translate.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c > index e27f36e4e9..7a9e533c6e 100644 > --- a/target/i386/tcg/translate.c > +++ b/target/i386/tcg/translate.c > @@ -224,7 +224,6 @@ STUB_HELPER(wrmsr, TCGv_env env) > > static void gen_eob(DisasContext *s); > static void gen_jr(DisasContext *s); > -static void gen_jmp(DisasContext *s, target_ulong eip); > static void gen_jmp_tb(DisasContext *s, target_ulong eip, int tb_num); > static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num); > static void gen_op(DisasContext *s1, int op, MemOp ot, int d); > @@ -1277,7 +1276,7 @@ static void gen_repz(DisasContext *s, MemOp ot, > if (s->repz_opt) { > gen_op_jz_ecx(s, s->aflag, l2); > } > - gen_jmp(s, s->base.pc_next - s->cs_base); > + gen_jmp_rel(s, MO_32, -cur_insn_len(s), 0); > } > > #define GEN_REPZ(op) \ > @@ -1297,7 +1296,7 @@ static void gen_repz2(DisasContext *s, MemOp ot, int nz, > if (s->repz_opt) { > gen_op_jz_ecx(s, s->aflag, l2); > } > - gen_jmp(s, s->base.pc_next - s->cs_base); > + gen_jmp_rel(s, MO_32, -cur_insn_len(s), 0); > } > > #define GEN_REPZ2(op) \ > @@ -2751,11 +2750,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) > gen_jmp_tb(s, dest, tb_num); > } > > -static void gen_jmp(DisasContext *s, target_ulong eip) > -{ > - gen_jmp_tb(s, eip, 0); > -} > - > static inline void gen_ldq_env_A0(DisasContext *s, int offset) > { > tcg_gen_qemu_ld_i64(s->tmp1_i64, s->A0, s->mem_index, MO_LEUQ); > -- > 2.34.1 >
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index e27f36e4e9..7a9e533c6e 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -224,7 +224,6 @@ STUB_HELPER(wrmsr, TCGv_env env) static void gen_eob(DisasContext *s); static void gen_jr(DisasContext *s); -static void gen_jmp(DisasContext *s, target_ulong eip); static void gen_jmp_tb(DisasContext *s, target_ulong eip, int tb_num); static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num); static void gen_op(DisasContext *s1, int op, MemOp ot, int d); @@ -1277,7 +1276,7 @@ static void gen_repz(DisasContext *s, MemOp ot, if (s->repz_opt) { gen_op_jz_ecx(s, s->aflag, l2); } - gen_jmp(s, s->base.pc_next - s->cs_base); + gen_jmp_rel(s, MO_32, -cur_insn_len(s), 0); } #define GEN_REPZ(op) \ @@ -1297,7 +1296,7 @@ static void gen_repz2(DisasContext *s, MemOp ot, int nz, if (s->repz_opt) { gen_op_jz_ecx(s, s->aflag, l2); } - gen_jmp(s, s->base.pc_next - s->cs_base); + gen_jmp_rel(s, MO_32, -cur_insn_len(s), 0); } #define GEN_REPZ2(op) \ @@ -2751,11 +2750,6 @@ static void gen_jmp_rel(DisasContext *s, MemOp ot, int diff, int tb_num) gen_jmp_tb(s, dest, tb_num); } -static void gen_jmp(DisasContext *s, target_ulong eip) -{ - gen_jmp_tb(s, eip, 0); -} - static inline void gen_ldq_env_A0(DisasContext *s, int offset) { tcg_gen_qemu_ld_i64(s->tmp1_i64, s->A0, s->mem_index, MO_LEUQ);
Subtract cur_insn_len to restart the current insn. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/i386/tcg/translate.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)