From patchwork Mon Mar 12 20:27:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 884852 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 400V2J0jPKz9sSh for ; Tue, 13 Mar 2018 07:29:12 +1100 (AEDT) Received: from localhost ([::1]:34491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU4D-0005Yg-Pa for incoming@patchwork.ozlabs.org; Mon, 12 Mar 2018 16:29:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3M-0005Te-JY for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3J-0005ri-BQ for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:16 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:33855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3J-0005n8-1T for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MbcdF-1fCC5M00U1-00J69q; Mon, 12 Mar 2018 21:27:53 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:24 +0100 Message-Id: <20180312202728.23790-8-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:s0ucQSRK77oa8Jn3NZYtBhw9EQUBSmNGZYeyOPRd4+LewbdKcL9 FnGVM+8nPvViM0ak2kcPugl7D7G0BkYni2SY6Mvi5UJlFYCRGiT4+90PjxEy/keezWNhSH/ pPKNxg+HBNumEMCdFqS8tn+tYPqriGIKpaYozrxC8+zmFOOV1DynJMnV4om2rXGSksv8Fl4 ShAzI6TEm3+8kfa1P7mqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:lHvRrxaG09Q=:ocTcSjI4C0tlWccMFh1fzP QCtRNpXZf/XAE11CyeOcqFiVrRuTYNd4y0cXg0l/BOw66l6bDkvKuUI0KTAyZLLyZmS3Wm7XB Kb8cT887HtprLnZWSsD3NGWusZEstHfwrVM121hXDM96KOMeoAiXXOAHuMRODkh1soZ0yuKV7 TjwCcK85788tvVzIVecrU4MMnqbUIFAS11qGKuXpC+BXEWzeWE66Y6fHPrEFqhObMik6JsvHN Rs6hF7qMdoRuFDjOvRa4B3HnuaBGmL6evuj0wyHHdWQlT2TkDQgdLZm28g9KfEyAQyUpHzQ7f sW/jFjsmHJt9v2dChI2bOr/TqqiXyntueJxx0Gyq0FZpkObCmKIl2k7Eu/Glzu9P9o4oZ3xMw C8TLgQnkTWljkxeLAoXgnheyjgPkBJi3cFs2+vC76YLSuXmQdrUQB8AMDi9cbZTVth3OF5pg1 SVpJq6jtm//1bhp10xce44dO8H1eaB/2zl6xJuNHM93yHPQGH3wsqxruSwO0GvTZASn+nhByq coC/489+umeWMXiQzNGuTQh44fM6YQOQn/jDIFvS11OST3Prq21P1MUQ4zJY8qgkjBTPsIkag HkV/7J7mNaXgartJfxoNo5z7WXqcRxRFcAboYBR/mpqP0f3ImOyxsLdJH1KViKm6FTR38d85p HKySqSo+wpBkvACS5hcieXXF6fHHwUBpH6sywHT5mWm8DJiH79MP08ANWTTR3HeikkaySoe0r L6jCjoGWGXA7FbXOX9yjcb2aKUe9rhpgk4r/og== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH 07/11] target/m68k: implement facos 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using a local m68k floatx80_acos() [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 | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 +++ 5 files changed, 80 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 972cc97d96..18ad6999cb 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -628,3 +628,8 @@ void HELPER(fasin)(CPUM68KState *env, FPReg *res, FPReg *val) { res->d = floatx80_asin(val->d, &env->fp_status); } + +void HELPER(facos)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d = floatx80_acos(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index e1aca375e0..83247a8143 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -81,6 +81,7 @@ DEF_HELPER_3(fcos, void, env, fp, fp) DEF_HELPER_4(fsincos, void, env, fp, fp, fp) DEF_HELPER_3(fatan, void, env, fp, fp) DEF_HELPER_3(fasin, void, env, fp, fp) +DEF_HELPER_3(facos, 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 91f0435ac3..3d66f6946f 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -23,6 +23,7 @@ #include "fpu/softfloat-macros.h" #include "softfloat_fpsp_tables.h" +#define pi_exp 0x4000 #define piby2_exp 0x3FFF #define pi_sig LIT64(0xc90fdaa22168c235) @@ -2232,3 +2233,72 @@ floatx80 floatx80_asin(floatx80 a, float_status *status) return a; } + +/*---------------------------------------------------------------------------- + | Arc cosine + *----------------------------------------------------------------------------*/ + +floatx80 floatx80_acos(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, one; + + aSig = extractFloatx80Frac(a); + aExp = extractFloatx80Exp(a); + aSign = extractFloatx80Sign(a); + + if (aExp == 0x7FFF && (uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + if (aExp == 0 && aSig == 0) { + float_raise(float_flag_inexact, status); + return roundAndPackFloatx80(status->floatx80_rounding_precision, 0, + piby2_exp, pi_sig, 0, status); + } + + compact = floatx80_make_compact(aExp, aSig); + + if (compact >= 0x3FFF8000) { /* |X| >= 1 */ + if (aExp == one_exp && aSig == one_sig) { /* |X| == 1 */ + if (aSign) { /* X == -1 */ + a = packFloatx80(0, pi_exp, pi_sig); + float_raise(float_flag_inexact, status); + return floatx80_move(a, status); + } else { /* X == +1 */ + return packFloatx80(0, 0, 0); + } + } else { /* |X| > 1 */ + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + } /* |X| < 1 */ + + 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; + + one = packFloatx80(0, one_exp, one_sig); + fp0 = a; + + fp1 = floatx80_add(one, fp0, status); /* 1 + X */ + fp0 = floatx80_sub(one, fp0, status); /* 1 - X */ + fp0 = floatx80_div(fp0, fp1, status); /* (1-X)/(1+X) */ + fp0 = floatx80_sqrt(fp0, status); /* SQRT((1-X)/(1+X)) */ + fp0 = floatx80_atan(fp0, status); /* ATAN(SQRT((1-X)/(1+X))) */ + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_add(fp0, fp0, status); /* 2 * ATAN(SQRT((1-X)/(1+X))) */ + + float_raise(float_flag_inexact, status); + + return a; +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index ca0eb674aa..1140491c81 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -39,4 +39,5 @@ floatx80 floatx80_sin(floatx80 a, float_status *status); floatx80 floatx80_cos(floatx80 a, float_status *status); floatx80 floatx80_atan(floatx80 a, float_status *status); floatx80 floatx80_asin(floatx80 a, float_status *status); +floatx80 floatx80_acos(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index d4169c4533..5fad76c785 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5105,6 +5105,9 @@ DISAS_INSN(fpu) case 0x5e: /* fdneg */ gen_helper_fdneg(cpu_env, cpu_dest, cpu_src); break; + case 0x1c: /* facos */ + gen_helper_facos(cpu_env, cpu_dest, cpu_src); + break; case 0x1d: /* fcos */ gen_helper_fcos(cpu_env, cpu_dest, cpu_src); break;