From patchwork Tue Mar 13 15:59:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 885232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4010Fc6j6Wz9s70 for ; Wed, 14 Mar 2018 03:10:44 +1100 (AEDT) Received: from localhost ([::1]:40878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmVe-0002Sc-Ir for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2018 12:10:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLa-00030P-Hh for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLV-0002z4-MM for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:18 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:48735) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLU-0002xk-AJ for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:12 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M6hai-1ehFfi3agm-00wR64; Tue, 13 Mar 2018 17:00:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:17 +0100 Message-Id: <20180313155918.23591-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:z0f5HWLpqZFoKObMUdZ3gnuGFB/y7mulx2chyQEd5bajSwh53/v yYYSEO4QPiShpb2SdYrMfZNK33rBrc9SJX2HLLu5Am+jvPzwn+2C/WEJQKmHCkglv6qrUWK AweFMYYW32ju5K3JswfIjbfLurCn4+55VvHdWdcHuWcF/x7YqxeKM0R8Khw63q5oyuLFFlN rJyXYH2DoA9oJibm8DmIQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:EVGokpSDua0=:MPK9Bstrc01T+lMcsxfqZW JhgSqOgDuHPpwKf7tjPY44ilqQyOSP7hcQAEk6bNvFMS0rtmANDiv07SGelXRF1Un+hfh75ZX 8ImnPSNS2uTDTlEx15yBl1aho9o25zCVkDE4U8HdDPUCv4k+rsvkXIDROJyoH24TsmqZ83Z1J 8EZMeVqlh9M8Q1vqxWU6jZQXDVZLyTr+q+imbj4eduzJVSwWgrV31RTXQLTviknherhe1nSkh 9yg2hDEYwBhFFbWlXqIApiCDO+6XvmIyUcZu3KCD7Bs79tSqLmwLBZnVUQdCnAo/g0r/6W+Lo rd0A0r0DIg+8UAkiWpm0Xbmf4lUtQYNILdBoUiXl0e3zf+5gyi5h9jmNxgaEw+1+1/wE8CcsP bBIlxrWt51RFi97OmidEiJpn/NSsbQs2cL7v2LcoFM8EYuzPRJb5gql5FdOEIsmmCjL3pMnY9 muPv6mQpLl3M4tcfUoR8uPIUK2MmKJhAM+a4T6QXEO7fEc8RHbkIzuTLDjealqlESv6L4z3wy RxUQBvjvlxSzX3w2FuZ6A3bt4owyt0QjTXV+SROpCGPCSgF1pMlMAB/gjrrffvIRxWSaWtYFy Kmv2PGRquQCG8AB+GMBmfDxeii42N7m/j2rVsKnogfRsV2q3QXLrerTxxL77tNxlVy+pmI+I9 mHbIHpWS/5DLgAc4xLxoL0zLUngaPkYECAB6AqJZI3gwidp0eawFd+2hFUYwhHG04Wjs4AdsQ cThAwi/8wSUNZIdzVeSJD+E7Tyogj0n+2uKw9A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 10/11] target/m68k: implement fsinh X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using a local m68k floatx80_sinh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Message-Id: <20180312202728.23790-11-laurent@vivier.eu> --- target/m68k/fpu_helper.c | 5 +++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 ++ 5 files changed, 99 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 7d68879f34..4c969dfe00 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -643,3 +643,8 @@ void HELPER(ftanh)(CPUM68KState *env, FPReg *res, FPReg *val) { res->d = floatx80_tanh(val->d, &env->fp_status); } + +void HELPER(fsinh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d = floatx80_sinh(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index f100141367..acdca1af03 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -84,6 +84,7 @@ DEF_HELPER_3(fasin, void, env, fp, fp) DEF_HELPER_3(facos, void, env, fp, fp) DEF_HELPER_3(fatanh, void, env, fp, fp) DEF_HELPER_3(ftanh, void, env, fp, fp) +DEF_HELPER_3(fsinh, void, env, fp, fp) DEF_HELPER_3(mac_move, void, env, i32, i32) DEF_HELPER_3(macmulf, i64, env, i32, i32) diff --git a/target/m68k/softfloat.c b/target/m68k/softfloat.c index 4ce5783f03..1528bfd147 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -2733,3 +2733,92 @@ floatx80 floatx80_tanh(floatx80 a, float_status *status) return a; } } + +/*---------------------------------------------------------------------------- + | Hyperbolic sine + *----------------------------------------------------------------------------*/ + +floatx80 floatx80_sinh(floatx80 a, float_status *status) +{ + flag aSign; + int32_t aExp; + uint64_t aSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact; + floatx80 fp0, fp1, fp2; + float32 fact; + + aSig = extractFloatx80Frac(a); + aExp = extractFloatx80Exp(a); + aSign = extractFloatx80Sign(a); + + if (aExp == 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + return packFloatx80(aSign, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aExp == 0 && aSig == 0) { + return packFloatx80(aSign, 0, 0); + } + + user_rnd_mode = status->float_rounding_mode; + user_rnd_prec = status->floatx80_rounding_precision; + status->float_rounding_mode = float_round_nearest_even; + status->floatx80_rounding_precision = 80; + + compact = floatx80_make_compact(aExp, aSig); + + if (compact > 0x400CB167) { + /* SINHBIG */ + if (compact > 0x400CB2B3) { + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + return roundAndPackFloatx80(status->floatx80_rounding_precision, + aSign, 0x8000, aSig, 0, status); + } else { + fp0 = floatx80_abs(a); /* Y = |X| */ + fp0 = floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x40C62D38D3D64634), status), + status); /* (|X|-16381LOG2_LEAD) */ + fp0 = floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x3D6F90AEB1E75CC7), status), + status); /* |X| - 16381 LOG2, ACCURATE */ + fp0 = floatx80_etox(fp0, status); + fp2 = packFloatx80(aSign, 0x7FFB, one_sig); + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_mul(fp0, fp2, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } else { /* |X| < 16380 LOG2 */ + fp0 = floatx80_abs(a); /* Y = |X| */ + fp0 = floatx80_etoxm1(fp0, status); /* FP0 IS Z = EXPM1(Y) */ + fp1 = floatx80_add(fp0, float32_to_floatx80(make_float32(0x3F800000), + status), status); /* 1+Z */ + fp2 = fp0; + fp0 = floatx80_div(fp0, fp1, status); /* Z/(1+Z) */ + fp0 = floatx80_add(fp0, fp2, status); + + fact = packFloat32(aSign, 0x7E, 0); + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_mul(fp0, float32_to_floatx80(fact, status), status); + + float_raise(float_flag_inexact, status); + + return a; + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index 4cdb5a49ca..f033abf9ea 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -43,4 +43,5 @@ floatx80 floatx80_acos(floatx80 a, float_status *status); floatx80 floatx80_atanh(floatx80 a, float_status *status); floatx80 floatx80_etoxm1(floatx80 a, float_status *status); floatx80 floatx80_tanh(floatx80 a, float_status *status); +floatx80 floatx80_sinh(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 0caae904b5..7d83aaf91d 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5042,6 +5042,9 @@ DISAS_INSN(fpu) case 1: /* fint */ gen_helper_firound(cpu_env, cpu_dest, cpu_src); break; + case 2: /* fsinh */ + gen_helper_fsinh(cpu_env, cpu_dest, cpu_src); + break; case 3: /* fintrz */ gen_helper_fitrunc(cpu_env, cpu_dest, cpu_src); break;