From patchwork Mon Mar 12 20:27:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10277411 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F40C602C2 for ; Mon, 12 Mar 2018 20:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80D18289F8 for ; Mon, 12 Mar 2018 20:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74A9E28A10; Mon, 12 Mar 2018 20:38:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ACCBF289F8 for ; Mon, 12 Mar 2018 20:38:04 +0000 (UTC) Received: from localhost ([::1]:34547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUCp-0005ua-Qo for patchwork-qemu-devel@patchwork.kernel.org; Mon, 12 Mar 2018 16:38:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3d-0005nY-Su for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3a-00076X-J3 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:33 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:59481) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3a-00073I-8f for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:30 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MAAfN-1ep8Og2ZRZ-00BIdi; Mon, 12 Mar 2018 21:27:55 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:27 +0100 Message-Id: <20180312202728.23790-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180312202728.23790-1-laurent@vivier.eu> References: <20180312202728.23790-1-laurent@vivier.eu> X-Provags-ID: V03:K0:ZWj9dJEnI4J3JHUdYconYlWKNf5c+8LMMdayUEdC+aX8mJDNnjf 0q5Y6dfq9jbiCzWMtqqeEZhScPEIpvcu7xmGX0MBMWKPyXBA1cnCSwtOv/MABNl2pmNPKrS C8SEYT5T4PPU5AGyS9b3/ROgT+02miMYGp+g5hWmlikPNAgeS2W55FhXu0Tv4m3BzCyRD/C yxIRsvJzPLWn7WV1DLCVA== X-UI-Out-Filterresults: notjunk:1; V01:K0:NevxML8ogSU=:0pxm1XEpac/J+/R1gxk/Lc Q6ceExGk7/MjL+lCMaM8e3n+uWWa9w4Ebxex2rWTEOOyoQITlX88rl/sYKuvHE7LvHJoLd30l 412BD8mLKlj1N92mH30A/in9C7LsXdfkwzPVhGyU9PH5bIoFkcqARB1hXT5pkLcQW0Bp5CVo3 PQhzavSCZk1BZDyQvFZAt0V5vgq3sGVyCg7flnON92xvqwr0Y15RGnVdYb7UIH8XZZAIv0Sr5 gPUQuVV93IZE43PnjFtnVHp/fvo1y5zPBjXfiyy36Kl22ZOtLrjOTrebFOjHO0IhQ4bRPMkQB lee6X/pWo5H+C0SDQvtgrZ18BeLSufLOMKEz1wE8fsL06B2r7klAsKuvFP5fiCjJ3IqEOFdUw 9TswuFdSy8alnJY4+Ioyot/6KDSum/PNn63faZONTdadA3JzzBdamrhI2vLAmpwalPxiJd9j2 4YBWtBlSH/7vNHt1yphJK9jnISNJtH8Jw5qOfnis+BgpsZzzaCD+Gmbx7Zkv+D07W5hI9f1Rp Z2R2ckZT+60xw6KJCyVjqHG4y6UXYxA+dXQRXWoy/Bv16QcmqMfNFWAaTlbyh69Pzvr2rCHyh c5sWcQMcwBWusw5tER6BVQVfU1XvDPIzpVGmrHPNUN9EYjX70p8QXhD+J4dFxbuJ0yM9qEVVq GqShVUfHTKYZuQEOcYQciEzGE9AAa51j+dp3SAYbCZe79CNi7iToZLzQpAD0iBwwaiHHjEm9m 4Hc3XTD3CXqjYESCa2XrhjtAaAKd5dC0vwh0gw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH 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: Thomas Huth , Laurent Vivier , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Using a local m68k floatx80_sinh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier --- 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;