From patchwork Sat Oct 6 12:30:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/14] i386: factor setting of s->cc_op handling for string functions Date: Sat, 06 Oct 2012 02:30:10 -0000 From: Paolo Bonzini X-Patchwork-Id: 189698 Message-Id: <1349526621-13939-4-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Set it to the appropriate CC_OP_SUBx constant in gen_scas/gen_cmps. In the repz case it can be overridden to CC_OP_DYNAMIC after generating the code. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- target-i386/translate.c | 9 +++++---- 1 file modificato, 5 inserzioni(+), 4 rimozioni(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 671303d..0297b9a 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -1102,6 +1102,7 @@ static inline void gen_scas(DisasContext *s, int ot) gen_op_cmpl_T0_T1_cc(); gen_op_movl_T0_Dshift(ot); gen_op_add_reg_T0(s->aflag, R_EDI); + s->cc_op = CC_OP_SUBB + ot; } static inline void gen_cmps(DisasContext *s, int ot) @@ -1114,6 +1115,7 @@ static inline void gen_cmps(DisasContext *s, int ot) gen_op_movl_T0_Dshift(ot); gen_op_add_reg_T0(s->aflag, R_ESI); gen_op_add_reg_T0(s->aflag, R_EDI); + s->cc_op = CC_OP_SUBB + ot; } static inline void gen_ins(DisasContext *s, int ot) @@ -1184,11 +1186,12 @@ static inline void gen_repz_ ## op(DisasContext *s, int ot, \ l2 = gen_jz_ecx_string(s, next_eip); \ gen_ ## op(s, ot); \ gen_op_add_reg_im(s->aflag, R_ECX, -1); \ - gen_op_set_cc_op(CC_OP_SUBB + ot); \ - gen_jcc1(s, CC_OP_SUBB + ot, (JCC_Z << 1) | (nz ^ 1), l2); \ + gen_op_set_cc_op(s->cc_op); \ + gen_jcc1(s, s->cc_op, (JCC_Z << 1) | (nz ^ 1), l2); \ if (!s->jmp_opt) \ gen_op_jz_ecx(s->aflag, l2); \ gen_jmp(s, cur_eip); \ + s->cc_op = CC_OP_DYNAMIC; \ } GEN_REPZ(movs) @@ -6074,7 +6077,6 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) gen_repz_scas(s, ot, pc_start - s->cs_base, s->pc - s->cs_base, 0); } else { gen_scas(s, ot); - s->cc_op = CC_OP_SUBB + ot; } break; @@ -6090,7 +6092,6 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) gen_repz_cmps(s, ot, pc_start - s->cs_base, s->pc - s->cs_base, 0); } else { gen_cmps(s, ot); - s->cc_op = CC_OP_SUBB + ot; } break; case 0x6c: /* insS */