From patchwork Sat Oct 6 12:30:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 189698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3F0952C00A9 for ; Sat, 6 Oct 2012 23:26:23 +1000 (EST) Received: from localhost ([::1]:36774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTXC-0005bf-6l for incoming@patchwork.ozlabs.org; Sat, 06 Oct 2012 08:31:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTWc-00046h-2r for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKTWZ-00008F-U9 for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:34 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:61232) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTWZ-00007n-Ny for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:31 -0400 Received: by mail-wi0-f175.google.com with SMTP id hq4so1421115wib.10 for ; Sat, 06 Oct 2012 05:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=WUR9SBTdWRXq6zD5MiIjiOj+faS3s3LoK2ZLxYStRYo=; b=HvItqqWA3dggzaBqvs4vgZXFGkgbqutXvP3bHHwrRzKiq9KrtWNVe/YnEUXFFbGnUm p9S4sz5Uh5eT17Kjh5R9RrJTaYVpvVJP5JnvZLM+RBIt6FljFt4PD7y0xtKP/2Zs62d6 bz3QTBD6xddnHbdS+3xXP+gIE15nbmzmTLMZE1IAAIPlTJZ59xe+xz1diJm3s5T4b35D qiPi82v1UiRdijHEIKi3HhY2knxBePjWulumIiq6rMkOXgUKNzaqcOjhUwOeUXt0+s4Y K0WchYW6xNxqz7J6nlspCuAKYLt1LRH5HFHV4V28xeDDGf7Xe5LVO9G6Ubjlc1GMyQEw 6w9w== Received: by 10.216.201.143 with SMTP id b15mr6378607weo.96.1349526631029; Sat, 06 Oct 2012 05:30:31 -0700 (PDT) Received: from yakj.lan (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id m14sm7950701wie.8.2012.10.06.05.30.29 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 05:30:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 6 Oct 2012 14:30:10 +0200 Message-Id: <1349526621-13939-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349526621-13939-1-git-send-email-pbonzini@redhat.com> References: <1349526621-13939-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.175 Subject: [Qemu-devel] [PATCH 03/14] i386: factor setting of s->cc_op handling for string functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 */