From patchwork Tue Mar 13 15:59:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 885237 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 4010Ly2SyMz9s24 for ; Wed, 14 Mar 2018 03:15:21 +1100 (AEDT) Received: from localhost ([::1]:40917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evma6-0006gY-Fy for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2018 12:15:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLb-00031q-46 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLW-0002zT-At for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:19 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36137) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLV-0002yK-Ar for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MaG3Y-1fFW9T13DU-00JpcW; Tue, 13 Mar 2018 17:00:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:18 +0100 Message-Id: <20180313155918.23591-12-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:kcBRsbtDeEMF0egAJyFEQsXIhZVdMmBV2OZuoih2cs+zLpeZt8o khKwnb+A4OBh3cY7hNqhkKFyWSyXMPqgNs5nmdWVJ5On20P9Gao5Q0vsSNHxGbc70+Y+Mgw i8Zq4YOdwfRuwzUeWXXuwGu0eeo0gkqLRRF6u30OzaxRDuHxm4P5mW6cY7zic9fTslk7X6D wcRm7PWW1h9LMyGx+Mr3w== X-UI-Out-Filterresults: notjunk:1; V01:K0:P8RheztN6SU=:tf9nZx2CjCBZk5dSNJZG0U 8TC/UwhaHO8xZbNO0Ed7cf5bW5YQVnAqEKqQonc7rra7HyUCo1Viqgg8QiInsggjTcRw1eKNs go3sNldtrdUm4HqxOqC3oiF2H3SgEuE/y1VFRcXa323c08RkT4E4c9mGNI9N2Y0quRoNFvTDv LSLnodbDBzUFVrEdYEthppBJyIGgjA+bugv2mVJcPMEcrToAikOtWlQZ8o0tWjicSb3h1lnme 6Xb6KfpJc/Q2C9NMZeCsmPTxWEzA8UI5h2iL9u//EgtQEIF2lQKfNUqwygT/Kcj90hwc6K/KT ennrohSHcvAu5yWAvjXTTmZKjr22F8IcAYQVPMReb1EQglCBDDE/Hawytg7dvAIyJsMvsstgU 5IJzhxPKHbtsT6vCzrZkXEQH1XYiHUU2nRQCEaE/PR92fR0/9EQ9wE1fNR+sOTWvUt9CRVSnK QcitS3d2vMrWNQiKC0NUqfMTZtgBdnzHnZuc9XJ0DmK4KT4gWyK1USAjEmAv6l/Ib7MPZiESv bNYmjdmK4GHYyn0Af6wHkTSFs302cJTQAyENQ2yPQffaTvdN4jZAezqAM9qZUYgmMpQlntXVe SnGfSmwmPTOU31HWSVTVlACJloT9dzMtMPwmdDDnkvdEelHuvRfIoQXmROM1yUvIuzVi+dtEf qtZcFnp8QsvaQVR3rLvbHBD40d/aS/yv+h4ak0CP+IUKZKvIlM6ykR5Cg7TrflVXRPINVA5R4 kBCfFK652T1s4JALsEVeL38TUQXe/MufCCKC5g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 11/11] target/m68k: implement fcosh 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_cosh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Message-Id: <20180312202728.23790-12-laurent@vivier.eu> --- target/m68k/fpu_helper.c | 5 +++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 ++ 5 files changed, 91 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 4c969dfe00..6eeffdf9bb 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -648,3 +648,8 @@ void HELPER(fsinh)(CPUM68KState *env, FPReg *res, FPReg *val) { res->d = floatx80_sinh(val->d, &env->fp_status); } + +void HELPER(fcosh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d = floatx80_cosh(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index acdca1af03..feee7be626 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -85,6 +85,7 @@ 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(fcosh, 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 1528bfd147..dffb371c71 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -2822,3 +2822,84 @@ floatx80 floatx80_sinh(floatx80 a, float_status *status) return a; } } + +/*---------------------------------------------------------------------------- + | Hyperbolic cosine + *----------------------------------------------------------------------------*/ + +floatx80 floatx80_cosh(floatx80 a, float_status *status) +{ + int32_t aExp; + uint64_t aSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact; + floatx80 fp0, fp1; + + aSig = extractFloatx80Frac(a); + aExp = extractFloatx80Exp(a); + + if (aExp == 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + return packFloatx80(0, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aExp == 0 && aSig == 0) { + return packFloatx80(0, one_exp, one_sig); + } + + 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) { + if (compact > 0x400CB2B3) { + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + return roundAndPackFloatx80(status->floatx80_rounding_precision, 0, + 0x8000, one_sig, 0, status); + } else { + fp0 = packFloatx80(0, aExp, aSig); + fp0 = floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x40C62D38D3D64634), status), + status); + fp0 = floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x3D6F90AEB1E75CC7), status), + status); + fp0 = floatx80_etox(fp0, status); + fp1 = packFloatx80(0, 0x7FFB, one_sig); + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_mul(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } + + fp0 = packFloatx80(0, aExp, aSig); /* |X| */ + fp0 = floatx80_etox(fp0, status); /* EXP(|X|) */ + fp0 = floatx80_mul(fp0, float32_to_floatx80(make_float32(0x3F000000), + status), status); /* (1/2)*EXP(|X|) */ + fp1 = float32_to_floatx80(make_float32(0x3E800000), status); /* 1/4 */ + fp1 = floatx80_div(fp1, fp0, status); /* 1/(2*EXP(|X|)) */ + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_add(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index f033abf9ea..602661d5a8 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -44,4 +44,5 @@ 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); +floatx80 floatx80_cosh(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 7d83aaf91d..cef6f663ad 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5105,6 +5105,9 @@ DISAS_INSN(fpu) case 0x5c: /* fdabs */ gen_helper_fdabs(cpu_env, cpu_dest, cpu_src); break; + case 0x19: /* fcosh */ + gen_helper_fcosh(cpu_env, cpu_dest, cpu_src); + break; case 0x1a: /* fneg */ gen_helper_fneg(cpu_env, cpu_dest, cpu_src); break;