From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886782728965.9260792415257; Mon, 12 Mar 2018 13:33:02 -0700 (PDT) Received: from localhost ([::1]:34512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU7x-0000jQ-Ld for importer@patchew.org; Mon, 12 Mar 2018 16:33:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3G-0005MY-0q for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3C-0005MX-Me for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:10 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:40895) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3C-0005Gu-8L for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:06 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lxbep-1ebC3M0b5n-017Eke; Mon, 12 Mar 2018 21:27:47 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:18 +0100 Message-Id: <20180312202728.23790-2-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:6I78VGO+KeC9pAOdzE4mWHQ0+50dHO8ir+jkZEBDf+dtZlGy7xK 60ANxoxwR/+KZUPpnyIbZF+E3P4iVl0BmfubDNWnaFrmsvjKtO6/TQAkxm2L2hzXkhVcFqm KlRyIBQXDJc2OSNPBULz3imwJi1OHRHhGc2FXX/oXJA5v1sGBhyIpMqJwi77Vepqjqd8SN+ vyzfoDR1Hju1vz5Ocjq1Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:7NmpT3aa75Q=:J990zqTUye2k7l19UuT7Fl gy78Pr/PKAOdOdZzG58TylMCXQLanKtNv99SKZZB/F8hhEM8ohaqL3dtyVoxhsTXTt+VPS1+y KPMML1vxkKBhaWUUDJlND+Bys0MaOY1dc/tydovUooJz/ZWQL0rjcUh56TTUCK2N9jskYGNwa V2/nIm83cspZAZSI7uWLVlzgvkfOCyL9OSRcCCq6vePsvVYV/HSTAgK4l6U7+fhQocufNT76Z bIZAXztDnh4nILZp/xAfXm6C2B+/8PUAvnJSnIRhnkMO3FBkN4sDKIdE6kdUDLp5NkkuP/c/7 R9qEB50Z3UCpU+pR+KkBlWjl1SJhoBTZM8rgU90A3evz49sV1+V9E0y+p+ZnO6PiBXrjUm2xT f1pAZxGX5gRlI9eyx3uMxvZrmXtra/mpQgOUw6FrEfXdurYgT2o100DVowOJ0GZMug4UoCS2Z e+JsnojaQjblk9GilRXtXXVprr3URJ/Hmur/C/Il9xKkRy0ZdWGr6OBMYioB/0A/hMTxBpjkT cfVZY022jHI8Ul/Jyy4z5uRCD4RNgE5U4J/2ay0Al7R4+v++q84p6U1Y+9jImhhZTMD7262MJ GmU4sGO0z0hia8GxTW0jGKupqnnF39//DMfxsE6wn1TMgLvei7EBUls49oWjlMghTZ18OnYyQ Obt/V+Lb/eJKiB7GAh7JAWck1RQLWaGnP1phvnaPNOCTTcwPMLf9M44uK8L3VKJ+7yQj4QFmp D7jsRg+ypaechvh+XCdz7zuYam+o4UX8VvPchg== 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] [PATCH 01/11] target/m68k: implement ftan 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_tan() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 + target/m68k/helper.h | 1 + target/m68k/softfloat.c | 210 ++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/softfloat_fpsp_tables.h | 136 +++++++++++++++++++++++ target/m68k/translate.c | 3 + 6 files changed, 356 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 62cbb0dff1..c41115ea05 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -592,3 +592,8 @@ void HELPER(ftentox)(CPUM68KState *env, FPReg *res, FPR= eg *val) { res->d =3D floatx80_tentox(val->d, &env->fp_status); } + +void HELPER(ftan)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_tan(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 9a9734c196..af9480fe49 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -75,6 +75,7 @@ DEF_HELPER_3(flog2, void, env, fp, fp) DEF_HELPER_3(fetox, void, env, fp, fp) DEF_HELPER_3(ftwotox, void, env, fp, fp) DEF_HELPER_3(ftentox, void, env, fp, fp) +DEF_HELPER_3(ftan, void, env, fp, fp) =20 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 4bd5b9e6b7..488dbc522b 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -1266,3 +1266,213 @@ floatx80 floatx80_tentox(floatx80 a, float_status *= status) return a; } } + +/*------------------------------------------------------------------------= ---- + | Tangent + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_tan(floatx80 a, float_status *status) +{ + flag aSign, xSign; + int32_t aExp, xExp; + uint64_t aSig, xSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact, l, n, j; + floatx80 fp0, fp1, fp2, fp3, fp4, fp5, invtwopi, twopi1, twopi2; + float32 twoto63; + flag endflag; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + fp0 =3D a; + + if (compact < 0x3FD78000 || compact > 0x4004BC7E) { + /* 2^(-40) > |X| > 15 PI */ + if (compact > 0x3FFF8000) { /* |X| >=3D 15 PI */ + /* REDUCEX */ + fp1 =3D packFloatx80(0, 0, 0); + if (compact =3D=3D 0x7FFEFFFF) { + twopi1 =3D packFloatx80(aSign ^ 1, 0x7FFE, + LIT64(0xC90FDAA200000000)); + twopi2 =3D packFloatx80(aSign ^ 1, 0x7FDC, + LIT64(0x85A308D300000000)); + fp0 =3D floatx80_add(fp0, twopi1, status); + fp1 =3D fp0; + fp0 =3D floatx80_add(fp0, twopi2, status); + fp1 =3D floatx80_sub(fp1, fp0, status); + fp1 =3D floatx80_add(fp1, twopi2, status); + } + loop: + xSign =3D extractFloatx80Sign(fp0); + xExp =3D extractFloatx80Exp(fp0); + xExp -=3D 0x3FFF; + if (xExp <=3D 28) { + l =3D 0; + endflag =3D 1; + } else { + l =3D xExp - 27; + endflag =3D 0; + } + invtwopi =3D packFloatx80(0, 0x3FFE - l, + LIT64(0xA2F9836E4E44152A)); /* INVTWOP= I */ + twopi1 =3D packFloatx80(0, 0x3FFF + l, LIT64(0xC90FDAA20000000= 0)); + twopi2 =3D packFloatx80(0, 0x3FDD + l, LIT64(0x85A308D30000000= 0)); + + /* SIGN(INARG)*2^63 IN SGL */ + twoto63 =3D packFloat32(xSign, 0xBE, 0); + + fp2 =3D floatx80_mul(fp0, invtwopi, status); + fp2 =3D floatx80_add(fp2, float32_to_floatx80(twoto63, status), + status); /* THE FRACT PART OF FP2 IS ROUNDE= D */ + fp2 =3D floatx80_sub(fp2, float32_to_floatx80(twoto63, status), + status); /* FP2 is N */ + fp4 =3D floatx80_mul(twopi1, fp2, status); /* W =3D N*P1 */ + fp5 =3D floatx80_mul(twopi2, fp2, status); /* w =3D N*P2 */ + fp3 =3D floatx80_add(fp4, fp5, status); /* FP3 is P */ + fp4 =3D floatx80_sub(fp4, fp3, status); /* W-P */ + fp0 =3D floatx80_sub(fp0, fp3, status); /* FP0 is A :=3D R - P= */ + fp4 =3D floatx80_add(fp4, fp5, status); /* FP4 is p =3D (W-P)+= w */ + fp3 =3D fp0; /* FP3 is A */ + fp1 =3D floatx80_sub(fp1, fp4, status); /* FP1 is a :=3D r - p= */ + fp0 =3D floatx80_add(fp0, fp1, status); /* FP0 is R :=3D A+a */ + + if (endflag > 0) { + n =3D floatx80_to_int32(fp2, status); + goto tancont; + } + fp3 =3D floatx80_sub(fp3, fp0, status); /* A-R */ + fp1 =3D floatx80_add(fp1, fp3, status); /* FP1 is r :=3D (A-R)= +a */ + goto loop; + } else { + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_move(a, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } else { + fp1 =3D floatx80_mul(fp0, float64_to_floatx80( + make_float64(0x3FE45F306DC9C883), status), + status); /* X*2/PI */ + + n =3D floatx80_to_int32(fp1, status); + j =3D 32 + n; + + fp0 =3D floatx80_sub(fp0, pi_tbl[j], status); /* X-Y1 */ + fp0 =3D floatx80_sub(fp0, float32_to_floatx80(pi_tbl2[j], status), + status); /* FP0 IS R =3D (X-Y1)-Y2 */ + + tancont: + if (n & 1) { + /* NODD */ + fp1 =3D fp0; /* R */ + fp0 =3D floatx80_mul(fp0, fp0, status); /* S =3D R*R */ + fp3 =3D float64_to_floatx80(make_float64(0x3EA0B759F50F8688), + status); /* Q4 */ + fp2 =3D float64_to_floatx80(make_float64(0xBEF2BAA5A8924F04), + status); /* P3 */ + fp3 =3D floatx80_mul(fp3, fp0, status); /* SQ4 */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* SP3 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBF346F59B39BA65F), status), + status); /* Q3+SQ4 */ + fp4 =3D packFloatx80(0, 0x3FF6, LIT64(0xE073D3FC199C4A00)); + fp2 =3D floatx80_add(fp2, fp4, status); /* P2+SP3 */ + fp3 =3D floatx80_mul(fp3, fp0, status); /* S(Q3+SQ4) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* S(P2+SP3) */ + fp4 =3D packFloatx80(0, 0x3FF9, LIT64(0xD23CD68415D95FA1)); + fp3 =3D floatx80_add(fp3, fp4, status); /* Q2+S(Q3+SQ4) */ + fp4 =3D packFloatx80(1, 0x3FFC, LIT64(0x8895A6C5FB423BCA)); + fp2 =3D floatx80_add(fp2, fp4, status); /* P1+S(P2+SP3) */ + fp3 =3D floatx80_mul(fp3, fp0, status); /* S(Q2+S(Q3+SQ4)) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* S(P1+S(P2+SP3)) */ + fp4 =3D packFloatx80(1, 0x3FFD, LIT64(0xEEF57E0DA84BC8CE)); + fp3 =3D floatx80_add(fp3, fp4, status); /* Q1+S(Q2+S(Q3+SQ4)) = */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* RS(P1+S(P2+SP3)) */ + fp0 =3D floatx80_mul(fp0, fp3, status); /* S(Q1+S(Q2+S(Q3+SQ4)= )) */ + fp1 =3D floatx80_add(fp1, fp2, status); /* R+RS(P1+S(P2+SP3)) = */ + fp0 =3D floatx80_add(fp0, float32_to_floatx80( + make_float32(0x3F800000), status), + status); /* 1+S(Q1+S(Q2+S(Q3+SQ4))) */ + + xSign =3D extractFloatx80Sign(fp1); + xExp =3D extractFloatx80Exp(fp1); + xSig =3D extractFloatx80Frac(fp1); + xSign ^=3D 1; + fp1 =3D packFloatx80(xSign, xExp, xSig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_div(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + fp1 =3D floatx80_mul(fp0, fp0, status); /* S =3D R*R */ + fp3 =3D float64_to_floatx80(make_float64(0x3EA0B759F50F8688), + status); /* Q4 */ + fp2 =3D float64_to_floatx80(make_float64(0xBEF2BAA5A8924F04), + status); /* P3 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* SQ4 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* SP3 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBF346F59B39BA65F), status), + status); /* Q3+SQ4 */ + fp4 =3D packFloatx80(0, 0x3FF6, LIT64(0xE073D3FC199C4A00)); + fp2 =3D floatx80_add(fp2, fp4, status); /* P2+SP3 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* S(Q3+SQ4) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* S(P2+SP3) */ + fp4 =3D packFloatx80(0, 0x3FF9, LIT64(0xD23CD68415D95FA1)); + fp3 =3D floatx80_add(fp3, fp4, status); /* Q2+S(Q3+SQ4) */ + fp4 =3D packFloatx80(1, 0x3FFC, LIT64(0x8895A6C5FB423BCA)); + fp2 =3D floatx80_add(fp2, fp4, status); /* P1+S(P2+SP3) */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* S(Q2+S(Q3+SQ4)) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* S(P1+S(P2+SP3)) */ + fp4 =3D packFloatx80(1, 0x3FFD, LIT64(0xEEF57E0DA84BC8CE)); + fp3 =3D floatx80_add(fp3, fp4, status); /* Q1+S(Q2+S(Q3+SQ4)) = */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* RS(P1+S(P2+SP3)) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* S(Q1+S(Q2+S(Q3+SQ4)= )) */ + fp0 =3D floatx80_add(fp0, fp2, status); /* R+RS(P1+S(P2+SP3)) = */ + fp1 =3D floatx80_add(fp1, float32_to_floatx80( + make_float32(0x3F800000), status), + status); /* 1+S(Q1+S(Q2+S(Q3+SQ4))) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_div(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index d28e49fe9f..c5ac54d87b 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -34,4 +34,5 @@ floatx80 floatx80_log2(floatx80 a, float_status *status); floatx80 floatx80_etox(floatx80 a, float_status *status); floatx80 floatx80_twotox(floatx80 a, float_status *status); floatx80 floatx80_tentox(floatx80 a, float_status *status); +floatx80 floatx80_tan(floatx80 a, float_status *status); #endif diff --git a/target/m68k/softfloat_fpsp_tables.h b/target/m68k/softfloat_fp= sp_tables.h index dd76dc0373..a9c86a5af2 100644 --- a/target/m68k/softfloat_fpsp_tables.h +++ b/target/m68k/softfloat_fpsp_tables.h @@ -371,4 +371,140 @@ static const uint32_t exp2_tbl2[64] =3D { 0xBFBDBF4A, 0x3FBEC01A, 0x3FBE8CAC, 0xBFBCBB3F, 0x3FBEF73A, 0xBFB8B795, 0x3FBEF84B, 0xBFBEF581 }; + +static const floatx80 pi_tbl[65] =3D { + make_floatx80_init(0xC004, 0xC90FDAA22168C235), + make_floatx80_init(0xC004, 0xC2C75BCD105D7C23), + make_floatx80_init(0xC004, 0xBC7EDCF7FF523611), + make_floatx80_init(0xC004, 0xB6365E22EE46F000), + make_floatx80_init(0xC004, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0xC004, 0xA9A56078CC3063DD), + make_floatx80_init(0xC004, 0xA35CE1A3BB251DCB), + make_floatx80_init(0xC004, 0x9D1462CEAA19D7B9), + make_floatx80_init(0xC004, 0x96CBE3F9990E91A8), + make_floatx80_init(0xC004, 0x9083652488034B96), + make_floatx80_init(0xC004, 0x8A3AE64F76F80584), + make_floatx80_init(0xC004, 0x83F2677A65ECBF73), + make_floatx80_init(0xC003, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0xC003, 0xEEC2D3A087AC669F), + make_floatx80_init(0xC003, 0xE231D5F66595DA7B), + make_floatx80_init(0xC003, 0xD5A0D84C437F4E58), + make_floatx80_init(0xC003, 0xC90FDAA22168C235), + make_floatx80_init(0xC003, 0xBC7EDCF7FF523611), + make_floatx80_init(0xC003, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0xC003, 0xA35CE1A3BB251DCB), + make_floatx80_init(0xC003, 0x96CBE3F9990E91A8), + make_floatx80_init(0xC003, 0x8A3AE64F76F80584), + make_floatx80_init(0xC002, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0xC002, 0xE231D5F66595DA7B), + make_floatx80_init(0xC002, 0xC90FDAA22168C235), + make_floatx80_init(0xC002, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0xC002, 0x96CBE3F9990E91A8), + make_floatx80_init(0xC001, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0xC001, 0xC90FDAA22168C235), + make_floatx80_init(0xC001, 0x96CBE3F9990E91A8), + make_floatx80_init(0xC000, 0xC90FDAA22168C235), + make_floatx80_init(0xBFFF, 0xC90FDAA22168C235), + make_floatx80_init(0x0000, 0x0000000000000000), + make_floatx80_init(0x3FFF, 0xC90FDAA22168C235), + make_floatx80_init(0x4000, 0xC90FDAA22168C235), + make_floatx80_init(0x4001, 0x96CBE3F9990E91A8), + make_floatx80_init(0x4001, 0xC90FDAA22168C235), + make_floatx80_init(0x4001, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0x4002, 0x96CBE3F9990E91A8), + make_floatx80_init(0x4002, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0x4002, 0xC90FDAA22168C235), + make_floatx80_init(0x4002, 0xE231D5F66595DA7B), + make_floatx80_init(0x4002, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0x4003, 0x8A3AE64F76F80584), + make_floatx80_init(0x4003, 0x96CBE3F9990E91A8), + make_floatx80_init(0x4003, 0xA35CE1A3BB251DCB), + make_floatx80_init(0x4003, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0x4003, 0xBC7EDCF7FF523611), + make_floatx80_init(0x4003, 0xC90FDAA22168C235), + make_floatx80_init(0x4003, 0xD5A0D84C437F4E58), + make_floatx80_init(0x4003, 0xE231D5F66595DA7B), + make_floatx80_init(0x4003, 0xEEC2D3A087AC669F), + make_floatx80_init(0x4003, 0xFB53D14AA9C2F2C2), + make_floatx80_init(0x4004, 0x83F2677A65ECBF73), + make_floatx80_init(0x4004, 0x8A3AE64F76F80584), + make_floatx80_init(0x4004, 0x9083652488034B96), + make_floatx80_init(0x4004, 0x96CBE3F9990E91A8), + make_floatx80_init(0x4004, 0x9D1462CEAA19D7B9), + make_floatx80_init(0x4004, 0xA35CE1A3BB251DCB), + make_floatx80_init(0x4004, 0xA9A56078CC3063DD), + make_floatx80_init(0x4004, 0xAFEDDF4DDD3BA9EE), + make_floatx80_init(0x4004, 0xB6365E22EE46F000), + make_floatx80_init(0x4004, 0xBC7EDCF7FF523611), + make_floatx80_init(0x4004, 0xC2C75BCD105D7C23), + make_floatx80_init(0x4004, 0xC90FDAA22168C235) +}; + +static const float32 pi_tbl2[65] =3D { + const_float32(0x21800000), + const_float32(0xA0D00000), + const_float32(0xA1E80000), + const_float32(0x21480000), + const_float32(0xA1200000), + const_float32(0x21FC0000), + const_float32(0x21100000), + const_float32(0xA1580000), + const_float32(0x21E00000), + const_float32(0x20B00000), + const_float32(0xA1880000), + const_float32(0x21C40000), + const_float32(0x20000000), + const_float32(0x21380000), + const_float32(0xA1300000), + const_float32(0x9FC00000), + const_float32(0x21000000), + const_float32(0xA1680000), + const_float32(0xA0A00000), + const_float32(0x20900000), + const_float32(0x21600000), + const_float32(0xA1080000), + const_float32(0x1F800000), + const_float32(0xA0B00000), + const_float32(0x20800000), + const_float32(0xA0200000), + const_float32(0x20E00000), + const_float32(0x1F000000), + const_float32(0x20000000), + const_float32(0x20600000), + const_float32(0x1F800000), + const_float32(0x1F000000), + const_float32(0x00000000), + const_float32(0x9F000000), + const_float32(0x9F800000), + const_float32(0xA0600000), + const_float32(0xA0000000), + const_float32(0x9F000000), + const_float32(0xA0E00000), + const_float32(0x20200000), + const_float32(0xA0800000), + const_float32(0x20B00000), + const_float32(0x9F800000), + const_float32(0x21080000), + const_float32(0xA1600000), + const_float32(0xA0900000), + const_float32(0x20A00000), + const_float32(0x21680000), + const_float32(0xA1000000), + const_float32(0x1FC00000), + const_float32(0x21300000), + const_float32(0xA1380000), + const_float32(0xA0000000), + const_float32(0xA1C40000), + const_float32(0x21880000), + const_float32(0xA0B00000), + const_float32(0xA1E00000), + const_float32(0x21580000), + const_float32(0xA1100000), + const_float32(0xA1FC0000), + const_float32(0x21200000), + const_float32(0xA1480000), + const_float32(0x21E80000), + const_float32(0x20D00000), + const_float32(0xA1800000), +}; #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 6d5bde0777..af8cdc2580 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5057,6 +5057,9 @@ DISAS_INSN(fpu) case 0x06: /* flognp1 */ gen_helper_flognp1(cpu_env, cpu_dest, cpu_src); break; + case 0x0f: /* ftan */ + gen_helper_ftan(cpu_env, cpu_dest, cpu_src); + break; case 0x10: /* fetox */ gen_helper_fetox(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886765530900.0277674797558; Mon, 12 Mar 2018 13:32:45 -0700 (PDT) Received: from localhost ([::1]:34511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU7g-0000VH-Mc for importer@patchew.org; Mon, 12 Mar 2018 16:32:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3I-0005Oa-AQ for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3G-0005e1-8B for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:12 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49919) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3F-0005Y1-Rd for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:10 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M5cGS-1ekIrE10SO-00xe75; Mon, 12 Mar 2018 21:27:48 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:19 +0100 Message-Id: <20180312202728.23790-3-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:04zm45usTcsKhMuk97MS7qaHEf+Z4KxcrRlt+6DR7RiVZOWwaKV J+KoKgdphdA9iBKRICvqrW+kn7scKMG9bKxLXw0mnjjMM/KvgUR2E5flFzBw2E7QHMRG0Tk XIqaSPbMN4y/5y8LRbKiymPg/o62ERFKFsH8mfQ86502aJgs0ijXstEAkw2q3t6oJgCi0Os Otp+naqX1g9KYI4viKQPw== X-UI-Out-Filterresults: notjunk:1;V01:K0:PXl3NI9SZzc=:R7tngmo86xgH8OgvZ/4P41 fSuigKPeyJTxX68KFdxUtzpBH8GZ7X+kTYXp69SB45+eiciXUYC714D/GN6Dmh6Qo1L5xaOeq JfVRdXhdhIkK7M33UPun2eqfnEL+JFUhvI+El83tRba8sD1UUhGyWQF7um2mshA4Hr7brNBB6 +6z41dhdz2hkJySMO84KmgVL4bouqeVH1LUfTVNSPukSyfrvlgeLODIw00SWcaE6WUPs1gJRn 9BttisBLJ0FGHEO73V6p6rlL3TZHnWLC0TiKlXo2oC5JCyKjPRLslsMl4NwhJypjf8f78/HUW FKhF3w4w5d6ilkEDwkLEdu1wNLXuzVSg34wLG8Bor2p7pgr6PyxF3h37nFkmBXxCt37Y0KfqL WC8a8IeE1LxbaA7LBnH1Ijlv26DyvUqqXX1eLHinPxUJeOE0+FWeWhho89VByvqwAyfV5Bf7t j4nLWziKl9/z1GHCMjv+pjdtORb49Wre6v5IWLtxyGpjt+ziKhBxnjvJ3DOasqLouuJCP5AXI H73KBqC/uWNxlMNfHjCVrjGOaGdb+g0KSnaM43uVxmNwFvrsTx8S7yTcSLIts6ArlETNT7H6S uuYlRJ3t/IChLuAveTfERdBcA7LQQDxvko7DWlpy9TvsSb84He9d4oLN39N3dOIquhEcM34wC u1vLJN0gWub4BmWsWjfbo2C8FAI3pgiSVz+Xvd0EXzYHzKn49NGBr3Z5UmpontPW1pZl76Znv H6lUPAOCxJG6huIwkprIUToCTJ6GdR0RexzogA== 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] [PATCH 02/11] target/m68k: implement fsin 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_sin() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 + target/m68k/helper.h | 1 + target/m68k/softfloat.c | 247 +++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 + 5 files changed, 257 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index c41115ea05..a6cfb4db1a 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -597,3 +597,8 @@ void HELPER(ftan)(CPUM68KState *env, FPReg *res, FPReg = *val) { res->d =3D floatx80_tan(val->d, &env->fp_status); } + +void HELPER(fsin)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_sin(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index af9480fe49..6d8bfaab64 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -76,6 +76,7 @@ DEF_HELPER_3(fetox, void, env, fp, fp) DEF_HELPER_3(ftwotox, void, env, fp, fp) DEF_HELPER_3(ftentox, void, env, fp, fp) DEF_HELPER_3(ftan, void, env, fp, fp) +DEF_HELPER_3(fsin, void, env, fp, fp) =20 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 488dbc522b..6fb9665336 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -1476,3 +1476,250 @@ floatx80 floatx80_tan(floatx80 a, float_status *sta= tus) } } } + +/*------------------------------------------------------------------------= ---- + | Sine + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_sin(floatx80 a, float_status *status) +{ + flag aSign, xSign; + int32_t aExp, xExp; + uint64_t aSig, xSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact, l, n, j; + floatx80 fp0, fp1, fp2, fp3, fp4, fp5, x, invtwopi, twopi1, twopi2; + float32 posneg1, twoto63; + flag adjn, endflag; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + adjn =3D 0; + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + fp0 =3D a; + + if (compact < 0x3FD78000 || compact > 0x4004BC7E) { + /* 2^(-40) > |X| > 15 PI */ + if (compact > 0x3FFF8000) { /* |X| >=3D 15 PI */ + /* REDUCEX */ + fp1 =3D packFloatx80(0, 0, 0); + if (compact =3D=3D 0x7FFEFFFF) { + twopi1 =3D packFloatx80(aSign ^ 1, 0x7FFE, + LIT64(0xC90FDAA200000000)); + twopi2 =3D packFloatx80(aSign ^ 1, 0x7FDC, + LIT64(0x85A308D300000000)); + fp0 =3D floatx80_add(fp0, twopi1, status); + fp1 =3D fp0; + fp0 =3D floatx80_add(fp0, twopi2, status); + fp1 =3D floatx80_sub(fp1, fp0, status); + fp1 =3D floatx80_add(fp1, twopi2, status); + } + loop: + xSign =3D extractFloatx80Sign(fp0); + xExp =3D extractFloatx80Exp(fp0); + xExp -=3D 0x3FFF; + if (xExp <=3D 28) { + l =3D 0; + endflag =3D 1; + } else { + l =3D xExp - 27; + endflag =3D 0; + } + invtwopi =3D packFloatx80(0, 0x3FFE - l, + LIT64(0xA2F9836E4E44152A)); /* INVTWOP= I */ + twopi1 =3D packFloatx80(0, 0x3FFF + l, LIT64(0xC90FDAA20000000= 0)); + twopi2 =3D packFloatx80(0, 0x3FDD + l, LIT64(0x85A308D30000000= 0)); + + /* SIGN(INARG)*2^63 IN SGL */ + twoto63 =3D packFloat32(xSign, 0xBE, 0); + + fp2 =3D floatx80_mul(fp0, invtwopi, status); + fp2 =3D floatx80_add(fp2, float32_to_floatx80(twoto63, status), + status); /* THE FRACT PART OF FP2 IS ROUNDE= D */ + fp2 =3D floatx80_sub(fp2, float32_to_floatx80(twoto63, status), + status); /* FP2 is N */ + fp4 =3D floatx80_mul(twopi1, fp2, status); /* W =3D N*P1 */ + fp5 =3D floatx80_mul(twopi2, fp2, status); /* w =3D N*P2 */ + fp3 =3D floatx80_add(fp4, fp5, status); /* FP3 is P */ + fp4 =3D floatx80_sub(fp4, fp3, status); /* W-P */ + fp0 =3D floatx80_sub(fp0, fp3, status); /* FP0 is A :=3D R - P= */ + fp4 =3D floatx80_add(fp4, fp5, status); /* FP4 is p =3D (W-P)+= w */ + fp3 =3D fp0; /* FP3 is A */ + fp1 =3D floatx80_sub(fp1, fp4, status); /* FP1 is a :=3D r - p= */ + fp0 =3D floatx80_add(fp0, fp1, status); /* FP0 is R :=3D A+a */ + + if (endflag > 0) { + n =3D floatx80_to_int32(fp2, status); + goto sincont; + } + fp3 =3D floatx80_sub(fp3, fp0, status); /* A-R */ + fp1 =3D floatx80_add(fp1, fp3, status); /* FP1 is r :=3D (A-R)= +a */ + goto loop; + } else { + /* SINSM */ + fp0 =3D float32_to_floatx80(make_float32(0x3F800000), + status); /* 1 */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + if (adjn) { + /* COSTINY */ + a =3D floatx80_sub(fp0, float32_to_floatx80( + make_float32(0x00800000), status), status= ); + } else { + /* SINTINY */ + a =3D floatx80_move(a, status); + } + float_raise(float_flag_inexact, status); + + return a; + } + } else { + fp1 =3D floatx80_mul(fp0, float64_to_floatx80( + make_float64(0x3FE45F306DC9C883), status), + status); /* X*2/PI */ + + n =3D floatx80_to_int32(fp1, status); + j =3D 32 + n; + + fp0 =3D floatx80_sub(fp0, pi_tbl[j], status); /* X-Y1 */ + fp0 =3D floatx80_sub(fp0, float32_to_floatx80(pi_tbl2[j], status), + status); /* FP0 IS R =3D (X-Y1)-Y2 */ + + sincont: + if ((n + adjn) & 1) { + /* COSPOLY */ + fp0 =3D floatx80_mul(fp0, fp0, status); /* FP0 IS S */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* FP1 IS T */ + fp2 =3D float64_to_floatx80(make_float64(0x3D2AC4D0D6011EE3), + status); /* B8 */ + fp3 =3D float64_to_floatx80(make_float64(0xBDA9396F9F45AC19), + status); /* B7 */ + + xSign =3D extractFloatx80Sign(fp0); /* X IS S */ + xExp =3D extractFloatx80Exp(fp0); + xSig =3D extractFloatx80Frac(fp0); + + if (((n + adjn) >> 1) & 1) { + xSign ^=3D 1; + posneg1 =3D make_float32(0xBF800000); /* -1 */ + } else { + xSign ^=3D 0; + posneg1 =3D make_float32(0x3F800000); /* 1 */ + } /* X IS NOW R'=3D SGN*R */ + + fp2 =3D floatx80_mul(fp2, fp1, status); /* TB8 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* TB7 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3E21EED90612C972), status), + status); /* B6+TB8 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBE927E4FB79D9FCF), status), + status); /* B5+TB7 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(B6+TB8) */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T(B5+TB7) */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3EFA01A01A01D423), status), + status); /* B4+T(B6+TB8) */ + fp4 =3D packFloatx80(1, 0x3FF5, LIT64(0xB60B60B60B61D438)); + fp3 =3D floatx80_add(fp3, fp4, status); /* B3+T(B5+TB7) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(B4+T(B6+TB8)) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* T(B3+T(B5+TB7)) */ + fp4 =3D packFloatx80(0, 0x3FFA, LIT64(0xAAAAAAAAAAAAAB5E)); + fp2 =3D floatx80_add(fp2, fp4, status); /* B2+T(B4+T(B6+TB8)) = */ + fp1 =3D floatx80_add(fp1, float32_to_floatx80( + make_float32(0xBF000000), status), + status); /* B1+T(B3+T(B5+TB7)) */ + fp0 =3D floatx80_mul(fp0, fp2, status); /* S(B2+T(B4+T(B6+TB8)= )) */ + fp0 =3D floatx80_add(fp0, fp1, status); /* [B1+T(B3+T(B5+TB7))= ]+ + * [S(B2+T(B4+T(B6+TB8))= )] + */ + + x =3D packFloatx80(xSign, xExp, xSig); + fp0 =3D floatx80_mul(fp0, x, status); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, float32_to_floatx80(posneg1, status), = status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + /* SINPOLY */ + xSign =3D extractFloatx80Sign(fp0); /* X IS R */ + xExp =3D extractFloatx80Exp(fp0); + xSig =3D extractFloatx80Frac(fp0); + + xSign ^=3D ((n + adjn) >> 1) & 1; /* X IS NOW R'=3D SGN*R */ + + fp0 =3D floatx80_mul(fp0, fp0, status); /* FP0 IS S */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* FP1 IS T */ + fp3 =3D float64_to_floatx80(make_float64(0xBD6AAA77CCC994F5), + status); /* A7 */ + fp2 =3D float64_to_floatx80(make_float64(0x3DE612097AAE8DA1), + status); /* A6 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T*A7 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T*A6 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBE5AE6452A118AE4), status), + status); /* A5+T*A7 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3EC71DE3A5341531), status), + status); /* A4+T*A6 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T(A5+TA7) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(A4+TA6) */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBF2A01A01A018B59), status), + status); /* A3+T(A5+TA7) */ + fp4 =3D packFloatx80(0, 0x3FF8, LIT64(0x88888888888859AF)); + fp2 =3D floatx80_add(fp2, fp4, status); /* A2+T(A4+TA6) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* T(A3+T(A5+TA7)) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* S(A2+T(A4+TA6)) */ + fp4 =3D packFloatx80(1, 0x3FFC, LIT64(0xAAAAAAAAAAAAAA99)); + fp1 =3D floatx80_add(fp1, fp4, status); /* A1+T(A3+T(A5+TA7)) = */ + fp1 =3D floatx80_add(fp1, fp2, + status); /* [A1+T(A3+T(A5+TA7))]+ + * [S(A2+T(A4+TA6))] + */ + + x =3D packFloatx80(xSign, xExp, xSig); + fp0 =3D floatx80_mul(fp0, x, status); /* R'*S */ + fp0 =3D floatx80_mul(fp0, fp1, status); /* SIN(R')-R' */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, x, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index c5ac54d87b..e8ccf69ba8 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -35,4 +35,5 @@ floatx80 floatx80_etox(floatx80 a, float_status *status); floatx80 floatx80_twotox(floatx80 a, float_status *status); floatx80 floatx80_tentox(floatx80 a, float_status *status); floatx80 floatx80_tan(floatx80 a, float_status *status); +floatx80 floatx80_sin(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index af8cdc2580..05ab75e43f 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5057,6 +5057,9 @@ DISAS_INSN(fpu) case 0x06: /* flognp1 */ gen_helper_flognp1(cpu_env, cpu_dest, cpu_src); break; + case 0x0e: /* fsin */ + gen_helper_fsin(cpu_env, cpu_dest, cpu_src); + break; case 0x0f: /* ftan */ gen_helper_ftan(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886806204596.4545482094807; Mon, 12 Mar 2018 13:33:26 -0700 (PDT) Received: from localhost ([::1]:34514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU8L-00012o-BA for importer@patchew.org; Mon, 12 Mar 2018 16:33:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3L-0005T3-W4 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 1evU3I-0005pN-M9 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:15 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:58591) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3I-0005jD-9g for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:12 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MaG7g-1fFDp7245I-00Jvdn; Mon, 12 Mar 2018 21:27:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:20 +0100 Message-Id: <20180312202728.23790-4-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:XTtkFI3hpDFCLutmSjJ2F40qPN3g8Iv3NGZFHQT2vokvryseW6s ojIhF1TOp95AGtmAurZrFlAo3CbWhn90LlKQEomSjV5LUEXWD+yVhJd8guCisBuia+oWBxN 4EzwGsJFW+kfYLKO4DgS85r5TKIMbmQTRq+9M4ZkH43iChPIDrKrUp4tn+DHtNFGB4yewro sGWWtHPKmaZKvzn0V2S4A== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZvGs1RRtsUo=:k8bPKB0VXeQMFgEUE3W1gB KTUxTq0umxjQugFl9ETWoJjXuy/vsV0MiZKJOjIiFfXQLBF8phVEhdWpgOp1UdBiXdB7MNK0D uhXjqI1bRaE0za5prwo/h7fLdGL9TjRGyaXJu2Y2V4wKDnuUSpqOtPnO2gp6wPpHXbHHKfBgB MXW9Jp4f0WkUxctT88AZvaBMqLz5bj08/pkHqiSnLDSALRuY2jao5iEiXCijx8CaArOIgYxPG 38SFYQP3fmxN6IXE1W3KTqUS8cKb/ae6Wu3Mk+J311lpMQA0x066+BcgMpiXpGAX3JHVeJ0Mi sAjp7agxUqKxXdgEXayHfZgE1ZWJV1ipOPSwJEK8pPZB0BIbSCG4tQHIaga2oIbQ+pImSeBte KyNDe0srwEWrr6sM1MvepUOJGQrt26LThmZDrrbVejGcMc7eLkYd2DN61O8KgJXRdJ5FcegqT VGpn6A2R+rRJHI14pmt1AGtzlDGktK7YdGdxRqEHpeB3/G5AhB3CltXIpR7GIADc/ch3DOvTZ isB42ss/MvSA+QLdouaXeRZIR1dPsGxrcAktZgRm919lQ41xX7i/5aedKxlzejzPLy5i9Li5t JC68zvwCIGqeNmNcLpmEAv1wH4alyJP2qYl7hGvXZ5ZxziVE5aPokqat1cLY5/2EyelpsXJ2V 0fvwLsrYM5FHaCoccKgiYgDs7Kb/ZgniGmL/jpvlTjyN49p8RB5jXC6YUA79QiqdCrpfxo7p7 i2JIQhaWMvNZvkTSU4lty6ryjhYpog3cjUa7IA== 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 03/11] target/m68k: implement fcos 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_cos() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 + target/m68k/helper.h | 1 + target/m68k/softfloat.c | 244 +++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 + 5 files changed, 254 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index a6cfb4db1a..71df19c685 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -602,3 +602,8 @@ void HELPER(fsin)(CPUM68KState *env, FPReg *res, FPReg = *val) { res->d =3D floatx80_sin(val->d, &env->fp_status); } + +void HELPER(fcos)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_cos(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 6d8bfaab64..767baf75a3 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -77,6 +77,7 @@ DEF_HELPER_3(ftwotox, void, env, fp, fp) DEF_HELPER_3(ftentox, void, env, fp, fp) DEF_HELPER_3(ftan, void, env, fp, fp) DEF_HELPER_3(fsin, void, env, fp, fp) +DEF_HELPER_3(fcos, void, env, fp, fp) =20 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 6fb9665336..a3a12a0bcb 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -1723,3 +1723,247 @@ floatx80 floatx80_sin(floatx80 a, float_status *sta= tus) } } } + +/*------------------------------------------------------------------------= ---- + | Cosine + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_cos(floatx80 a, float_status *status) +{ + flag aSign, xSign; + int32_t aExp, xExp; + uint64_t aSig, xSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact, l, n, j; + floatx80 fp0, fp1, fp2, fp3, fp4, fp5, x, invtwopi, twopi1, twopi2; + float32 posneg1, twoto63; + flag adjn, endflag; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(0, one_exp, one_sig); + } + + adjn =3D 1; + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + fp0 =3D a; + + if (compact < 0x3FD78000 || compact > 0x4004BC7E) { + /* 2^(-40) > |X| > 15 PI */ + if (compact > 0x3FFF8000) { /* |X| >=3D 15 PI */ + /* REDUCEX */ + fp1 =3D packFloatx80(0, 0, 0); + if (compact =3D=3D 0x7FFEFFFF) { + twopi1 =3D packFloatx80(aSign ^ 1, 0x7FFE, + LIT64(0xC90FDAA200000000)); + twopi2 =3D packFloatx80(aSign ^ 1, 0x7FDC, + LIT64(0x85A308D300000000)); + fp0 =3D floatx80_add(fp0, twopi1, status); + fp1 =3D fp0; + fp0 =3D floatx80_add(fp0, twopi2, status); + fp1 =3D floatx80_sub(fp1, fp0, status); + fp1 =3D floatx80_add(fp1, twopi2, status); + } + loop: + xSign =3D extractFloatx80Sign(fp0); + xExp =3D extractFloatx80Exp(fp0); + xExp -=3D 0x3FFF; + if (xExp <=3D 28) { + l =3D 0; + endflag =3D 1; + } else { + l =3D xExp - 27; + endflag =3D 0; + } + invtwopi =3D packFloatx80(0, 0x3FFE - l, + LIT64(0xA2F9836E4E44152A)); /* INVTWOP= I */ + twopi1 =3D packFloatx80(0, 0x3FFF + l, LIT64(0xC90FDAA20000000= 0)); + twopi2 =3D packFloatx80(0, 0x3FDD + l, LIT64(0x85A308D30000000= 0)); + + /* SIGN(INARG)*2^63 IN SGL */ + twoto63 =3D packFloat32(xSign, 0xBE, 0); + + fp2 =3D floatx80_mul(fp0, invtwopi, status); + fp2 =3D floatx80_add(fp2, float32_to_floatx80(twoto63, status), + status); /* THE FRACT PART OF FP2 IS ROUNDE= D */ + fp2 =3D floatx80_sub(fp2, float32_to_floatx80(twoto63, status), + status); /* FP2 is N */ + fp4 =3D floatx80_mul(twopi1, fp2, status); /* W =3D N*P1 */ + fp5 =3D floatx80_mul(twopi2, fp2, status); /* w =3D N*P2 */ + fp3 =3D floatx80_add(fp4, fp5, status); /* FP3 is P */ + fp4 =3D floatx80_sub(fp4, fp3, status); /* W-P */ + fp0 =3D floatx80_sub(fp0, fp3, status); /* FP0 is A :=3D R - P= */ + fp4 =3D floatx80_add(fp4, fp5, status); /* FP4 is p =3D (W-P)+= w */ + fp3 =3D fp0; /* FP3 is A */ + fp1 =3D floatx80_sub(fp1, fp4, status); /* FP1 is a :=3D r - p= */ + fp0 =3D floatx80_add(fp0, fp1, status); /* FP0 is R :=3D A+a */ + + if (endflag > 0) { + n =3D floatx80_to_int32(fp2, status); + goto sincont; + } + fp3 =3D floatx80_sub(fp3, fp0, status); /* A-R */ + fp1 =3D floatx80_add(fp1, fp3, status); /* FP1 is r :=3D (A-R)= +a */ + goto loop; + } else { + /* SINSM */ + fp0 =3D float32_to_floatx80(make_float32(0x3F800000), status);= /* 1 */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + if (adjn) { + /* COSTINY */ + a =3D floatx80_sub(fp0, float32_to_floatx80( + make_float32(0x00800000), status), + status); + } else { + /* SINTINY */ + a =3D floatx80_move(a, status); + } + float_raise(float_flag_inexact, status); + + return a; + } + } else { + fp1 =3D floatx80_mul(fp0, float64_to_floatx80( + make_float64(0x3FE45F306DC9C883), status), + status); /* X*2/PI */ + + n =3D floatx80_to_int32(fp1, status); + j =3D 32 + n; + + fp0 =3D floatx80_sub(fp0, pi_tbl[j], status); /* X-Y1 */ + fp0 =3D floatx80_sub(fp0, float32_to_floatx80(pi_tbl2[j], status), + status); /* FP0 IS R =3D (X-Y1)-Y2 */ + + sincont: + if ((n + adjn) & 1) { + /* COSPOLY */ + fp0 =3D floatx80_mul(fp0, fp0, status); /* FP0 IS S */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* FP1 IS T */ + fp2 =3D float64_to_floatx80(make_float64(0x3D2AC4D0D6011EE3), + status); /* B8 */ + fp3 =3D float64_to_floatx80(make_float64(0xBDA9396F9F45AC19), + status); /* B7 */ + + xSign =3D extractFloatx80Sign(fp0); /* X IS S */ + xExp =3D extractFloatx80Exp(fp0); + xSig =3D extractFloatx80Frac(fp0); + + if (((n + adjn) >> 1) & 1) { + xSign ^=3D 1; + posneg1 =3D make_float32(0xBF800000); /* -1 */ + } else { + xSign ^=3D 0; + posneg1 =3D make_float32(0x3F800000); /* 1 */ + } /* X IS NOW R'=3D SGN*R */ + + fp2 =3D floatx80_mul(fp2, fp1, status); /* TB8 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* TB7 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3E21EED90612C972), status), + status); /* B6+TB8 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBE927E4FB79D9FCF), status), + status); /* B5+TB7 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(B6+TB8) */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T(B5+TB7) */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3EFA01A01A01D423), status), + status); /* B4+T(B6+TB8) */ + fp4 =3D packFloatx80(1, 0x3FF5, LIT64(0xB60B60B60B61D438)); + fp3 =3D floatx80_add(fp3, fp4, status); /* B3+T(B5+TB7) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(B4+T(B6+TB8)) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* T(B3+T(B5+TB7)) */ + fp4 =3D packFloatx80(0, 0x3FFA, LIT64(0xAAAAAAAAAAAAAB5E)); + fp2 =3D floatx80_add(fp2, fp4, status); /* B2+T(B4+T(B6+TB8)) = */ + fp1 =3D floatx80_add(fp1, float32_to_floatx80( + make_float32(0xBF000000), status), + status); /* B1+T(B3+T(B5+TB7)) */ + fp0 =3D floatx80_mul(fp0, fp2, status); /* S(B2+T(B4+T(B6+TB8)= )) */ + fp0 =3D floatx80_add(fp0, fp1, status); + /* [B1+T(B3+T(B5+TB7))]+[S(B2+T(B4+T(B6+TB8)= ))] */ + + x =3D packFloatx80(xSign, xExp, xSig); + fp0 =3D floatx80_mul(fp0, x, status); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, float32_to_floatx80(posneg1, status), = status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + /* SINPOLY */ + xSign =3D extractFloatx80Sign(fp0); /* X IS R */ + xExp =3D extractFloatx80Exp(fp0); + xSig =3D extractFloatx80Frac(fp0); + + xSign ^=3D ((n + adjn) >> 1) & 1; /* X IS NOW R'=3D SGN*R */ + + fp0 =3D floatx80_mul(fp0, fp0, status); /* FP0 IS S */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* FP1 IS T */ + fp3 =3D float64_to_floatx80(make_float64(0xBD6AAA77CCC994F5), + status); /* A7 */ + fp2 =3D float64_to_floatx80(make_float64(0x3DE612097AAE8DA1), + status); /* A6 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T*A7 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T*A6 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBE5AE6452A118AE4), status), + status); /* A5+T*A7 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3EC71DE3A5341531), status), + status); /* A4+T*A6 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* T(A5+TA7) */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* T(A4+TA6) */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBF2A01A01A018B59), status), + status); /* A3+T(A5+TA7) */ + fp4 =3D packFloatx80(0, 0x3FF8, LIT64(0x88888888888859AF)); + fp2 =3D floatx80_add(fp2, fp4, status); /* A2+T(A4+TA6) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* T(A3+T(A5+TA7)) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* S(A2+T(A4+TA6)) */ + fp4 =3D packFloatx80(1, 0x3FFC, LIT64(0xAAAAAAAAAAAAAA99)); + fp1 =3D floatx80_add(fp1, fp4, status); /* A1+T(A3+T(A5+TA7)) = */ + fp1 =3D floatx80_add(fp1, fp2, status); + /* [A1+T(A3+T(A5+TA7))]+[S(A2+T(A4+TA6= ))] */ + + x =3D packFloatx80(xSign, xExp, xSig); + fp0 =3D floatx80_mul(fp0, x, status); /* R'*S */ + fp0 =3D floatx80_mul(fp0, fp1, status); /* SIN(R')-R' */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, x, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index e8ccf69ba8..4fd5b2c609 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -36,4 +36,5 @@ floatx80 floatx80_twotox(floatx80 a, float_status *status= ); floatx80 floatx80_tentox(floatx80 a, float_status *status); floatx80 floatx80_tan(floatx80 a, float_status *status); floatx80 floatx80_sin(floatx80 a, float_status *status); +floatx80 floatx80_cos(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 05ab75e43f..f47388da4b 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5099,6 +5099,9 @@ DISAS_INSN(fpu) case 0x5e: /* fdneg */ gen_helper_fdneg(cpu_env, cpu_dest, cpu_src); break; + case 0x1d: /* fcos */ + gen_helper_fcos(cpu_env, cpu_dest, cpu_src); + break; case 0x1e: /* fgetexp */ gen_helper_fgetexp(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886793963189.77089878787183; Mon, 12 Mar 2018 13:33:13 -0700 (PDT) Received: from localhost ([::1]:34513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU89-0000t3-6E for importer@patchew.org; Mon, 12 Mar 2018 16:33:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3Z-0005fU-Cf for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3W-0006rn-2Q for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:29 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57035) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3V-0006mA-P3 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lr6Jj-1eQHxt27lb-00eazU; Mon, 12 Mar 2018 21:27:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:21 +0100 Message-Id: <20180312202728.23790-5-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:Zl/vAlpFxhWJvoCxxU4Q2oa6/j66vfnS3PqPAw5kx6sG+m2RQ1W DIGZoevSJfH9rOF8LQSrhCZ9H+rfwY1VOKprenYefVtJVzzXRMbqHWwgD36RoK0YRd0J/El 9ZhrTcQL8qZAdzpeUmqCCLnGU9rpBZvf4jRmqa81HovMVMQ16SxQ7kW8zQqZ0wxZ6OtidCu FhkQW3/pHRUwIokwY0iTQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:ztEOLAu6Zps=:v4AIzRvDEu7+Dg8O1X8q/K 59M1Tl6ZEqeRbuHwnjCya4EgaPXLzloQJeZfq/3jE5K8vb3rfKnaklXRM7moTr3oqao8Hsm5b XZ/exY4eW71t2qoGkr41uRTmLsUBJ3QDyp0b9KpEtjcfm0hUuH9i0wcAh2JszJuy/aHMpBnPk P29vkj/oDmOiXHs0NnfKRcxN0pgXkmdlLAk4JH6CFRdEE/bNdnejx/SQl/fGMizLf2AOSy/48 2cdOWgkcQXLjq47RxDr5q8acGvvDqkJaDISC0TjTqJWjmMxoGPaND3DZmzG0SXtYtLitGNDSd cnTOaSdigOn5XSzLOZ+E3ESWZTLdIce3sCrCAdHaoZAZ4wAYRZep4MNeJYJD9hYnJcNvMYhTr +A7/A4AFm0XSUnonV8SxcceTm/Ha6Sax9iA7kFBipOpeVqqc05/PpsVAw60LGiUEkvFHr/hvx evgv56bOkwQEa8vskPU9oC6dlU0RSz+TmVJ5m8Ew1s0ZnzbX5k2BUATSydLwyHsstSmhXSc9g qH8GZ+KpFdYmHqwvmua5/JY+eYfGVzwEI5z4Aaj20ixNVETF/Yj0Tya0IQNHaMGJoCPPQZR6z uX3uu7akBUjUiSqO0XQnVAXQ3MN75hbmTm3z85FXiIrY0Z4lW3bn99JikNfGHJAdYuo6scjWC tjLVkYKYDlJv1hZHG/NBMM+Sc07M/jMPnKYz6ojbKB5lt5b5nb9zibOPz1dMd7wQ8kHh1Nou7 +p4pwZlh/i3EiZAUoxA9U9iB5rjp9BUkzZIsjA== 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 04/11] target/m68k: implement fsincos 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" using floatx80_sin() and floatx80_cos() Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 11 +++++++++++ target/m68k/helper.h | 1 + target/m68k/translate.c | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 71df19c685..36e34d42a8 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -607,3 +607,14 @@ void HELPER(fcos)(CPUM68KState *env, FPReg *res, FPReg= *val) { res->d =3D floatx80_cos(val->d, &env->fp_status); } + +void HELPER(fsincos)(CPUM68KState *env, FPReg *res0, FPReg *res1, FPReg *v= al) +{ + floatx80 a =3D val->d; + /* If res0 and res1 specify the same floating-point data register, + * the sine result is stored in the register, and the cosine + * result is discarded. + */ + res1->d =3D floatx80_cos(a, &env->fp_status); + res0->d =3D floatx80_sin(a, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 767baf75a3..a168ffbaea 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -78,6 +78,7 @@ DEF_HELPER_3(ftentox, void, env, fp, fp) DEF_HELPER_3(ftan, void, env, fp, fp) DEF_HELPER_3(fsin, void, env, fp, fp) DEF_HELPER_3(fcos, void, env, fp, fp) +DEF_HELPER_4(fsincos, void, env, fp, fp, fp) =20 DEF_HELPER_3(mac_move, void, env, i32, i32) DEF_HELPER_3(macmulf, i64, env, i32, i32) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index f47388da4b..a78edd8825 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5159,6 +5159,14 @@ DISAS_INSN(fpu) case 0x6c: /* fdsub */ gen_helper_fdsub(cpu_env, cpu_dest, cpu_src, cpu_dest); break; + case 0x30: case 0x31: case 0x32: + case 0x33: case 0x34: case 0x35: + case 0x36: case 0x37: { + TCGv_ptr cpu_dest2 =3D gen_fp_ptr(REG(ext, 0)); + gen_helper_fsincos(cpu_env, cpu_dest, cpu_dest2, cpu_src); + tcg_temp_free_ptr(cpu_dest2); + } + break; case 0x38: /* fcmp */ gen_helper_fcmp(cpu_env, cpu_src, cpu_dest); return; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886941588604.1828774945456; Mon, 12 Mar 2018 13:35:41 -0700 (PDT) Received: from localhost ([::1]:34529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUAU-0003B0-Sh for importer@patchew.org; Mon, 12 Mar 2018 16:35:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3b-0005kb-Bv for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3Y-00071n-V4 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:31 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:54113) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3Y-0006yA-H8 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:28 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M21V9-1efbtE0Scd-00u5bY; Mon, 12 Mar 2018 21:27:51 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:22 +0100 Message-Id: <20180312202728.23790-6-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:I5597U3EdkqY+qsvWGwbFVlL0Gev8rja2265qoBdxg3S6m+LpRu p6/pIMGiuYbfcCp2epUkaO2+8tR+hmcOo+HC9rxdpgMCife02Kmesb1IrXLDaAKToz8jsyZ 2qlMrvMgUDw9rJGTvFBHeMZJ/yFJnARAUrSGS1Fw1mBNauB3TEABH+yBgDDQmteRp6p+kxx MBdS7HLj2rH7QkKvdq55Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:CJQE+ZTtkv8=:o08FyfSogFmgvdGC4wmJra vq2Kb6if2MwuA0VKjqvUYiiPGJV3aKhBOtB749z1fId16decSJxg2pbq/THePKes+rWotrjN2 45Hdj5uASqN+lY4eRT+pmKERq0f9L3AcFtz4nUKrL0XwQyqyvbEGFEaWTcjAg1qudmEDyBAuk K8a/lStc/ey1Z1o5PdccCr51JeDmY7X96Ily+VxCgXx5w8Iu5ac3LiKFwK3s6aHUkkLOkiGxj mBmIKa5VzIUzb1+v9vSNpoOPYzTh74F4EwVDGniMJ202+TwWvHcwapBloOnpz56Mczp8yiAKA FKjKM8gGODAz5xybS83DnfhypZ3wj6ZD/hj4K9mMp77bOd2pp3ix+2zdElY5yfIKh6+K+DbHm pBIiL2Z+/fvdZC17DuxkAtWQbIc5WHt3PySnASxyw4iShe3SIgCuQy3O2X1gsCI7egg0l29re kEX2rqqOEFuUwjCcVC61gEIu4UwT8E+Qh6ALKlnSFBONtipsXyz7V/PBUtq+paOSmZs85Wl4P ZgjEbBOCHuSMGuPyZUF9jlX2Cg02P1GD+2HgFOZcQVriiBz5o8TOXvHuf4NTHeRVLL1/+EM9L xjF1uYYff+WTYLt72o8WytkGS47tfGiLVPpBj6uhtoZC5id17R4e9R6AZl8H7RjII1kyoZhrZ I8Ai96Yv5LwvDK9Pjku2bbWAMPGJEO60GbNmkKfLer70imSmBLlpaEEp2t+qMMl2CgZgL8R+D s81qRvlt2LNBGWJphfic4tNBYFlN47+8iSHypg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 05/11] target/m68k: implement fatan 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_atan() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 + target/m68k/helper.h | 1 + target/m68k/softfloat.c | 200 ++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/softfloat_fpsp_tables.h | 131 +++++++++++++++++++++++ target/m68k/translate.c | 3 + 6 files changed, 341 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 36e34d42a8..47328490ee 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -618,3 +618,8 @@ void HELPER(fsincos)(CPUM68KState *env, FPReg *res0, FP= Reg *res1, FPReg *val) res1->d =3D floatx80_cos(a, &env->fp_status); res0->d =3D floatx80_sin(a, &env->fp_status); } + +void HELPER(fatan)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_atan(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index a168ffbaea..304569e997 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -79,6 +79,7 @@ DEF_HELPER_3(ftan, void, env, fp, fp) DEF_HELPER_3(fsin, void, env, fp, fp) 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) =20 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 a3a12a0bcb..00ac9a1e0a 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -23,6 +23,9 @@ #include "fpu/softfloat-macros.h" #include "softfloat_fpsp_tables.h" =20 +#define piby2_exp 0x3FFF +#define pi_sig LIT64(0xc90fdaa22168c235) + static floatx80 propagateFloatx80NaNOneArg(floatx80 a, float_status *statu= s) { if (floatx80_is_signaling_nan(a, status)) { @@ -1967,3 +1970,200 @@ floatx80 floatx80_cos(floatx80 a, float_status *sta= tus) } } } + +/*------------------------------------------------------------------------= ---- + | Arc tangent + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_atan(floatx80 a, float_status *status) +{ + flag aSign; + int32_t aExp; + uint64_t aSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact, tbl_index; + floatx80 fp0, fp1, fp2, fp3, xsave; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + a =3D packFloatx80(aSign, piby2_exp, pi_sig); + float_raise(float_flag_inexact, status); + return floatx80_move(a, status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + compact =3D floatx80_make_compact(aExp, aSig); + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + if (compact < 0x3FFB8000 || compact > 0x4002FFFF) { + /* |X| >=3D 16 or |X| < 1/16 */ + if (compact > 0x3FFF8000) { /* |X| >=3D 16 */ + if (compact > 0x40638000) { /* |X| > 2^(100) */ + fp0 =3D packFloatx80(aSign, piby2_exp, pi_sig); + fp1 =3D packFloatx80(aSign, 0x0001, one_sig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_sub(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + fp0 =3D a; + fp1 =3D packFloatx80(1, one_exp, one_sig); /* -1 */ + fp1 =3D floatx80_div(fp1, fp0, status); /* X' =3D -1/X */ + xsave =3D fp1; + fp0 =3D floatx80_mul(fp1, fp1, status); /* Y =3D X'*X' */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* Z =3D Y*Y */ + fp3 =3D float64_to_floatx80(make_float64(0xBFB70BF398539E6= A), + status); /* C5 */ + fp2 =3D float64_to_floatx80(make_float64(0x3FBC7187962D1D7= D), + status); /* C4 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* Z*C5 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* Z*C4 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBFC24924827107B8), statu= s), + status); /* C3+Z*C5 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3FC999999996263E), statu= s), + status); /* C2+Z*C4 */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* Z*(C3+Z*C5) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* Y*(C2+Z*C4) */ + fp1 =3D floatx80_add(fp1, float64_to_floatx80( + make_float64(0xBFD5555555555536), statu= s), + status); /* C1+Z*(C3+Z*C5) */ + fp0 =3D floatx80_mul(fp0, xsave, status); /* X'*Y */ + /* [Y*(C2+Z*C4)]+[C1+Z*(C3+Z*C5)] */ + fp1 =3D floatx80_add(fp1, fp2, status); + /* X'*Y*([B1+Z*(B3+Z*B5)]+[Y*(B2+Z*(B4+Z*B6))]) ?? */ + fp0 =3D floatx80_mul(fp0, fp1, status); + fp0 =3D floatx80_add(fp0, xsave, status); + fp1 =3D packFloatx80(aSign, piby2_exp, pi_sig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } else { /* |X| < 1/16 */ + if (compact < 0x3FD78000) { /* |X| < 2^(-40) */ + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_move(a, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + fp0 =3D a; + xsave =3D a; + fp0 =3D floatx80_mul(fp0, fp0, status); /* Y =3D X*X */ + fp1 =3D floatx80_mul(fp0, fp0, status); /* Z =3D Y*Y */ + fp2 =3D float64_to_floatx80(make_float64(0x3FB344447F87698= 9), + status); /* B6 */ + fp3 =3D float64_to_floatx80(make_float64(0xBFB744EE7FAF45D= B), + status); /* B5 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* Z*B6 */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* Z*B5 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3FBC71C646940220), statu= s), + status); /* B4+Z*B6 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0xBFC24924921872F9), + status), status); /* B3+Z*B5 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* Z*(B4+Z*B6) */ + fp1 =3D floatx80_mul(fp1, fp3, status); /* Z*(B3+Z*B5) */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3FC9999999998FA9), statu= s), + status); /* B2+Z*(B4+Z*B6) */ + fp1 =3D floatx80_add(fp1, float64_to_floatx80( + make_float64(0xBFD5555555555555), statu= s), + status); /* B1+Z*(B3+Z*B5) */ + fp2 =3D floatx80_mul(fp2, fp0, status); /* Y*(B2+Z*(B4+Z*B= 6)) */ + fp0 =3D floatx80_mul(fp0, xsave, status); /* X*Y */ + /* [B1+Z*(B3+Z*B5)]+[Y*(B2+Z*(B4+Z*B6))] */ + fp1 =3D floatx80_add(fp1, fp2, status); + /* X*Y*([B1+Z*(B3+Z*B5)]+[Y*(B2+Z*(B4+Z*B6))]) */ + fp0 =3D floatx80_mul(fp0, fp1, status); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, xsave, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } + } else { + aSig &=3D LIT64(0xF800000000000000); + aSig |=3D LIT64(0x0400000000000000); + xsave =3D packFloatx80(aSign, aExp, aSig); /* F */ + fp0 =3D a; + fp1 =3D a; /* X */ + fp2 =3D packFloatx80(0, one_exp, one_sig); /* 1 */ + fp1 =3D floatx80_mul(fp1, xsave, status); /* X*F */ + fp0 =3D floatx80_sub(fp0, xsave, status); /* X-F */ + fp1 =3D floatx80_add(fp1, fp2, status); /* 1 + X*F */ + fp0 =3D floatx80_div(fp0, fp1, status); /* U =3D (X-F)/(1+X*F) */ + + tbl_index =3D compact; + + tbl_index &=3D 0x7FFF0000; + tbl_index -=3D 0x3FFB0000; + tbl_index >>=3D 1; + tbl_index +=3D compact & 0x00007800; + tbl_index >>=3D 11; + + fp3 =3D atan_tbl[tbl_index]; + + fp3.high |=3D aSign ? 0x8000 : 0; /* ATAN(F) */ + + fp1 =3D floatx80_mul(fp0, fp0, status); /* V =3D U*U */ + fp2 =3D float64_to_floatx80(make_float64(0xBFF6687E314987D8), + status); /* A3 */ + fp2 =3D floatx80_add(fp2, fp1, status); /* A3+V */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* V*(A3+V) */ + fp1 =3D floatx80_mul(fp1, fp0, status); /* U*V */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x4002AC6934A26DB3), status), + status); /* A2+V*(A3+V) */ + fp1 =3D floatx80_mul(fp1, float64_to_floatx80( + make_float64(0xBFC2476F4E1DA28E), status), + status); /* A1+U*V */ + fp1 =3D floatx80_mul(fp1, fp2, status); /* A1*U*V*(A2+V*(A3+V)) */ + fp0 =3D floatx80_add(fp0, fp1, status); /* ATAN(U) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, fp3, status); /* ATAN(X) */ + + float_raise(float_flag_inexact, status); + + return a; + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index 4fd5b2c609..eec45f3ffe 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -37,4 +37,5 @@ floatx80 floatx80_tentox(floatx80 a, float_status *status= ); floatx80 floatx80_tan(floatx80 a, float_status *status); floatx80 floatx80_sin(floatx80 a, float_status *status); floatx80 floatx80_cos(floatx80 a, float_status *status); +floatx80 floatx80_atan(floatx80 a, float_status *status); #endif diff --git a/target/m68k/softfloat_fpsp_tables.h b/target/m68k/softfloat_fp= sp_tables.h index a9c86a5af2..3f1419ee6e 100644 --- a/target/m68k/softfloat_fpsp_tables.h +++ b/target/m68k/softfloat_fpsp_tables.h @@ -507,4 +507,135 @@ static const float32 pi_tbl2[65] =3D { const_float32(0x20D00000), const_float32(0xA1800000), }; + +static const floatx80 atan_tbl[128] =3D { + make_floatx80_init(0x3FFB, 0x83D152C5060B7A51), + make_floatx80_init(0x3FFB, 0x8BC8544565498B8B), + make_floatx80_init(0x3FFB, 0x93BE406017626B0D), + make_floatx80_init(0x3FFB, 0x9BB3078D35AEC202), + make_floatx80_init(0x3FFB, 0xA3A69A525DDCE7DE), + make_floatx80_init(0x3FFB, 0xAB98E94362765619), + make_floatx80_init(0x3FFB, 0xB389E502F9C59862), + make_floatx80_init(0x3FFB, 0xBB797E436B09E6FB), + make_floatx80_init(0x3FFB, 0xC367A5C739E5F446), + make_floatx80_init(0x3FFB, 0xCB544C61CFF7D5C6), + make_floatx80_init(0x3FFB, 0xD33F62F82488533E), + make_floatx80_init(0x3FFB, 0xDB28DA8162404C77), + make_floatx80_init(0x3FFB, 0xE310A4078AD34F18), + make_floatx80_init(0x3FFB, 0xEAF6B0A8188EE1EB), + make_floatx80_init(0x3FFB, 0xF2DAF1949DBE79D5), + make_floatx80_init(0x3FFB, 0xFABD581361D47E3E), + make_floatx80_init(0x3FFC, 0x8346AC210959ECC4), + make_floatx80_init(0x3FFC, 0x8B232A08304282D8), + make_floatx80_init(0x3FFC, 0x92FB70B8D29AE2F9), + make_floatx80_init(0x3FFC, 0x9ACF476F5CCD1CB4), + make_floatx80_init(0x3FFC, 0xA29E76304954F23F), + make_floatx80_init(0x3FFC, 0xAA68C5D08AB85230), + make_floatx80_init(0x3FFC, 0xB22DFFFD9D539F83), + make_floatx80_init(0x3FFC, 0xB9EDEF453E900EA5), + make_floatx80_init(0x3FFC, 0xC1A85F1CC75E3EA5), + make_floatx80_init(0x3FFC, 0xC95D1BE828138DE6), + make_floatx80_init(0x3FFC, 0xD10BF300840D2DE4), + make_floatx80_init(0x3FFC, 0xD8B4B2BA6BC05E7A), + make_floatx80_init(0x3FFC, 0xE0572A6BB42335F6), + make_floatx80_init(0x3FFC, 0xE7F32A70EA9CAA8F), + make_floatx80_init(0x3FFC, 0xEF88843264ECEFAA), + make_floatx80_init(0x3FFC, 0xF7170A28ECC06666), + make_floatx80_init(0x3FFD, 0x812FD288332DAD32), + make_floatx80_init(0x3FFD, 0x88A8D1B1218E4D64), + make_floatx80_init(0x3FFD, 0x9012AB3F23E4AEE8), + make_floatx80_init(0x3FFD, 0x976CC3D411E7F1B9), + make_floatx80_init(0x3FFD, 0x9EB689493889A227), + make_floatx80_init(0x3FFD, 0xA5EF72C34487361B), + make_floatx80_init(0x3FFD, 0xAD1700BAF07A7227), + make_floatx80_init(0x3FFD, 0xB42CBCFAFD37EFB7), + make_floatx80_init(0x3FFD, 0xBB303A940BA80F89), + make_floatx80_init(0x3FFD, 0xC22115C6FCAEBBAF), + make_floatx80_init(0x3FFD, 0xC8FEF3E686331221), + make_floatx80_init(0x3FFD, 0xCFC98330B4000C70), + make_floatx80_init(0x3FFD, 0xD6807AA1102C5BF9), + make_floatx80_init(0x3FFD, 0xDD2399BC31252AA3), + make_floatx80_init(0x3FFD, 0xE3B2A8556B8FC517), + make_floatx80_init(0x3FFD, 0xEA2D764F64315989), + make_floatx80_init(0x3FFD, 0xF3BF5BF8BAD1A21D), + make_floatx80_init(0x3FFE, 0x801CE39E0D205C9A), + make_floatx80_init(0x3FFE, 0x8630A2DADA1ED066), + make_floatx80_init(0x3FFE, 0x8C1AD445F3E09B8C), + make_floatx80_init(0x3FFE, 0x91DB8F1664F350E2), + make_floatx80_init(0x3FFE, 0x97731420365E538C), + make_floatx80_init(0x3FFE, 0x9CE1C8E6A0B8CDBA), + make_floatx80_init(0x3FFE, 0xA22832DBCADAAE09), + make_floatx80_init(0x3FFE, 0xA746F2DDB7602294), + make_floatx80_init(0x3FFE, 0xAC3EC0FB997DD6A2), + make_floatx80_init(0x3FFE, 0xB110688AEBDC6F6A), + make_floatx80_init(0x3FFE, 0xB5BCC49059ECC4B0), + make_floatx80_init(0x3FFE, 0xBA44BC7DD470782F), + make_floatx80_init(0x3FFE, 0xBEA94144FD049AAC), + make_floatx80_init(0x3FFE, 0xC2EB4ABB661628B6), + make_floatx80_init(0x3FFE, 0xC70BD54CE602EE14), + make_floatx80_init(0x3FFE, 0xCD000549ADEC7159), + make_floatx80_init(0x3FFE, 0xD48457D2D8EA4EA3), + make_floatx80_init(0x3FFE, 0xDB948DA712DECE3B), + make_floatx80_init(0x3FFE, 0xE23855F969E8096A), + make_floatx80_init(0x3FFE, 0xE8771129C4353259), + make_floatx80_init(0x3FFE, 0xEE57C16E0D379C0D), + make_floatx80_init(0x3FFE, 0xF3E10211A87C3779), + make_floatx80_init(0x3FFE, 0xF919039D758B8D41), + make_floatx80_init(0x3FFE, 0xFE058B8F64935FB3), + make_floatx80_init(0x3FFF, 0x8155FB497B685D04), + make_floatx80_init(0x3FFF, 0x83889E3549D108E1), + make_floatx80_init(0x3FFF, 0x859CFA76511D724B), + make_floatx80_init(0x3FFF, 0x87952ECFFF8131E7), + make_floatx80_init(0x3FFF, 0x89732FD19557641B), + make_floatx80_init(0x3FFF, 0x8B38CAD101932A35), + make_floatx80_init(0x3FFF, 0x8CE7A8D8301EE6B5), + make_floatx80_init(0x3FFF, 0x8F46A39E2EAE5281), + make_floatx80_init(0x3FFF, 0x922DA7D791888487), + make_floatx80_init(0x3FFF, 0x94D19FCBDEDF5241), + make_floatx80_init(0x3FFF, 0x973AB94419D2A08B), + make_floatx80_init(0x3FFF, 0x996FF00E08E10B96), + make_floatx80_init(0x3FFF, 0x9B773F9512321DA7), + make_floatx80_init(0x3FFF, 0x9D55CC320F935624), + make_floatx80_init(0x3FFF, 0x9F100575006CC571), + make_floatx80_init(0x3FFF, 0xA0A9C290D97CC06C), + make_floatx80_init(0x3FFF, 0xA22659EBEBC0630A), + make_floatx80_init(0x3FFF, 0xA388B4AFF6EF0EC9), + make_floatx80_init(0x3FFF, 0xA4D35F1061D292C4), + make_floatx80_init(0x3FFF, 0xA60895DCFBE3187E), + make_floatx80_init(0x3FFF, 0xA72A51DC7367BEAC), + make_floatx80_init(0x3FFF, 0xA83A51530956168F), + make_floatx80_init(0x3FFF, 0xA93A20077539546E), + make_floatx80_init(0x3FFF, 0xAA9E7245023B2605), + make_floatx80_init(0x3FFF, 0xAC4C84BA6FE4D58F), + make_floatx80_init(0x3FFF, 0xADCE4A4A606B9712), + make_floatx80_init(0x3FFF, 0xAF2A2DCD8D263C9C), + make_floatx80_init(0x3FFF, 0xB0656F81F22265C7), + make_floatx80_init(0x3FFF, 0xB18465150F71496A), + make_floatx80_init(0x3FFF, 0xB28AAA156F9ADA35), + make_floatx80_init(0x3FFF, 0xB37B44FF3766B895), + make_floatx80_init(0x3FFF, 0xB458C3DCE9630433), + make_floatx80_init(0x3FFF, 0xB525529D562246BD), + make_floatx80_init(0x3FFF, 0xB5E2CCA95F9D88CC), + make_floatx80_init(0x3FFF, 0xB692CADA7ACA1ADA), + make_floatx80_init(0x3FFF, 0xB736AEA7A6925838), + make_floatx80_init(0x3FFF, 0xB7CFAB287E9F7B36), + make_floatx80_init(0x3FFF, 0xB85ECC66CB219835), + make_floatx80_init(0x3FFF, 0xB8E4FD5A20A593DA), + make_floatx80_init(0x3FFF, 0xB99F41F64AFF9BB5), + make_floatx80_init(0x3FFF, 0xBA7F1E17842BBE7B), + make_floatx80_init(0x3FFF, 0xBB4712857637E17D), + make_floatx80_init(0x3FFF, 0xBBFABE8A4788DF6F), + make_floatx80_init(0x3FFF, 0xBC9D0FAD2B689D79), + make_floatx80_init(0x3FFF, 0xBD306A39471ECD86), + make_floatx80_init(0x3FFF, 0xBDB6C731856AF18A), + make_floatx80_init(0x3FFF, 0xBE31CAC502E80D70), + make_floatx80_init(0x3FFF, 0xBEA2D55CE33194E2), + make_floatx80_init(0x3FFF, 0xBF0B10B7C03128F0), + make_floatx80_init(0x3FFF, 0xBF6B7A18DACB778D), + make_floatx80_init(0x3FFF, 0xBFC4EA4663FA18F6), + make_floatx80_init(0x3FFF, 0xC0181BDE8B89A454), + make_floatx80_init(0x3FFF, 0xC065B066CFBF6439), + make_floatx80_init(0x3FFF, 0xC0AE345F56340AE6), + make_floatx80_init(0x3FFF, 0xC0F222919CB9E6A7) +}; #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index a78edd8825..88015e7ed8 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5057,6 +5057,9 @@ DISAS_INSN(fpu) case 0x06: /* flognp1 */ gen_helper_flognp1(cpu_env, cpu_dest, cpu_src); break; + case 0x0a: /* fatan */ + gen_helper_fatan(cpu_env, cpu_dest, cpu_src); + break; case 0x0e: /* fsin */ gen_helper_fsin(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886965009497.86659936568356; Mon, 12 Mar 2018 13:36:05 -0700 (PDT) Received: from localhost ([::1]:34534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUAu-0003Rx-1O for importer@patchew.org; Mon, 12 Mar 2018 16:36:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3Z-0005fV-Jv for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3W-0006sR-8E for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:29 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:48735) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3V-0006nV-Tv for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LtBoV-1eWmCR0WE7-012r1w; Mon, 12 Mar 2018 21:27:52 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:23 +0100 Message-Id: <20180312202728.23790-7-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:KvSlPnLBBFryvULLPdlTcNpQlPaORPh+YOHqwR0pGnQgA8+W9lP 7Em/GkNd6KGK05vJEtR6AMd0sP6D3NdOkLtUvNvlPCLZd6U+rKb6213eNcpqoN9oMAdf/o8 55e5r4Jiw87JR2GWZGIKN49Czb8Bz/4p7czXt+SLj+duxKsSq6+hG4sQsX3JZVuA1U6f2Af wOV/14O2ro7csoGkP2Kng== X-UI-Out-Filterresults: notjunk:1;V01:K0:YsZl/Nw0VYY=:39RYH36vFieFDAWz1eJa+Y Ru4XTvh64aaiJmP5q0xBpTQhIv6Ym1qtknLkIbRf2KJ2aMuhScuRJFnHrhA1IznofgT7BpZwZ n0cKYevrMUV/Huqm8SfYdo4lD+OdyiB43UgRcX41Pvedw7QZwL3YDxI30uhzWrpP3wgnRE/bM 5F7ylWuaJxFqjuyHVGTlRrtYtXwq/5GF9ctAynKO9VO+zIBQJT2SHZdhfvpA+vRmcsvE6Mr8e F+boeebBcLNF3oVV1JtHG838L5ZjOZ7xKlqexWIVPD84J8Shhwguzuvt5255pqXo0njyAcG4I qslnZN3fPNeyFWEUr5OY1qMMubNnWIvT1JdZvDHVWHvwOmmgjLbDKAUhfFtgkmuWvRbzIhZSy FUj8CodslPNMuEWAGJFCxnEnbKuIw/4PQCytmiwec1ZvEuONwBoFUcEie1Kphmw4IzEYzLnXy MnK+wqEnjQXldQdk8t0RamasK1d79j4z1MkwkE/mwNqtX0ZKodXaynFBxfOzW32s9YbWzRDVN fUzQkr70zmTl8kVWNSwOtOLYkuaferUuOgSbAvpG8aVjKgF6tf2PBSPAWYanQmwlmjXaaCijl LaqbjfY3BzhDp2pYxWO9SP6mdo2zZW9JV9IRgOezWdTGT1r7o4aFjwNfwgq9d98M0lXpP+tLP 9A7H4trPE8daaDjEp4eA6+uF+JUnbe7nxFt5ZWzFfXNPrrQFIbHK+jJX2QwftyeLFgKQBffzX v4iKTXaDIQi5MGlRrC5d9TDwq8WchnK+vAbwFQ== 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] [PATCH 06/11] target/m68k: implement fasin 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_asin() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 ++++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 65 ++++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 +++ 5 files changed, 75 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 47328490ee..972cc97d96 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -623,3 +623,8 @@ void HELPER(fatan)(CPUM68KState *env, FPReg *res, FPReg= *val) { res->d =3D floatx80_atan(val->d, &env->fp_status); } + +void HELPER(fasin)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_asin(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 304569e997..e1aca375e0 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -80,6 +80,7 @@ DEF_HELPER_3(fsin, void, env, fp, fp) 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) =20 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 00ac9a1e0a..91f0435ac3 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -2167,3 +2167,68 @@ floatx80 floatx80_atan(floatx80 a, float_status *sta= tus) return a; } } + +/*------------------------------------------------------------------------= ---- + | Arc sine + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_asin(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, one; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF && (uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact >=3D 0x3FFF8000) { /* |X| >=3D 1 */ + if (aExp =3D=3D one_exp && aSig =3D=3D one_sig) { /* |X| =3D=3D 1 = */ + float_raise(float_flag_inexact, status); + a =3D packFloatx80(aSign, piby2_exp, pi_sig); + return floatx80_move(a, status); + } else { /* |X| > 1 */ + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + + } /* |X| < 1 */ + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + one =3D packFloatx80(0, one_exp, one_sig); + fp0 =3D a; + + fp1 =3D floatx80_sub(one, fp0, status); /* 1 - X */ + fp2 =3D floatx80_add(one, fp0, status); /* 1 + X */ + fp1 =3D floatx80_mul(fp2, fp1, status); /* (1+X)*(1-X) */ + fp1 =3D floatx80_sqrt(fp1, status); /* SQRT((1+X)*(1-X)) */ + fp0 =3D floatx80_div(fp0, fp1, status); /* X/SQRT((1+X)*(1-X)) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_atan(fp0, status); /* ATAN(X/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 eec45f3ffe..ca0eb674aa 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -38,4 +38,5 @@ floatx80 floatx80_tan(floatx80 a, float_status *status); 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); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 88015e7ed8..d4169c4533 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5060,6 +5060,9 @@ DISAS_INSN(fpu) case 0x0a: /* fatan */ gen_helper_fatan(cpu_env, cpu_dest, cpu_src); break; + case 0x0c: /* fasin */ + gen_helper_fasin(cpu_env, cpu_dest, cpu_src); + break; case 0x0e: /* fsin */ gen_helper_fsin(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886620484798.3924234926623; Mon, 12 Mar 2018 13:30:20 -0700 (PDT) Received: from localhost ([::1]:34497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU5L-0006pg-Jj for importer@patchew.org; Mon, 12 Mar 2018 16:30:19 -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_acos() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- 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 =3D floatx80_asin(val->d, &env->fp_status); } + +void HELPER(facos)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D 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) =20 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" =20 +#define pi_exp 0x4000 #define piby2_exp 0x3FFF #define pi_sig LIT64(0xc90fdaa22168c235) =20 @@ -2232,3 +2233,72 @@ floatx80 floatx80_asin(floatx80 a, float_status *sta= tus) =20 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 =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF && (uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + float_raise(float_flag_inexact, status); + return roundAndPackFloatx80(status->floatx80_rounding_precision, 0, + piby2_exp, pi_sig, 0, status); + } + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact >=3D 0x3FFF8000) { /* |X| >=3D 1 */ + if (aExp =3D=3D one_exp && aSig =3D=3D one_sig) { /* |X| =3D=3D 1 = */ + if (aSign) { /* X =3D=3D -1 */ + a =3D packFloatx80(0, pi_exp, pi_sig); + float_raise(float_flag_inexact, status); + return floatx80_move(a, status); + } else { /* X =3D=3D +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 =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + one =3D packFloatx80(0, one_exp, one_sig); + fp0 =3D a; + + fp1 =3D floatx80_add(one, fp0, status); /* 1 + X */ + fp0 =3D floatx80_sub(one, fp0, status); /* 1 - X */ + fp0 =3D floatx80_div(fp0, fp1, status); /* (1-X)/(1+X) */ + fp0 =3D floatx80_sqrt(fp0, status); /* SQRT((1-X)/(1+X)) */ + fp0 =3D floatx80_atan(fp0, status); /* ATAN(SQRT((1-X)/(1+X))) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D 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; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520886921628265.00580435924655; Mon, 12 Mar 2018 13:35:21 -0700 (PDT) Received: from localhost ([::1]:34526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUAC-0002v7-Gp for importer@patchew.org; Mon, 12 Mar 2018 16:35:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3Q-0005ZS-7O for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3M-00068e-TX for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:20 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36819) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3M-00063Q-Fj for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:16 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MHttJ-1ews9k2vHR-003dfu; Mon, 12 Mar 2018 21:27:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:25 +0100 Message-Id: <20180312202728.23790-9-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:ABVUdhmM/OG5PP+HL4czs8MQRyfhiqWzU0AptHJJ9mlLCyXZ9ba tjSIiFJhYYzWkoop42mHaml5QdxTU5xPwl3IIGV18Yutv6m9EWCYs9vTVriM8HPg8QvcMLq C9YYVKoFWu6aTxP146zVLne4NS6UqyOs6XCc7ulRhQnVNgex5JptKaZQykSBSlWeR4fq/iE HtO4e/pCsyWLqK0R/6oMg== X-UI-Out-Filterresults: notjunk:1;V01:K0:DrF1lYZT3QA=:FPaWS8vU7AMUnc2LgSSBEo jVxca1BQQKc5xdckMk0xi9REzBw0DswWCJFuBMS3IODYbMiEEZtSA4LujHEL+KWDPaqO6as/L 2Og/6lX1uyiAbT+I8ItYb/5EEH9iJmhNZWlX1mDpH7kgcqLJMPXNYUE0hLfH6zAJW2ERrJyh8 pUHI+fSmAHc6g2AuLqW7z0spmSPqUEQyNnjs97cueS/1nS7SMTpdFsLe/Jopw1ztHEGc3J6Mq VbZ5xNdOJzHdxxGYDZONx9yPhpTb/xHPZWENi0D87J0ZqZ7IXj+FG8oORHGhs1b/f6FQJVpXA KA2mNKMfucgzgWVa1v2/xlwUGfZBQ9+C10A0TnzuL2IPdoYITszI0ZhZ1ZEmTEr5q48OkaCGM uAIztf0fMTlDb5+kaccTKEtoVvjH+ZPINcD1FUkw65kj5G06Cnnnw/U2Cw83Onb/uuIXZjtqq SZu+3l6yIYH/sahsTGjVV5UGT11066EMfGeiRe7sQL8+Xu7/aOj+d7OX7JkupOdbg40/5qnYq i7b1IQetanfPJcNlULHDyR/UcxwrTwTw0t8Ei6tusfUZtHn0l5RBsdMOt2m4VzXcYS+1CGyBI 8FmHqIPb35FjwxU9KH/wfrJgNS3Pwf7bcnXxshIwTeGIQHsgEuZp7qbPZGyvGt3ZpqZw6Yz5X HF6C3oy8mNFbbvTfFqjgLXyExcDY8loZR3y1P/a1e1FDSNPm7psuWs7IXiKWSCpwQdPPi5hkA 40FhwXOJD1OuoceuOBSFA19H6bzuZnzNwu93aw== 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] [PATCH 08/11] target/m68k: implement fatanh 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_atanh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 ++++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 65 ++++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 +++ 5 files changed, 75 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 18ad6999cb..38b663e1d2 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -633,3 +633,8 @@ void HELPER(facos)(CPUM68KState *env, FPReg *res, FPReg= *val) { res->d =3D floatx80_acos(val->d, &env->fp_status); } + +void HELPER(fatanh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_atanh(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 83247a8143..092baec3d5 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -82,6 +82,7 @@ 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(fatanh, void, env, fp, fp) =20 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 3d66f6946f..5ce8413e96 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -2302,3 +2302,68 @@ floatx80 floatx80_acos(floatx80 a, float_status *sta= tus) =20 return a; } + +/*------------------------------------------------------------------------= ---- + | Hyperbolic arc tangent + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_atanh(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, one; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF && (uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact >=3D 0x3FFF8000) { /* |X| >=3D 1 */ + if (aExp =3D=3D one_exp && aSig =3D=3D one_sig) { /* |X| =3D=3D 1 = */ + float_raise(float_flag_divbyzero, status); + return packFloatx80(aSign, floatx80_infinity.high, + floatx80_infinity.low); + } else { /* |X| > 1 */ + float_raise(float_flag_invalid, status); + return floatx80_default_nan(status); + } + } /* |X| < 1 */ + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + one =3D packFloatx80(0, one_exp, one_sig); + fp2 =3D packFloatx80(aSign, 0x3FFE, one_sig); /* SIGN(X) * (1/2) */ + fp0 =3D packFloatx80(0, aExp, aSig); /* Y =3D |X| */ + fp1 =3D packFloatx80(1, aExp, aSig); /* -Y */ + fp0 =3D floatx80_add(fp0, fp0, status); /* 2Y */ + fp1 =3D floatx80_add(fp1, one, status); /* 1-Y */ + fp0 =3D floatx80_div(fp0, fp1, status); /* Z =3D 2Y/(1-Y) */ + fp0 =3D floatx80_lognp1(fp0, status); /* LOG1P(Z) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_mul(fp0, fp2, + status); /* ATANH(X) =3D SIGN(X) * (1/2) * LOG1P(Z) */ + + float_raise(float_flag_inexact, status); + + return a; +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index 1140491c81..e9943aed20 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -40,4 +40,5 @@ 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); +floatx80 floatx80_atanh(floatx80 a, float_status *status); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 5fad76c785..2f7caa0ca0 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5063,6 +5063,9 @@ DISAS_INSN(fpu) case 0x0c: /* fasin */ gen_helper_fasin(cpu_env, cpu_dest, cpu_src); break; + case 0x0d: /* fatanh */ + gen_helper_fatanh(cpu_env, cpu_dest, cpu_src); + break; case 0x0e: /* fsin */ gen_helper_fsin(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520887267246148.91096767649435; Mon, 12 Mar 2018 13:41:07 -0700 (PDT) Received: from localhost ([::1]:34563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUFf-0008VU-45 for importer@patchew.org; Mon, 12 Mar 2018 16:40:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3Z-0005fX-NB for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3X-0006xG-Ji for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:29 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:47155) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3X-0006tR-57 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:27 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lsdqf-1eXKQl1nwX-012Ine; Mon, 12 Mar 2018 21:27:55 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:26 +0100 Message-Id: <20180312202728.23790-10-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:VRfuzrqxF3e17AvppFbPt7bKWhCMBxEFtET4QYeVqeTc+uAUhlZ Bq3DrcUO90AHWetUR7hpy1gHbNPtledlr04mhV5rK42Qo/l65H3vxVYiJJtdpVVbuS6Gx3t CzH8Em7Heeq59+JaAgZLmBLmpn4Tg00gYVD9ETy0X5nr7veFp+zA2Z7wlW4EG2EtFLi9lzz TwRIx+uhMYg6pjTyXDgNw== X-UI-Out-Filterresults: notjunk:1;V01:K0:7lhl9Dp8JN0=:g+c3oJ+/d0fFEGxJutU0gf CJgOE20hupOInzTqcLvO3BZipusuEtwe+vMOOj8QuPxxjxdgQrQeDvatHwFQKpq1zNMydyr9X 3BTKB/u+XCZcLivy+R1qN1jK/Me4rz6GxQJhQvXaVkR1dqOHi8m8tCcXgu0JmYP8/LgfIkxEY fyOfEsaLBKN/zHgdVb1BQagVXSnOO49siQESiEUhKRD8LDoXdYFijryfkmC46S57cP+y87PAB esq9B0wiUzB6cttNTxPxAHo4zm4DcGvzp5ZuB18xjTquMLm4JXu6buBHnMkfTJ3Z1glgSvVTU ecYKCk5V9YZuWPRYgf6IWrGeI83po6hQlZOCW+dmj860BOwKra/gLAM9pyuPCx/zcdxS0LsrV r3NVnH+Vw2nDlaCoQJ452bqspeXpptO/yXcGiv0Eu1sG6dbGiyZYYlYbLgYwmxSz+h2vvV9rg anmQQ8ZlgWKWXUWiHaBUHEk8LhfHzaU59YGcAVpfi+jS59FhqpxSaeg9rWV0iKM9S103zINOq n+U1taIksaeC4usshBzRhgdrkWtQHjyhkDgD+qyl5MfcbEZHAKNgLdmleaMZsGeO5jzCiaXGL iwVkT6cIUn66tZUmwq9GmtXHFtN4Neusoai79ScmHEuG7i2VcqFNt6rScURNUpvRzLsqUUvCF MxQrOyH/gtlRb+7m7s2bwJat8gNOCYOd0vuL4iaJfttpGiDv1KLZjJw/INYmnW4HYAWIt2bOe jiPi2KT3IJTocIZv1LG7tElLNCC/+Xy+JYJC8g== 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 09/11] target/m68k: implement ftanh 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using local m68k floatx80_tanh() and floatx80_etoxm1() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/fpu_helper.c | 5 + target/m68k/helper.h | 1 + target/m68k/softfloat.c | 366 +++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 2 + target/m68k/translate.c | 3 + 5 files changed, 377 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 38b663e1d2..7d68879f34 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -638,3 +638,8 @@ void HELPER(fatanh)(CPUM68KState *env, FPReg *res, FPRe= g *val) { res->d =3D floatx80_atanh(val->d, &env->fp_status); } + +void HELPER(ftanh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D floatx80_tanh(val->d, &env->fp_status); +} diff --git a/target/m68k/helper.h b/target/m68k/helper.h index 092baec3d5..f100141367 100644 --- a/target/m68k/helper.h +++ b/target/m68k/helper.h @@ -83,6 +83,7 @@ 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(fatanh, void, env, fp, fp) +DEF_HELPER_3(ftanh, void, env, fp, fp) =20 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 5ce8413e96..4ce5783f03 100644 --- a/target/m68k/softfloat.c +++ b/target/m68k/softfloat.c @@ -2367,3 +2367,369 @@ floatx80 floatx80_atanh(floatx80 a, float_status *s= tatus) =20 return a; } + +/*------------------------------------------------------------------------= ---- + | e to x minus 1 + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_etoxm1(floatx80 a, float_status *status) +{ + flag aSign; + int32_t aExp; + uint64_t aSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact, n, j, m, m1; + floatx80 fp0, fp1, fp2, fp3, l2, sc, onebysc; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + if (aSign) { + return packFloatx80(aSign, one_exp, one_sig); + } + return packFloatx80(0, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + if (aExp >=3D 0x3FFD) { /* |X| >=3D 1/4 */ + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact <=3D 0x4004C215) { /* |X| <=3D 70 log2 */ + fp0 =3D a; + fp1 =3D a; + fp0 =3D floatx80_mul(fp0, float32_to_floatx80( + make_float32(0x42B8AA3B), status), + status); /* 64/log2 * X */ + n =3D floatx80_to_int32(fp0, status); /* int(64/log2*X) */ + fp0 =3D int32_to_floatx80(n, status); + + j =3D n & 0x3F; /* J =3D N mod 64 */ + m =3D n / 64; /* NOTE: this is really arithmetic right shift b= y 6 */ + if (n < 0 && j) { + /* arithmetic right shift is division and + * round towards minus infinity + */ + m--; + } + m1 =3D -m; + /*m +=3D 0x3FFF; // biased exponent of 2^(M) */ + /*m1 +=3D 0x3FFF; // biased exponent of -2^(-M) */ + + fp2 =3D fp0; /* N */ + fp0 =3D floatx80_mul(fp0, float32_to_floatx80( + make_float32(0xBC317218), status), + status); /* N * L1, L1 =3D lead(-log2/64) */ + l2 =3D packFloatx80(0, 0x3FDC, LIT64(0x82E308654361C4C6)); + fp2 =3D floatx80_mul(fp2, l2, status); /* N * L2, L1+L2 =3D -l= og2/64 */ + fp0 =3D floatx80_add(fp0, fp1, status); /* X + N*L1 */ + fp0 =3D floatx80_add(fp0, fp2, status); /* R */ + + fp1 =3D floatx80_mul(fp0, fp0, status); /* S =3D R*R */ + fp2 =3D float32_to_floatx80(make_float32(0x3950097B), + status); /* A6 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* fp2 is S*A6 */ + fp3 =3D floatx80_mul(float32_to_floatx80(make_float32(0x3AB60B= 6A), + status), fp1, status); /* fp3 is S*A5 */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3F81111111174385), status), + status); /* fp2 IS A4+S*A6 */ + fp3 =3D floatx80_add(fp3, float64_to_floatx80( + make_float64(0x3FA5555555554F5A), status), + status); /* fp3 is A3+S*A5 */ + fp2 =3D floatx80_mul(fp2, fp1, status); /* fp2 IS S*(A4+S*A6) = */ + fp3 =3D floatx80_mul(fp3, fp1, status); /* fp3 IS S*(A3+S*A5) = */ + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3FC5555555555555), status), + status); /* fp2 IS A2+S*(A4+S*A6) */ + fp3 =3D floatx80_add(fp3, float32_to_floatx80( + make_float32(0x3F000000), status), + status); /* fp3 IS A1+S*(A3+S*A5) */ + fp2 =3D floatx80_mul(fp2, fp1, + status); /* fp2 IS S*(A2+S*(A4+S*A6)) */ + fp1 =3D floatx80_mul(fp1, fp3, + status); /* fp1 IS S*(A1+S*(A3+S*A5)) */ + fp2 =3D floatx80_mul(fp2, fp0, + status); /* fp2 IS R*S*(A2+S*(A4+S*A6)) */ + fp0 =3D floatx80_add(fp0, fp1, + status); /* fp0 IS R+S*(A1+S*(A3+S*A5)) */ + fp0 =3D floatx80_add(fp0, fp2, status); /* fp0 IS EXP(R) - 1 */ + + fp0 =3D floatx80_mul(fp0, exp_tbl[j], + status); /* 2^(J/64)*(Exp(R)-1) */ + + if (m >=3D 64) { + fp1 =3D float32_to_floatx80(exp_tbl2[j], status); + onebysc =3D packFloatx80(1, m1 + 0x3FFF, one_sig); /* -2^(= -M) */ + fp1 =3D floatx80_add(fp1, onebysc, status); + fp0 =3D floatx80_add(fp0, fp1, status); + fp0 =3D floatx80_add(fp0, exp_tbl[j], status); + } else if (m < -3) { + fp0 =3D floatx80_add(fp0, float32_to_floatx80(exp_tbl2[j], + status), status); + fp0 =3D floatx80_add(fp0, exp_tbl[j], status); + onebysc =3D packFloatx80(1, m1 + 0x3FFF, one_sig); /* -2^(= -M) */ + fp0 =3D floatx80_add(fp0, onebysc, status); + } else { /* -3 <=3D m <=3D 63 */ + fp1 =3D exp_tbl[j]; + fp0 =3D floatx80_add(fp0, float32_to_floatx80(exp_tbl2[j], + status), status); + onebysc =3D packFloatx80(1, m1 + 0x3FFF, one_sig); /* -2^(= -M) */ + fp1 =3D floatx80_add(fp1, onebysc, status); + fp0 =3D floatx80_add(fp0, fp1, status); + } + + sc =3D packFloatx80(0, m + 0x3FFF, one_sig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_mul(fp0, sc, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { /* |X| > 70 log2 */ + if (aSign) { + fp0 =3D float32_to_floatx80(make_float32(0xBF800000), + status); /* -1 */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, float32_to_floatx80( + make_float32(0x00800000), status), + status); /* -1 + 2^(-126) */ + + float_raise(float_flag_inexact, status); + + return a; + } else { + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + return floatx80_etox(a, status); + } + } + } else { /* |X| < 1/4 */ + if (aExp >=3D 0x3FBE) { + fp0 =3D a; + fp0 =3D floatx80_mul(fp0, fp0, status); /* S =3D X*X */ + fp1 =3D float32_to_floatx80(make_float32(0x2F30CAA8), + status); /* B12 */ + fp1 =3D floatx80_mul(fp1, fp0, status); /* S * B12 */ + fp2 =3D float32_to_floatx80(make_float32(0x310F8290), + status); /* B11 */ + fp1 =3D floatx80_add(fp1, float32_to_floatx80( + make_float32(0x32D73220), status), + status); /* B10 */ + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, fp0, status); + fp2 =3D floatx80_add(fp2, float32_to_floatx80( + make_float32(0x3493F281), status), + status); /* B9 */ + fp1 =3D floatx80_add(fp1, float64_to_floatx80( + make_float64(0x3EC71DE3A5774682), status), + status); /* B8 */ + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, fp0, status); + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3EFA01A019D7CB68), status), + status); /* B7 */ + fp1 =3D floatx80_add(fp1, float64_to_floatx80( + make_float64(0x3F2A01A01A019DF3), status), + status); /* B6 */ + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, fp0, status); + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3F56C16C16C170E2), status), + status); /* B5 */ + fp1 =3D floatx80_add(fp1, float64_to_floatx80( + make_float64(0x3F81111111111111), status), + status); /* B4 */ + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, fp0, status); + fp2 =3D floatx80_add(fp2, float64_to_floatx80( + make_float64(0x3FA5555555555555), status), + status); /* B3 */ + fp3 =3D packFloatx80(0, 0x3FFC, LIT64(0xAAAAAAAAAAAAAAAB)); + fp1 =3D floatx80_add(fp1, fp3, status); /* B2 */ + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, fp0, status); + + fp2 =3D floatx80_mul(fp2, fp0, status); + fp1 =3D floatx80_mul(fp1, a, status); + + fp0 =3D floatx80_mul(fp0, float32_to_floatx80( + make_float32(0x3F000000), status), + status); /* S*B1 */ + fp1 =3D floatx80_add(fp1, fp2, status); /* Q */ + fp0 =3D floatx80_add(fp0, fp1, status); /* S*B1+Q */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, a, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { /* |X| < 2^(-65) */ + sc =3D packFloatx80(1, 1, one_sig); + fp0 =3D a; + + if (aExp < 0x0033) { /* |X| < 2^(-16382) */ + fp0 =3D floatx80_mul(fp0, float64_to_floatx80( + make_float64(0x48B0000000000000), statu= s), + status); + fp0 =3D floatx80_add(fp0, sc, status); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_mul(fp0, float64_to_floatx80( + make_float64(0x3730000000000000), status), + status); + } else { + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, sc, status); + } + + float_raise(float_flag_inexact, status); + + return a; + } + } +} + +/*------------------------------------------------------------------------= ---- + | Hyperbolic tangent + *------------------------------------------------------------------------= ----*/ + +floatx80 floatx80_tanh(floatx80 a, float_status *status) +{ + flag aSign, vSign; + int32_t aExp, vExp; + uint64_t aSig, vSig; + + int8_t user_rnd_mode, user_rnd_prec; + + int32_t compact; + floatx80 fp0, fp1; + uint32_t sign; + + aSig =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + return packFloatx80(aSign, one_exp, one_sig); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact < 0x3FD78000 || compact > 0x3FFFDDCE) { + /* TANHBORS */ + if (compact < 0x3FFF8000) { + /* TANHSM */ + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_move(a, status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + if (compact > 0x40048AA1) { + /* TANHHUGE */ + sign =3D 0x3F800000; + sign |=3D aSign ? 0x80000000 : 0x00000000; + fp0 =3D float32_to_floatx80(make_float32(sign), status); + sign &=3D 0x80000000; + sign ^=3D 0x80800000; /* -SIGN(X)*EPS */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp0, float32_to_floatx80(make_float32(s= ign), + status), status); + + float_raise(float_flag_inexact, status); + + return a; + } else { + fp0 =3D packFloatx80(0, aExp + 1, aSig); /* Y =3D 2|X| */ + fp0 =3D floatx80_etox(fp0, status); /* FP0 IS EXP(Y) */ + fp0 =3D floatx80_add(fp0, float32_to_floatx80( + make_float32(0x3F800000), + status), status); /* EXP(Y)+1 */ + sign =3D aSign ? 0x80000000 : 0x00000000; + fp1 =3D floatx80_div(float32_to_floatx80(make_float32( + sign ^ 0xC0000000), status), fp0, + status); /* -SIGN(X)*2 / [EXP(Y)+1] */ + fp0 =3D float32_to_floatx80(make_float32(sign | 0x3F800000= ), + status); /* SIGN */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_add(fp1, fp0, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } + } else { /* 2**(-40) < |X| < (5/2)LOG2 */ + fp0 =3D packFloatx80(0, aExp + 1, aSig); /* Y =3D 2|X| */ + fp0 =3D floatx80_etoxm1(fp0, status); /* FP0 IS Z =3D EXPM1(Y) */ + fp1 =3D floatx80_add(fp0, float32_to_floatx80(make_float32(0x40000= 000), + status), + status); /* Z+2 */ + + vSign =3D extractFloatx80Sign(fp1); + vExp =3D extractFloatx80Exp(fp1); + vSig =3D extractFloatx80Frac(fp1); + + fp1 =3D packFloatx80(vSign ^ aSign, vExp, vSig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_div(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } +} diff --git a/target/m68k/softfloat.h b/target/m68k/softfloat.h index e9943aed20..4cdb5a49ca 100644 --- a/target/m68k/softfloat.h +++ b/target/m68k/softfloat.h @@ -41,4 +41,6 @@ floatx80 floatx80_atan(floatx80 a, float_status *status); floatx80 floatx80_asin(floatx80 a, float_status *status); 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); #endif diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 2f7caa0ca0..0caae904b5 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -5057,6 +5057,9 @@ DISAS_INSN(fpu) case 0x06: /* flognp1 */ gen_helper_flognp1(cpu_env, cpu_dest, cpu_src); break; + case 0x09: /* ftanh */ + gen_helper_ftanh(cpu_env, cpu_dest, cpu_src); + break; case 0x0a: /* fatan */ gen_helper_fatan(cpu_env, cpu_dest, cpu_src); break; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520887119047228.94042743238447; Mon, 12 Mar 2018 13:38:39 -0700 (PDT) Received: from localhost ([::1]:34547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUDO-0005ua-3Y for importer@patchew.org; Mon, 12 Mar 2018 16:38:38 -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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_sinh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- 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 =3D floatx80_tanh(val->d, &env->fp_status); } + +void HELPER(fsinh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D 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) =20 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 *sta= tus) 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 =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + aSign =3D extractFloatx80Sign(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + return packFloatx80(aSign, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(aSign, 0, 0); + } + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact > 0x400CB167) { + /* SINHBIG */ + if (compact > 0x400CB2B3) { + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + return roundAndPackFloatx80(status->floatx80_rounding_precisio= n, + aSign, 0x8000, aSig, 0, status); + } else { + fp0 =3D floatx80_abs(a); /* Y =3D |X| */ + fp0 =3D floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x40C62D38D3D64634), status), + status); /* (|X|-16381LOG2_LEAD) */ + fp0 =3D floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x3D6F90AEB1E75CC7), status), + status); /* |X| - 16381 LOG2, ACCURATE */ + fp0 =3D floatx80_etox(fp0, status); + fp2 =3D packFloatx80(aSign, 0x7FFB, one_sig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_mul(fp0, fp2, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } else { /* |X| < 16380 LOG2 */ + fp0 =3D floatx80_abs(a); /* Y =3D |X| */ + fp0 =3D floatx80_etoxm1(fp0, status); /* FP0 IS Z =3D EXPM1(Y) */ + fp1 =3D floatx80_add(fp0, float32_to_floatx80(make_float32(0x3F800= 000), + status), status); /* 1+Z */ + fp2 =3D fp0; + fp0 =3D floatx80_div(fp0, fp1, status); /* Z/(1+Z) */ + fp0 =3D floatx80_add(fp0, fp2, status); + + fact =3D packFloat32(aSign, 0x7E, 0); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D 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; --=20 2.14.3 From nobody Thu Mar 28 11:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520887099635519.4256212090494; Mon, 12 Mar 2018 13:38:19 -0700 (PDT) Received: from localhost ([::1]:34546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evUD4-0005bV-DN for importer@patchew.org; Mon, 12 Mar 2018 16:38:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evU3V-0005fQ-WC for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evU3S-0006aO-Nd for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:25 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:51143) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evU3S-0006V2-E1 for qemu-devel@nongnu.org; Mon, 12 Mar 2018 16:28:22 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LxKXe-1eauwA1Bv8-016xll; Mon, 12 Mar 2018 21:27:56 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2018 21:27:28 +0100 Message-Id: <20180312202728.23790-12-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:1P94TUAdf6vcurfEm2MnfpUdEVs51pM8H5CyYpa4/1O/WIfrZCw pUiurY0gogynpxr/amN0tWBYl01wegeO59mrHoCN43CMS79XQ/BT1eayD9KWqm+Rwfe4OyU Uyz3Oedf9mbP044rVQ5voeMkRX101wZQn2b1z75yBeXAqs/c1hwvIr6FWKbdeofhEuGtMhU 40RgCHoLvx6g+qB+kUyzw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Be2txhME5Kc=:GC5tA9uEcin8ULsiWxfmwg b22wbKer6i2gXQ79HzwXv5ZMb60Z4fiBMUUsILOkEu6BwoGnu2OYtMSljYUj/BM2iCT35YPBo fMvlFgGePSFYYynT8VOA3TvBbhx0xAvzONyPCTwjfjSeWDD0Yy1hLCvYod4CV3XpK3nWtrpT1 ix2rQdJ7gF+3MG7x7fdQis51U+PKkDS/w1gtec+z1Gt1UHVw3eGHyHrtBcQIYTGPyBxNQ0qsg Eua7vK5UaJhecxAGvR+gecFFTqOrThnDZJchsWjoe3s05a1F4RfRwX8MMfxaG+S2ZAYSMQFvQ mFzeFZlXbRP3sUKyvncRxwsrHCwV1qvfud6nfh20YhnLYp05c8AtNGA0ymh+b2Rn72IqwqZuA IUpvFuoWfOY0RDzg7s40J0rvXUKnIyzHD7G0XojSpGLvy+I9ZHVNkCJDRca02almIaFMQ1RQ3 Es6uXenervLsj+k4XqHG+ShYrsKvGN6ec6iip0dvA7d3VXkhx6XLIdy4rpMr0dEIbXpTxT3nt v9OuPNAj7mK7L0XHKgBIubQvfo6yYxerNU/PSWdcEiq1LtIBBg9wCQEl1NA4tQquEUent0+yl gC+aW07eyZqEC09+1Y5z1dAbQsqHyglIeBbLa8M+2zTlX0J7BQZjb53MIwJ9oMmQXhkuIizlR iYKyUYs2fsX3D6gajUNmaBy0xYZTFoJFEjGIxCPeYsbrec+WDkqkkdckPWtph5xXRYEfXdMV1 OuGGud4ZX1MDOHMQqvecv6ORFoVS7/pueDnocg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 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: Thomas Huth , Laurent Vivier , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Using a local m68k floatx80_cosh() [copied from previous: Written by Andreas Grabher for Previous, NeXT Computer Emulator.] Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- 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 =3D floatx80_sinh(val->d, &env->fp_status); } + +void HELPER(fcosh)(CPUM68KState *env, FPReg *res, FPReg *val) +{ + res->d =3D 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) =20 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 *sta= tus) 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 =3D extractFloatx80Frac(a); + aExp =3D extractFloatx80Exp(a); + + if (aExp =3D=3D 0x7FFF) { + if ((uint64_t) (aSig << 1)) { + return propagateFloatx80NaNOneArg(a, status); + } + return packFloatx80(0, floatx80_infinity.high, + floatx80_infinity.low); + } + + if (aExp =3D=3D 0 && aSig =3D=3D 0) { + return packFloatx80(0, one_exp, one_sig); + } + + user_rnd_mode =3D status->float_rounding_mode; + user_rnd_prec =3D status->floatx80_rounding_precision; + status->float_rounding_mode =3D float_round_nearest_even; + status->floatx80_rounding_precision =3D 80; + + compact =3D floatx80_make_compact(aExp, aSig); + + if (compact > 0x400CB167) { + if (compact > 0x400CB2B3) { + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + return roundAndPackFloatx80(status->floatx80_rounding_precisio= n, 0, + 0x8000, one_sig, 0, status); + } else { + fp0 =3D packFloatx80(0, aExp, aSig); + fp0 =3D floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x40C62D38D3D64634), status), + status); + fp0 =3D floatx80_sub(fp0, float64_to_floatx80( + make_float64(0x3D6F90AEB1E75CC7), status), + status); + fp0 =3D floatx80_etox(fp0, status); + fp1 =3D packFloatx80(0, 0x7FFB, one_sig); + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D floatx80_mul(fp0, fp1, status); + + float_raise(float_flag_inexact, status); + + return a; + } + } + + fp0 =3D packFloatx80(0, aExp, aSig); /* |X| */ + fp0 =3D floatx80_etox(fp0, status); /* EXP(|X|) */ + fp0 =3D floatx80_mul(fp0, float32_to_floatx80(make_float32(0x3F000000), + status), status); /* (1/2)*EXP(|X|) */ + fp1 =3D float32_to_floatx80(make_float32(0x3E800000), status); /* 1/4 = */ + fp1 =3D floatx80_div(fp1, fp0, status); /* 1/(2*EXP(|X|)) */ + + status->float_rounding_mode =3D user_rnd_mode; + status->floatx80_rounding_precision =3D user_rnd_prec; + + a =3D 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; --=20 2.14.3