From patchwork Sat Oct 6 12:30:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 189692 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 3B3D02C030D for ; Sat, 6 Oct 2012 23:03:21 +1000 (EST) Received: from localhost ([::1]:38452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTXj-0006Y4-Vd for incoming@patchwork.ozlabs.org; Sat, 06 Oct 2012 08:31:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTWm-0004ZU-GS for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKTWk-0000Jb-2z for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:44 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:42857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKTWj-0000EI-Ky for qemu-devel@nongnu.org; Sat, 06 Oct 2012 08:30:42 -0400 Received: by mail-wg0-f53.google.com with SMTP id dr1so1675669wgb.10 for ; Sat, 06 Oct 2012 05:30:41 -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=zYj0fwx4s8m+zqpU1t8hHQwpSS4GVdeP0cqORv+ZplQ=; b=AOT6RZ4gqH5TbC2CIiO5pQtqWD1DsiHepYzzX7djsEicOxpWYIGM3B2YrQlfsoMA8K YndfwrnxHvnnd2qxOZ6mhXRcEOPf0yYEcg5e2RxLG01w6FCUOSQtx2TZNmcU6bpd2cEm OoAy+uTtR8iGB0CdP34/RRUHVwON/OEdByYkekKHLdWec/UBWnMK08WOCDOONsebgrnQ feY3UkSqYCIGsYpzn4xSZhRbW0jlTjOoJhYYkk32KXmaVzAwDS7vwcAPhqlI38NKlY+O JHPOmugNum4YjxeYdIB1KFr5H2d5xUhBf9x9nsH6sDK7qitT0o8Shboi1AXKmVMukRXi RJOA== Received: by 10.180.91.71 with SMTP id cc7mr9374830wib.2.1349526641274; Sat, 06 Oct 2012 05:30:41 -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.40 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 06 Oct 2012 05:30:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 6 Oct 2012 14:30:19 +0200 Message-Id: <1349526621-13939-13-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: 74.125.82.53 Subject: [Qemu-devel] [PATCH 12/14] i386: change gen_setcc_slow_T0 to gen_setcc_slow 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 Do not hard code the destination register. Signed-off-by: Paolo Bonzini Reviewed-by: Blue Swirl Reviewed-by: Richard Henderson --- target-i386/translate.c | 39 ++++++++++++++++++++------------------- 1 file modificato, 20 inserzioni(+), 19 rimozioni(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 4561c9d..fb44839 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -1016,50 +1016,51 @@ static void gen_compute_eflags_z(DisasContext *s, TCGv reg, bool inv) } } -static inline void gen_setcc_slow_T0(DisasContext *s, int jcc_op, bool inv) +static inline void gen_setcc_slow(DisasContext *s, int jcc_op, TCGv reg, bool inv) { + assert(reg != cpu_cc_src); switch(jcc_op) { case JCC_O: - gen_compute_eflags_o(s, cpu_T[0]); + gen_compute_eflags_o(s, reg); break; case JCC_B: - gen_compute_eflags_c(s, cpu_T[0], inv); + gen_compute_eflags_c(s, reg, inv); return; case JCC_Z: - gen_compute_eflags_z(s, cpu_T[0], inv); + gen_compute_eflags_z(s, reg, inv); return; case JCC_BE: gen_compute_eflags(s); - tcg_gen_shri_tl(cpu_T[0], cpu_cc_src, 6); - tcg_gen_or_tl(cpu_T[0], cpu_T[0], cpu_cc_src); - tcg_gen_andi_tl(cpu_T[0], cpu_T[0], 1); + tcg_gen_shri_tl(reg, cpu_cc_src, 6); + tcg_gen_or_tl(reg, reg, cpu_cc_src); + tcg_gen_andi_tl(reg, reg, 1); break; case JCC_S: - gen_compute_eflags_s(s, cpu_T[0], inv); + gen_compute_eflags_s(s, reg, inv); return; case JCC_P: - gen_compute_eflags_p(s, cpu_T[0]); + gen_compute_eflags_p(s, reg); break; case JCC_L: gen_compute_eflags(s); - tcg_gen_shri_tl(cpu_T[0], cpu_cc_src, 11); /* CC_O */ + tcg_gen_shri_tl(reg, cpu_cc_src, 11); /* CC_O */ tcg_gen_shri_tl(cpu_tmp0, cpu_cc_src, 7); /* CC_S */ - tcg_gen_xor_tl(cpu_T[0], cpu_T[0], cpu_tmp0); - tcg_gen_andi_tl(cpu_T[0], cpu_T[0], 1); + tcg_gen_xor_tl(reg, reg, cpu_tmp0); + tcg_gen_andi_tl(reg, reg, 1); break; default: case JCC_LE: gen_compute_eflags(s); - tcg_gen_shri_tl(cpu_T[0], cpu_cc_src, 11); /* CC_O */ + tcg_gen_shri_tl(reg, cpu_cc_src, 11); /* CC_O */ tcg_gen_shri_tl(cpu_tmp4, cpu_cc_src, 7); /* CC_S */ tcg_gen_shri_tl(cpu_tmp0, cpu_cc_src, 6); /* CC_Z */ - tcg_gen_xor_tl(cpu_T[0], cpu_T[0], cpu_tmp4); - tcg_gen_or_tl(cpu_T[0], cpu_T[0], cpu_tmp0); - tcg_gen_andi_tl(cpu_T[0], cpu_T[0], 1); + tcg_gen_xor_tl(reg, reg, cpu_tmp4); + tcg_gen_or_tl(reg, reg, cpu_tmp0); + tcg_gen_andi_tl(reg, reg, 1); break; } if (inv) { - tcg_gen_xori_tl(cpu_T[0], cpu_T[0], 1); + tcg_gen_xori_tl(reg, reg, 1); } } @@ -1226,7 +1227,7 @@ static inline void gen_jcc1(DisasContext *s, int b, int l1) break; default: slow_jcc: - gen_setcc_slow_T0(s, jcc_op, false); + gen_setcc_slow(s, jcc_op, cpu_T[0], false); tcg_gen_brcondi_tl(inv ? TCG_COND_EQ : TCG_COND_NE, cpu_T[0], 0, l1); break; @@ -2497,7 +2498,7 @@ static void gen_setcc(DisasContext *s, int b) worth to */ inv = b & 1; jcc_op = (b >> 1) & 7; - gen_setcc_slow_T0(s, jcc_op, inv); + gen_setcc_slow(s, jcc_op, cpu_T[0], inv); } }