From patchwork Tue Feb 19 17:40:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 221748 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 19FAC2C008D for ; Wed, 20 Feb 2013 04:55:01 +1100 (EST) Received: from localhost ([::1]:34435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7rP9-0004IC-5u for incoming@patchwork.ozlabs.org; Tue, 19 Feb 2013 12:54:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7rOq-0003kd-Oc for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:54:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7rCK-0008DS-M6 for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:42:09 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:46864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7rCK-0008D7-Eb for qemu-devel@nongnu.org; Tue, 19 Feb 2013 12:41:44 -0500 Received: by mail-pb0-f44.google.com with SMTP id wz12so2351351pbc.3 for ; Tue, 19 Feb 2013 09:41:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=XEfb5GNqpn6yDdnzEq5aprTRls+2AiYj/DDcBr5WOQg=; b=kdVC+8+aTUvjjZW1VT/BshRuNX/dCNUqk5f2YA2WR+iSSwQPH7/MDFM/q3ddWSXj4v KzAUEUE2QeBnc9gg9K84sbFcnhsipw/Wx2hWrSYEwSjHjoLW7dlTcovDBBhTCGohJN+N CunFhXOXP/0/P5whykTxd+pRBtpXrjT57ba2hcd580blpqrjtCrrUJhmS+JK8UZnbmnQ T/Vb1fDd4zAe1z3NkCUYIDbkGgJ31f5KoFGch7f6E1dna8tXkQYPx3UyfCChjxzwrG+O 05kSfvDmSPNU7OB5V7ox5Uv/7WhkuNYw3EZxzeaaP0iVxyelz+I4Bnhp/RzxYI0RNjNS FH1Q== X-Received: by 10.66.76.41 with SMTP id h9mr47794320paw.1.1361295703660; Tue, 19 Feb 2013 09:41:43 -0800 (PST) Received: from anchor.twiddle.net (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPS id 1sm18659295pbg.18.2013.02.19.09.41.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 19 Feb 2013 09:41:42 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2013 09:40:10 -0800 Message-Id: <1361295631-21316-37-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361295631-21316-1-git-send-email-rth@twiddle.net> References: <1361295631-21316-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.44 Cc: blauwirbel@gmail.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 36/57] target-i386: use gen_op for cmps/scas 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 Replace low-level ops with a higher-level "cmp %al, (A0)" in the case of scas, and "cmp T0, (A0)" in the case of cmps. Signed-off-by: Paolo Bonzini Signed-off-by: Richard Henderson --- target-i386/translate.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 60c1fdd..f8d5e68 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -123,6 +123,7 @@ typedef struct DisasContext { static void gen_eob(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_op(DisasContext *s1, int op, int ot, int d); /* i386 arith/logic operations */ enum { @@ -861,12 +862,6 @@ static void gen_op_update2_cc(void) tcg_gen_mov_tl(cpu_cc_dst, cpu_T[0]); } -static inline void gen_op_cmpl_T0_T1_cc(void) -{ - tcg_gen_mov_tl(cpu_cc_src, cpu_T[1]); - tcg_gen_sub_tl(cpu_cc_dst, cpu_T[0], cpu_T[1]); -} - static inline void gen_op_testl_T0_T1_cc(void) { tcg_gen_and_tl(cpu_cc_dst, cpu_T[0], cpu_T[1]); @@ -1224,26 +1219,22 @@ static inline void gen_lods(DisasContext *s, int ot) static inline void gen_scas(DisasContext *s, int ot) { - gen_op_mov_TN_reg(OT_LONG, 0, R_EAX); gen_string_movl_A0_EDI(s); gen_op_ld_T1_A0(ot + s->mem_index); - gen_op_cmpl_T0_T1_cc(); + gen_op(s, OP_CMPL, ot, R_EAX); gen_op_movl_T0_Dshift(ot); gen_op_add_reg_T0(s->aflag, R_EDI); - set_cc_op(s, CC_OP_SUBB + ot); } static inline void gen_cmps(DisasContext *s, int ot) { - gen_string_movl_A0_ESI(s); - gen_op_ld_T0_A0(ot + s->mem_index); gen_string_movl_A0_EDI(s); gen_op_ld_T1_A0(ot + s->mem_index); - gen_op_cmpl_T0_T1_cc(); + gen_string_movl_A0_ESI(s); + gen_op(s, OP_CMPL, ot, OR_TMP0); gen_op_movl_T0_Dshift(ot); gen_op_add_reg_T0(s->aflag, R_ESI); gen_op_add_reg_T0(s->aflag, R_EDI); - set_cc_op(s, CC_OP_SUBB + ot); } static inline void gen_ins(DisasContext *s, int ot) @@ -1472,7 +1463,8 @@ static void gen_op(DisasContext *s1, int op, int ot, int d) set_cc_op(s1, CC_OP_LOGICB + ot); break; case OP_CMPL: - gen_op_cmpl_T0_T1_cc(); + tcg_gen_mov_tl(cpu_cc_src, cpu_T[1]); + tcg_gen_sub_tl(cpu_cc_dst, cpu_T[0], cpu_T[1]); set_cc_op(s1, CC_OP_SUBB + ot); break; }