From patchwork Wed Dec 11 19:16:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Musta X-Patchwork-Id: 300309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 746792C0090 for ; Thu, 12 Dec 2013 06:26:29 +1100 (EST) Received: from localhost ([::1]:59844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqpQQ-0001q3-S1 for incoming@patchwork.ozlabs.org; Wed, 11 Dec 2013 14:26:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqpIm-0000qr-9l for qemu-devel@nongnu.org; Wed, 11 Dec 2013 14:18:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqpId-0000Ho-9Z for qemu-devel@nongnu.org; Wed, 11 Dec 2013 14:18:32 -0500 Received: from mail-yh0-x22d.google.com ([2607:f8b0:4002:c01::22d]:61053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqpIc-0000HT-Sz; Wed, 11 Dec 2013 14:18:23 -0500 Received: by mail-yh0-f45.google.com with SMTP id v1so5343553yhn.4 for ; Wed, 11 Dec 2013 11:18:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bRre24Lu4PLrz9wcT2BtOeKEaIRYYX5fUbMwrSrCATc=; b=sCOoCR8a0mT4QQIoZslrirAkXYnIKra/NHszkriVl06mqhD/OPOt6nF7Ja0jsjltIa ewG6ebaIuQ5+wyTTdss+sZxrqWY/ytxGiAHOrA/lj41iFHJNoqzCDdnwfghpLt9jA51X Y9xeiAaoO0cUpfLiHwPawzOWdyr0BCb6xCevYfGS0KGUr32IYouYkgdK/8YXWHD+VXjm nANb1gYwf1yF4aRNXUWJw33flAtdk8HMlajyLlNCoOuleY3KUzKzf+nWlA+ulUOsM2ps VgPUfDimC+26qsPN14zHlVnBkEAPn7YT2T0TCYSLI77Q0siIFN7U2T9R4rk4oFLUEoJj /jaA== X-Received: by 10.236.85.237 with SMTP id u73mr2678895yhe.67.1386789502590; Wed, 11 Dec 2013 11:18:22 -0800 (PST) Received: from tmusta-sc.rchland.ibm.com (rchp4.rochester.ibm.com. [129.42.161.36]) by mx.google.com with ESMTPSA id x9sm11764420yhd.13.2013.12.11.11.18.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Dec 2013 11:18:21 -0800 (PST) From: Tom Musta To: qemu-devel@nongnu.org Date: Wed, 11 Dec 2013 13:16:35 -0600 Message-Id: <1386789398-5239-16-git-send-email-tommusta@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386789398-5239-1-git-send-email-tommusta@gmail.com> References: <1386789398-5239-1-git-send-email-tommusta@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::22d Cc: Tom Musta , qemu-ppc@nongnu.org Subject: [Qemu-devel] [V2 PATCH 15/18] target-ppc: Add ISA 2.06 ftdiv Instruction 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 This patch adds the Floating Point Test for Divide instruction which was introduced in Power ISA 2.06. Signed-off-by: Tom Musta --- target-ppc/fpu_helper.c | 56 ++++++++++++++++++++++++++++++++++++++-------- target-ppc/helper.h | 2 + target-ppc/translate.c | 17 ++++++++++++++ 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c index 981f002..82ff0db 100644 --- a/target-ppc/fpu_helper.c +++ b/target-ppc/fpu_helper.c @@ -50,6 +50,16 @@ static inline int isden(float64 d) return ((u.ll >> 52) & 0x7FF) == 0; } +static inline int ppc_float32_get_unbiased_exp(float32 f) +{ + return ((f >> 23) & 0xFF) - 127; +} + +static inline int ppc_float64_get_unbiased_exp(float64 f) +{ + return ((f >> 52) & 0x7FF) - 1023; +} + uint32_t helper_compute_fprf(CPUPPCState *env, uint64_t arg, uint32_t set_fprf) { CPU_DoubleU farg; @@ -988,6 +998,42 @@ uint64_t helper_fsel(CPUPPCState *env, uint64_t arg1, uint64_t arg2, } } +void helper_ftdiv(CPUPPCState *env, uint32_t bf, uint64_t fra, uint64_t frb) +{ + int fe_flag = 0; + int fg_flag = 0; + + if (unlikely(float64_is_infinity(fra) || + float64_is_infinity(frb) || + float64_is_zero(frb))) { + fe_flag = 1; + fg_flag = 1; + } else { + int e_a = ppc_float64_get_unbiased_exp(fra); + int e_b = ppc_float64_get_unbiased_exp(frb); + + if (unlikely(float64_is_any_nan(fra) || + float64_is_any_nan(frb))) { + fe_flag = 1; + } else if ((e_b <= -1022) || (e_b >= 1021)) { + fe_flag = 1; + } else if (!float64_is_zero(fra) && + (((e_a - e_b) >= 1023) || + ((e_a - e_b) <= -1021) || + (e_a <= -970))) { + fe_flag = 1; + } + + if (unlikely(float64_is_zero_or_denormal(frb))) { + /* XB is not zero because of the above check and */ + /* so must be denormalized. */ + fg_flag = 1; + } + } + + env->crf[bf] = 0x8 | (fg_flag ? 4 : 0) | (fe_flag ? 2 : 0); +} + void helper_fcmpu(CPUPPCState *env, uint64_t arg1, uint64_t arg2, uint32_t crfD) { @@ -2016,16 +2062,6 @@ VSX_RSQRTE(xsrsqrtesp, 1, float64, f64, 1, 1) VSX_RSQRTE(xvrsqrtedp, 2, float64, f64, 0, 0) VSX_RSQRTE(xvrsqrtesp, 4, float32, f32, 0, 0) -static inline int ppc_float32_get_unbiased_exp(float32 f) -{ - return ((f >> 23) & 0xFF) - 127; -} - -static inline int ppc_float64_get_unbiased_exp(float64 f) -{ - return ((f >> 52) & 0x7FF) - 1023; -} - /* VSX_TDIV - VSX floating point test for divide * op - instruction mnemonic * nels - number of elements (1, 2 or 4) diff --git a/target-ppc/helper.h b/target-ppc/helper.h index 19b2f6b..5f5d3f6 100644 --- a/target-ppc/helper.h +++ b/target-ppc/helper.h @@ -97,6 +97,8 @@ DEF_HELPER_2(fres, i64, env, i64) DEF_HELPER_2(frsqrte, i64, env, i64) DEF_HELPER_4(fsel, i64, env, i64, i64, i64) +DEF_HELPER_4(ftdiv, void, env, i32, i64, i64) + #define dh_alias_avr ptr #define dh_ctype_avr ppc_avr_t * #define dh_is_signed_avr dh_is_signed_ptr diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 9f0c682..403e274 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -2299,6 +2299,22 @@ GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT); /* frim */ GEN_FLOAT_B(rim, 0x08, 0x0F, 1, PPC_FLOAT_EXT); +static void gen_ftdiv(DisasContext *ctx) +{ + TCGv_i32 bf; + if (unlikely(!ctx->fpu_enabled)) { + gen_exception(ctx, POWERPC_EXCP_FPU); + return; + } + /* NIP cannot be restored if the memory exception comes from an helper */ + gen_update_nip(ctx, ctx->nip - 4); + bf = tcg_const_i32(crfD(ctx->opcode)); + gen_helper_ftdiv(cpu_env, bf, cpu_fpr[rA(ctx->opcode)], + cpu_fpr[rB(ctx->opcode)]); +} + + + /*** Floating-Point compare ***/ /* fcmpo */ @@ -9801,6 +9817,7 @@ GEN_FLOAT_ACB(madd, 0x1D, 1, PPC_FLOAT), GEN_FLOAT_ACB(msub, 0x1C, 1, PPC_FLOAT), GEN_FLOAT_ACB(nmadd, 0x1F, 1, PPC_FLOAT), GEN_FLOAT_ACB(nmsub, 0x1E, 1, PPC_FLOAT), +GEN_HANDLER_E(ftdiv, 0x3F, 0x00, 0x04, 1, PPC_NONE, PPC2_ISA206), GEN_FLOAT_B(ctiw, 0x0E, 0x00, 0, PPC_FLOAT), GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0x00000000, PPC_NONE, PPC2_ISA206), GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT),