From patchwork Fri Jul 1 19:28:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 102950 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3A19CB6F5B for ; Sat, 2 Jul 2011 05:33:17 +1000 (EST) Received: from localhost ([::1]:43563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcjSf-0004cH-2c for incoming@patchwork.ozlabs.org; Fri, 01 Jul 2011 15:33:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcjOl-0004Rf-Is for qemu-devel@nongnu.org; Fri, 01 Jul 2011 15:29:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QcjOj-0006Uf-IV for qemu-devel@nongnu.org; Fri, 01 Jul 2011 15:29:07 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:59336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QcjOj-0006UU-8d for qemu-devel@nongnu.org; Fri, 01 Jul 2011 15:29:05 -0400 Received: by bwd12 with SMTP id 12so3205051bwd.4 for ; Fri, 01 Jul 2011 12:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=tvvM1T94QDkNPcEII+Kcoj1CoFz3JvIHzWy81CgvMaI=; b=t7MsEnpzib7lE5cyxqJia2W+2gygxJBN/yA42kQid5bNHZDjcGtZGK7zru4CmnjE7P tenEMNZo/CubriXFALmME5dlYqW54icd8/3515t66Wq43IffE9ku7R/qUBiub2BZVYAX Su0eVu5H3p6a5ntY3jugtZGtC1rLC1VLHeZUA= Received: by 10.204.74.197 with SMTP id v5mr3499264bkj.150.1309548544090; Fri, 01 Jul 2011 12:29:04 -0700 (PDT) Received: from localhost (e180189076.adsl.alicedsl.de [85.180.189.76]) by mx.google.com with ESMTPS id g13sm3259139bkd.22.2011.07.01.12.29.00 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 01 Jul 2011 12:29:03 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Fri, 1 Jul 2011 21:28:42 +0200 Message-Id: <78deacb7abc46e23598060dadfb217e7fd5d0166.1309548174.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.3.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Cc: blauwirbel@gmail.com, laurent.desnogues@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH][sparc64] fix cpu_cc_src and cpu_cc_src2 corruption in udivx and sdivx 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 udivx and sdvix don't modify condition flags, so they shall not overwrite cpu_cc_* Signed-off-by: Artyom Tarasenko --- target-sparc/translate.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 992cd77..f32a674 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -727,19 +727,24 @@ static inline void gen_trap_ifdivzero_tl(TCGv divisor) static inline void gen_op_sdivx(TCGv dst, TCGv src1, TCGv src2) { int l1, l2; + TCGv r_temp1, r_temp2; l1 = gen_new_label(); l2 = gen_new_label(); - tcg_gen_mov_tl(cpu_cc_src, src1); - tcg_gen_mov_tl(cpu_cc_src2, src2); - gen_trap_ifdivzero_tl(cpu_cc_src2); - tcg_gen_brcondi_tl(TCG_COND_NE, cpu_cc_src, INT64_MIN, l1); - tcg_gen_brcondi_tl(TCG_COND_NE, cpu_cc_src2, -1, l1); + r_temp1 = tcg_temp_local_new(); + r_temp2 = tcg_temp_local_new(); + tcg_gen_mov_tl(r_temp1, src1); + tcg_gen_mov_tl(r_temp2, src2); + gen_trap_ifdivzero_tl(r_temp2); + tcg_gen_brcondi_tl(TCG_COND_NE, r_temp1, INT64_MIN, l1); + tcg_gen_brcondi_tl(TCG_COND_NE, r_temp2, -1, l1); tcg_gen_movi_i64(dst, INT64_MIN); tcg_gen_br(l2); gen_set_label(l1); - tcg_gen_div_i64(dst, cpu_cc_src, cpu_cc_src2); + tcg_gen_div_i64(dst, r_temp1, r_temp2); gen_set_label(l2); + tcg_temp_free(r_temp1); + tcg_temp_free(r_temp2); } #endif @@ -3173,10 +3178,17 @@ static void disas_sparc_insn(DisasContext * dc) break; #ifdef TARGET_SPARC64 case 0xd: /* V9 udivx */ - tcg_gen_mov_tl(cpu_cc_src, cpu_src1); - tcg_gen_mov_tl(cpu_cc_src2, cpu_src2); - gen_trap_ifdivzero_tl(cpu_cc_src2); - tcg_gen_divu_i64(cpu_dst, cpu_cc_src, cpu_cc_src2); + { + TCGv r_temp1, r_temp2; + r_temp1 = tcg_temp_local_new(); + r_temp2 = tcg_temp_local_new(); + tcg_gen_mov_tl(r_temp1, cpu_src1); + tcg_gen_mov_tl(r_temp2, cpu_src2); + gen_trap_ifdivzero_tl(r_temp2); + tcg_gen_divu_i64(cpu_dst, r_temp1, r_temp2); + tcg_temp_free(r_temp1); + tcg_temp_free(r_temp2); + } break; #endif case 0xe: /* udiv */