From patchwork Mon Mar 5 20:39:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 881686 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 3zwBmF6xhHz9sgM for ; Tue, 6 Mar 2018 07:47:09 +1100 (AEDT) Received: from localhost ([::1]:51498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1esx0m-0004R6-52 for incoming@patchwork.ozlabs.org; Mon, 05 Mar 2018 15:47:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eswvI-00085y-17 for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:41:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eswvE-0000Yh-UC for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:41:28 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:53967) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eswvE-0000YE-KF for qemu-devel@nongnu.org; Mon, 05 Mar 2018 15:41:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LmjjU-1eBvZY15ZM-00h6Ep; Mon, 05 Mar 2018 21:39:48 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 5 Mar 2018 21:39:07 +0100 Message-Id: <20180305203910.10391-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180305203910.10391-1-laurent@vivier.eu> References: <20180305203910.10391-1-laurent@vivier.eu> X-Provags-ID: V03:K0:kg1RX4w50yHPAG7n/2ThFyxtau7YJKSz+ms5ondrFiFRWmj99RY 7v0qC4/Nfvv+JJS1iQFgh1+GttDQWY4SF8zGP29+urMKVthO4ODDw49DQp580axUKpimNo5 7Afh/U1BBI2J+eN5L0/UMrxrUIvbiOvKFGAsTv5l3+lm9U/ot5Y0qC/VZL/rd/SVAKSUTbu 6FBT8ZWSA2mNUNvmDhu7g== X-UI-Out-Filterresults: notjunk:1; V01:K0:3+a7+iUFxK8=:GRs1VML3Vp2sQdTQyMS45k DPTTldtUkU25SOlnVMi8vXwyRT6JKBt+T8/FT0Ord2y29AoPBnpN7clfENL7xFjElJjpRrm/6 O0Yk1/XgtyEy2kwUdH//zhZv9tfBe39NX/+ZzxoKO8vPwEmBiveizLhPeVfo68BkpxhoxcYiJ EenLHa4+U1DaKp3ZX8bg3kB/c6US0ODNOB7lLbmtp18wcJzY1pQEZ7bcWVSHDDoQjMFTd11xq fqx3jFJxFL7fl6CtQTebBudw+sUKe8Mb3aRVKJlwAwv8S5MxhpGL88v7rsE8lMUxshQTfK85w JPwFe+FCverOBpdI0czmUpGh8pLPmRS09qznLIVu+dtnQcUO7rFMPaKNMxGW+IAASt4zMJSaQ hnGwEbCELMtnnCcsskvVHJ0tPXj3+RnvkW4MIlF3w9x4KfEo3y+uJOkhVRakYr4FHVZIkF51C dtqoDxN4Q5WTREquWF5KB+bKACIZKWDGwGv4I0zd06vYsNsJAzk1kJ/bk6xnAIMc8g9xjccL/ rlhR54MR3F8yNhQWoZ6G0H0YBrqJndgE4yO/Y7Bh/gOJYzBtW+zGsprOHaKCXgKcQPpCY6aFC K9DRtcSx+O3uy6Q8RwFcqUzYmoRzs1WTyc3sHTN+QyDjrFxRrSe/v0VoDSWLpeWG47f5RAgxF TliJmQegALl1dEiQL07foPN7rElWnlZOECDMoSKEDi3vbw/b5JExHxhFICRY3I9P74iWy1Xp2 a1AebevPkVdROwOWv04ELTxshQkI9tBB3jx2xg== 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] [PATCH 5/8] target/m68k: implement flog2 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_log2() [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 | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 +++ 5 files changed, 77 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 2628534136..97a4501126 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -572,3 +572,8 @@ void HELPER(flog10)(CPUM68KState *env, FPReg *res, FPReg *val) { res->d = floatx80_log10(val->d, &env->fp_status); } + +void HELPER(flog2)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d = floatx80_log2(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index d1f38f260f..15f63b353f 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -71,6 +71,7 @@ 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(flog2, 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 22fd7f6341..9fa6d6fd05 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -715,3 +715,70 @@ floatx80 floatx80_log10(floatx80 a, float_status *status) return a; } + +/*---------------------------------------------------------------------------- + | Log base 2 + *----------------------------------------------------------------------------*/ + +floatx80 floatx80_log2(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) { + if (aSig == 0) { + float_raise(float_flag_divbyzero, status); + return packFloatx80(1, floatx80_infinity.high, + floatx80_infinity.low); + } + normalizeFloatx80Subnormal(aSig, &aExp, &aSig); + } + + 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; + + if (aSig == one_sig) { /* X is 2^k */ + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = int32_to_floatx80(aExp - 0x3FFF, status); + } else { + fp0 = floatx80_logn(a, status); + fp1 = packFloatx80(0, 0x3FFF, LIT64(0xB8AA3B295C17F0BC)); /* INV_L2 */ + + status->float_rounding_mode = user_rnd_mode; + status->floatx80_rounding_precision = user_rnd_prec; + + a = floatx80_mul(fp0, fp1, status); /* LOGN(X)*INV_L2 */ + } + + float_raise(float_flag_inexact, status); + + return a; +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index ac29e76189..c0b77cf01b 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -30,4 +30,5 @@ 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); +floatx80 floatx80_log2(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index f1130df314..189b23d38d 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5063,6 +5063,9 @@ DISAS_INSN(fpu) case 0x15: /* flog10 */ gen_helper_flog10(cpu_env, cpu_dest, cpu_src); break; + case 0x16: /* flog2 */ + gen_helper_flog2(cpu_env, cpu_dest, cpu_src); + break; case 0x18: /* fabs */ gen_helper_fabs(cpu_env, cpu_dest, cpu_src); break;