From patchwork Fri Mar 9 14:57:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 883684 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 3zyVtW0vPwz9sby for ; Sat, 10 Mar 2018 02:00:35 +1100 (AEDT) Received: from localhost ([::1]:45753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euJVY-0005Vm-Vi for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2018 10:00:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euJSi-0003J0-0U for qemu-devel@nongnu.org; Fri, 09 Mar 2018 09:57:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euJSg-0002yu-VT for qemu-devel@nongnu.org; Fri, 09 Mar 2018 09:57:36 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:59549) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euJSg-0002xw-MG for qemu-devel@nongnu.org; Fri, 09 Mar 2018 09:57:34 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MPXsH-1ez0Q93ghN-004hMu; Fri, 09 Mar 2018 15:57:33 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2018 15:57:13 +0100 Message-Id: <20180309145717.9603-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180309145717.9603-1-laurent@vivier.eu> References: <20180309145717.9603-1-laurent@vivier.eu> X-Provags-ID: V03:K0:pDn3Koj32pB3ONSmGNXjPlP5zcgdFiVmbLKHWpS44wfnG845xv4 dpKDLJb/d5IRyw5joDjRil16TdqILuqU4YFj0D6ACwt7CsM/kO1NlsMDJTF5xii/Lu22XAO 31GDSVusDAwQMa2c7wRsnRWbICGTpd2ai+ELKMDPCJpzz0QmxlqgpajTWA8rFNhqrR1fbc/ Od7KmIJqP6qHZs7XGrFMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:U1uHwhsZcnw=:mJthLpK6FRixvnsenWf0rj uUwYDH/2mFehvG/EM3TIFjQxyaCDbLu0Ns71W9GswP0X8I3wUGzXRNRinWXaOxQEvZA5FhUCJ +OtEpY+iKVVBtHEdhOsN7Tdd8e+72Ovx6cXpNUtpYjK+HqPW3eFU7uRtKZIU0v/w5bXn4guRG KxoONsx9rzm/rMiy78Zt2ADXu0LS3yJkY9lZ0hJ3l+d2NOoflh12IoZ5UBcy3blxsPpF+3uP2 kzZDkhRWFiVaqriZ0BYTSt/qQEHtg3h2NV7cGGbyD85USoNBqgmTTrf0AaD0wYKSLRZcSG1/F tXt8uPIEiABmdrzHufWnL+xPZ/bTpGv8h3GG2IZo38FsHSWDs2CJV6wacjITAgS03Oet9F8B6 yjtZCn6z0ERjmx6UCo2oVs57CQnO/NZXk+DNgUikMA54iTWXMvVLdg+FiBJVoXDWuSGWSJu9i WhirT8rHnAA4NyeCVek8bY4psiI9KlkXy43vpg7j37dxLiM8vm9DMiERblbB6z1VdYGyuURNE 9TdRCw56T5n9m396wnwoZpCEDIPyjbF31FzLtF24MpZlnLEcyV3rrx2JRPbMKNqIwHoHxdzLG 88lIBfY8ujfW7gWQ30zntAlFe69cQXp62PmCuEBHP+eCxM3n74hZqSYvXyCfR5dAEOjxIVhQq L0JhrgaS9RRK59Noi5twGkBI+8swfZaEDblgWVFSdJ01MXMuvfSSdxRGHCQ/vjwQZ3tur30zX 5oPR55f60gbtfUHWfrVrdDF/8aH2Ert0zF038A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL v2 4/8] target/m68k: implement flog10 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_log10() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Message-Id: <20180305203910.10391-5-laurent@vivier.eu> --- target/m68k/fpu_helper.c | 5 +++++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 +++ 5 files changed, 67 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index cc6d3dfa52..2628534136 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -567,3 +567,8 @@ void HELPER(flogn)(CPUM68KState *env, FPReg *res, FPReg *val) { res->d = floatx80_logn(val->d, &env->fp_status); } + +void HELPER(flog10)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d = floatx80_log10(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 68e5f4c0a7..d1f38f260f 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -70,6 +70,7 @@ DEF_HELPER_3(fgetman, void, env, fp, fp) DEF_HELPER_4(fscale, void, env, fp, fp, fp) DEF_HELPER_3(flognp1, void, env, fp, fp) DEF_HELPER_3(flogn, void, env, fp, fp) +DEF_HELPER_3(flog10, 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 180a17c39b..22fd7f6341 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -658,3 +658,60 @@ floatx80 floatx80_logn(floatx80 a, float_status *status) return a; } } + +/*---------------------------------------------------------------------------- + | Log base 10 + *----------------------------------------------------------------------------*/ + +floatx80 floatx80_log10(floatx80 a, float_status *status) +{ + flag aSign; + int32_t aExp; + uint64_t aSig; + + int8_t user_rnd_mode, user_rnd_prec; + + floatx80 fp0, fp1; + + aSig = extractFloatx80Frac(a); + aExp = extractFloatx80Exp(a); + aSign = extractFloatx80Sign(a); + + if (aExp == 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + propagateFloatx80NaNOneArg(a, status); + } + if (aSign == 0) { + return packFloatx80(0, floatx80_infinity.high, + floatx80_infinity.low); + } + } + + if (aExp == 0 && aSig == 0) { + float_raise(float_flag_divbyzero, status); + return packFloatx80(1, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aSign) { + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + + 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; + + fp0 = floatx80_logn(a, status); + fp1 = packFloatx80(0, 0x3FFD, LIT64(0xDE5BD8A937287195)); /* INV_L10 */ + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_mul(fp0, fp1, status); /* LOGN(X)*INV_L10 */ + + float_raise(float_flag_inexact, status); + + return a; +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index 161bd6dff7..ac29e76189 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -29,4 +29,5 @@ floatx80 floatx80_scale(floatx80 a, floatx80 b, float_status *status); floatx80 floatx80_move(floatx80 a, float_status *status); floatx80 floatx80_lognp1(floatx80 a, float_status *status); floatx80 floatx80_logn(floatx80 a, float_status *status); +floatx80 floatx80_log10(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 705b9b0d5b..f1130df314 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5060,6 +5060,9 @@ DISAS_INSN(fpu) case 0x14: /* flogn */ gen_helper_flogn(cpu_env, cpu_dest, cpu_src); break; + case 0x15: /* flog10 */ + gen_helper_flog10(cpu_env, cpu_dest, cpu_src); + break; case 0x18: /* fabs */ gen_helper_fabs(cpu_env, cpu_dest, cpu_src); break;