From nobody Fri Mar 29 10:55:10 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 1520958014050655.7632332934065; Tue, 13 Mar 2018 09:20:14 -0700 (PDT) Received: from localhost ([::1]:40970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmek-0002MV-Qx for importer@patchew.org; Tue, 13 Mar 2018 12:20:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLb-00033q-Ps for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLQ-0002vF-MG for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:19 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:51323) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLQ-0002u8-8H for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:08 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MRybG-1f68VA0YvK-00TDI2; Tue, 13 Mar 2018 17:00:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:08 +0100 Message-Id: <20180313155918.23591-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hlft9gSYMGM/Ho2PYtwNu/pUC/lLnHVuzDky2g5EAt3ibAlfcZ1 eSzBToOZ2ezkNtp+pojVRBmyTPSJYYHQWozSwdjoWDMRQwBs2vAUQMEPHgFbKHmiT95jyLP SAD3gNGiMJW33werFd4GNMldxf9Dr+0tlo9ni4PJmJ5wPQmdj6bb2hzkiAV590ipce1bV+t 0SptBSUzrBb7gxrVGHSzQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:OWg4ONnBg+w=:UO9tKvUXlZyXdrV9SHd06F gVZvurMokIXh4up3LbfPFv7YzHOUqBgV4OejSey08BqH+JApblyafcO1BQUE+LWkEZBbbbM7q L/YNNsdPM95kTjJiFW7twUohzwlYt0pCPSq2+pgLfPKC0DtdolB2vySYOxEMwh9JBVN2Uoeql etw4hWm6fRc73UHBP0r0MPmQbkic5dilEaHrmI0MGydzkDTq1rzeZWwdM1MhSDpCEPNS8g0Mf THL2ffcUPiJbrQ6psKOUjpRUh2RJfkDDiFMi1IZj+xkcY4FBk04kUsbsHg/eMDVOZdl1RoKgK D0cNZSA6cLK7Nu1jUYIKonfFyqGmfJJfgCl/c0Fi4+og4Hc9EfsqikO11wuJfsy4Rulc75woc idebZgqh9grYFrp0Q+XN2ugDRlEI84AT6cAWXP9/s2LV8SekVW5LJ7lWJB1zZbDv9WmrRwUDo 4rPhOfqbKsxFsvYL0V2yK7Br22fP49anKAqe6NKR8g9gbM57LI0k4ip6DfzIwdDpMRE/+lh6m 7lDS/hpgbwFYOs+IIgcgzbfw9AEdTvfMBx6t7c+6cGfFDX7U9iIPPUjiVvQIlJSiQEjYpmzhn Q15+h7dHX9KGo+sDytSc0kPylgZ/PLxM0x+Fa/2VhzX5zsSZklIPYlaZgUqt/6GG8wxXpZ+4E 31aWOAEiEO9BUXrauYfx/rPREvl+pmsQqAITFsI1GnJZ6tSWoqGMjwZ2/R3zS0UMvuuGW+SHI pa2h+veWj8Iam1gtRnuvJdyAa0LsA3SLOPJPyw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-2-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957665259807.7795337367472; Tue, 13 Mar 2018 09:14:25 -0700 (PDT) Received: from localhost ([::1]:40910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmZ1-0005sf-Sw for importer@patchew.org; Tue, 13 Mar 2018 12:14:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLd-000362-F4 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLS-0002wP-2k for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:21 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51489) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLR-0002uW-Lc for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:10 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MYrHb-1f82BJ32AN-00Vf4F; Tue, 13 Mar 2018 17:00:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:09 +0100 Message-Id: <20180313155918.23591-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:TIv69/UugpF5PoucEYw8ELTNHdJ0GZ9vhCRBwPPK3eFaZweMAZD Dw7hTApM37ENOooQA5kHGz/wYXOuDp/9d+fI5aOQLjVbQLUOUg8VWFqJrpyB2fe058BdUpF UIsm5t1M+M3iOjuGkPnqx9HQgkagIyVDgGEucLGcmYRJCI+XdmCT6lUkY1TRh422BNrA2oR 6kfEpd3OkhEel+pKpEOXQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:HiCSpIrC6Pc=:NypdbYZX8rXPQxhw9E2ZiE rxOx3R0ka+VnZZAhpL0WNU37JWIz8KOMhHMLG8gMcwAOMsI2Ju5nEdzPvb/7TrMgx38fVTX0x JF0PF0vJ43OI0nPBY/BeVid1KJd8V9QBdGkgHjC215cvdT+gbGepl2gch6aFu1Q5WfZE9gJP1 yrcm+DrcMHaG0HYo1o+zddgXGj+5Etle6tmf25eppbjOjaccvesKUrSc3HUQ1l99uJyPt72DR cYz3vTZGjGYtoDqpO8WgYJz8XAHq2GY5hocblUxQezt21ADxoLrXigR1b6njH5vc9G2VI6y9d Xf9PJQkDqVi7TfPUIT4lnXRzBlAGTXANUsq0FYhfB5c2wMjwzV/7myTzZw9lLk4omYeAxaaAy Q8LAiicWhjUGhbuiTKErEfwg7sTUo4WmJ/s4Wy4XqrB2519MT4Zf5wbLRTWvaM9a6MAWGMw0Y DUuaG0dVXr6NZZsRHOBjCFvh2TNx0+CPp4zFtv8ALS1T6KLGhEnWgJCKbXkVNHdUccLiP2uJr F6m+24kZMINt6txvVkcBZt3HdoOx42vEpHBuo242V6z+z4PYcIegezHp1mtbkdqdqyg7jMbne Drizal3FIX0vyCVyuAf5Q+IQsZXX351nEG5q7TIkvjHgyCCSP6RUI3f+tPIPru1ufKkgApwll tmTrMByvhZjzrEcTc/3NmEb7ZEH+7NojbTgS7/R0lzlCYiIu7BFiKvH2eSh8qCvXnKfDAPxPw 9eN2m7x+swuaEw+u5JnqpVNsRAFYa+CpbP6Skw== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-3-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957525774810.5623857860652; Tue, 13 Mar 2018 09:12:05 -0700 (PDT) Received: from localhost ([::1]:40898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmWy-0003vl-RM for importer@patchew.org; Tue, 13 Mar 2018 12:12:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLX-0002vn-NS for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLR-0002ve-IK for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:15 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:37443) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLR-0002uw-4n for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:09 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MXCaX-1f7TgQ1Ckf-00WD25; Tue, 13 Mar 2018 17:00:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:10 +0100 Message-Id: <20180313155918.23591-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:8UCmyKfYNua2P2CMrAMUf86ycXYw6PM+UrSSGVWEm3NiDGaVa5D uvujcvGaZUEibGrw6cS+hmhK41n/D2NAaCbqGqcpqNDnl0xe4Fb4u6Hme2Opmkky/q/AjE2 qFeoWqhmAQQo2FBkZ7qTiLYmcV7XQrU4KrIx82m3miAcFwqif63/NmEYwY3iMim1RIgOl9I IZgHjj/X2CishWkLREhsg== X-UI-Out-Filterresults: notjunk:1;V01:K0:08i7gUhb54s=:abjKOGLNHlmJSu3YVc6H9B 4k3XXTnX2vFyLfk7UsN8uH5LXMSSueRCpktZakpjr/v55JQhIalW2tYkmjtYQDAr+XBhiX8sx fmnprb0txRuEJmYK56WJU3AIR18q2ZKuGWRs3b09wkgr+ZRGNJkq7A1i1Q8VmOj0llymnJI/z ydO2q6Cs1dx43XBQ/EX5NncEspeUrdjzwy59AaQXIZlGf32UMsC1iMXgd992kR09M3lOkcZUv +xC7FhXYnRziH+FJfrN+hdyF4812lHDkSv3OVf7KiFh77bmSr/Sb5FUqMsI9eW5B4J9jl2w93 N2w4CKjdjafyhcebR6eaNo/IqDf3qssACDNeQK1S9MMUPrweigJmO74y/XhxywHAS8X1qLJ2Z ei5biysoL0E6tymqUr5P04RuJZI8h1fjeKdmQSXjg2xN+4bHwIb+uaihel5eeunuCAHY2N/n7 xzlDQSdi/ti8xCsYonkfKrmsiR5PwVKKfXNlVBXHy0+enhpEjPX045v/5vLhncYiblms7RR/b u5CCN5S7j+k0VhO9GkGDrtu0eR+IOPBWsMwIKiy5Cc6ApUt6I/3hlR5thodXB3bzTCe15XWMQ u/ElsxZl+yJxRzqP77zdhsZamSD8tGoPLLVzfcM+RnFxKWGRUzK0dqr+3QbchXyGMUeJN1jhN IRyqjqgfiCyNcTcrfRfBX8dWUIvDITazwQSOISslNxLhoAPnOuBheoJpMcgG9jQCGj3lz2DA4 qFs7Gnvc2n5PKKvq1NBjUkgKtp5PH0myD3yShQ== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-4-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957347324915.2804718637218; Tue, 13 Mar 2018 09:09:07 -0700 (PDT) Received: from localhost ([::1]:40862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmU2-000164-2l for importer@patchew.org; Tue, 13 Mar 2018 12:09:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLW-0002uo-N9 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLR-0002vt-Q6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:14 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:36281) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLR-0002vA-GE for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:09 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LkkrY-1eLL3z3b8O-00aWWa; Tue, 13 Mar 2018 17:00:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:11 +0100 Message-Id: <20180313155918.23591-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:Q2F7v/ElWl0MXgJ4EZR+lP46Iu3R9segnHOIJx+UZUVopTBlibV wLPfeV/gVMl89Nx4J4DLea2WChanMKhv+KeSYWHLfLZ15RMKixM6KQvwsFpE5bYCb3JYG1G GjfFqsw4okhAUcPMcs0UV40w/aqn7vS63e2KpJae357UHy6tMOm3uv9MMlOim03Wsm8ubz0 JuHS69OWw+bKgQMBshKBw== X-UI-Out-Filterresults: notjunk:1;V01:K0:eQdZHIw5kJc=:8Z+NwvOOa+qWa1rRsSz0VB 4tOK9hshaM0XMGN1OB5nnhtRBkhWvyKF30EbGZiwF3hiNRhiKITFcK0JcydKhWm+ldUjA0tue s2fsY8KMHTkurG1dMb/jRpyeOei+rNXMo6G0Ft/y2YhUeUYUwIzyNhQDngSYZbFN+qf2FpfQ5 q5zgWH0rnkVWcqzHRfHez4pYN70Tqk3H4UlbvL6bDmZc5udC5ecQyqi3644UzBsDrBv2cfUoM WwCjDxtkjz92a7GTyFNSq1Oa8odP+T/IKDn5doEyCqa//zCGJu8DEt34nzKnvPD+J4ZxO+DQk uqNnthOdCwjrOpKrG0oiC4lVXEZc6u/za9S9bKw9LMoO3xrz47FQewtHmOMZ/uo8pglVHAtYs spS0KE9hyVA7R0QFR0uKT9kk2wXa/wADN68/nKZifnPik7jiOto/1F3HadVlz5pbtCOKSuaur CL7sTx92ByJ+MR4EXZaM0o7AGg21U+l+QKRR09JmMi5dM1QMLhErO/Yg2F80TKvCnHTwvrXm5 B6HMM1Sy991WZvgQQUOoDz9zgHFG/Ot5i+Gz1eMenUnJeF3iPG9kNKYs344buUhGndWbNv/CH 6zjqNUKl/cuiX7p49tW5ZHr2yK6d7vKkUHQaupHFTDV0sm7D/2ZtsB3FffoQXFZRWp9N98494 hHFF1DoNAroof+UPadSL+KnZmz80kL1CykivBhO2/Rkl4skHQheSXTDUx53cx02Mwgs7SUsCT SXQrDqxKWj/wzUqMKFWnhl4tFesUqql7YmM2eg== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-5-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957589108976.770610985775; Tue, 13 Mar 2018 09:13:09 -0700 (PDT) Received: from localhost ([::1]:40904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmY0-0004wg-75 for importer@patchew.org; Tue, 13 Mar 2018 12:13:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLW-0002uY-EG for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLS-0002wb-E3 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:14 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59315) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLS-0002vN-0E for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:10 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M5cCK-1ekZ3Q0xGC-00xY5o; Tue, 13 Mar 2018 17:00:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:12 +0100 Message-Id: <20180313155918.23591-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zrV8YGxK8WYfyKH8MNGOy8VZHg6fYf5aAZxCjabioQXVFqUzyHe X2T6gHN+q2LJYPoEm/L/ixyOgZ+npQJvteTUWo435F1rHz0mrXAXfRpLb9Iz/A7/65qJTR5 yw20q1FT2Z097ETcXsTDTFxSHeop2kLDMhfSKeqNmrKW18n+1QGKfdIuS8863awmbqJ7NA9 TNi5G52ySeTxCY+/hXFFg== X-UI-Out-Filterresults: notjunk:1;V01:K0:C0kiWudYGnc=:dTch1GReZ9xSRPfHUKQS8Y G1VR7ZuaDLV2O6PilyCfxZ5gTQ6xSmzXuVqgngzRXXvoQZMkx8wRQoVChaxi7AOLX855QD3h+ 4ZhLk0KXBByCPwVMrD8N9vP1DwOg53rkHXncEzWy2bMNJDP+wQRGlx3JwWIeaqGrNe5cVqiAl Cq4r/EW0xRMWXglpfLx91j0bWMf5dP8G9/HHQDlj82vzhdZuwKZoCQrb/avIk7s901RbQEStq QskaPvAEeZHpa8usKWU0b4KFrFWN6okgchQu3Z+wdKOsTAmSmxEl7NFqR2X2y1Zl4ADWk+oUp Yn5fwt/ughzljoVvltw0r1ZYfcXxkxx17wWx1l8Wjf2LCfzUbnBjG1Y37C0s0Jro7HFPiQS0H O8RRBjvFI5W++fGHIjtoXjnBlqclaxciPYUsHvnQ1WO7qupBNS4fIhnhkIRHKwr54dG6PnuOQ CWLCgC95JNuj1oAW2jli3TDKe+Nv17bXlC/ZlcDIZ5CeTg8swgUidWZrOc2JmxbbO1mzDBpKN 3rBd/SZ7ieayiRq22jqGh6SOuRnCmTXjZ+V2Sl3egVLs2RSgGTKNbJIUb0PFaeh4nPjzGLNUW w9A6rm9yqpA9Azdu21dwdpQgFTLhBTCz8HOnbPpTOcpnDPmltwaJAzQ1BBUoK4tPMdfJ4D1Rm 8zU7QIOdsUTxpfAgyIV/qe3dlqUjcyJ8XjZ6Z09SR/Acet4dTgjbAeak0eBKOc0t0gwttCIHk TRnLmSJSU/gFsMmTkKm+o9AYMo8qLE1FdTFW/Q== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-6-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957672635351.3206674107797; Tue, 13 Mar 2018 09:14:32 -0700 (PDT) Received: from localhost ([::1]:40913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmZH-00065n-4A for importer@patchew.org; Tue, 13 Mar 2018 12:14:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLW-0002uy-TA for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLS-0002wu-Ku for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:14 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:42123) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLS-0002vc-B9 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:10 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MV0jR-1f9gbl3bOn-00YPxV; Tue, 13 Mar 2018 17:00:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:13 +0100 Message-Id: <20180313155918.23591-7-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:4tMUzmUPV4hHK4T0SHwkxntFaJP2iGVtOgZJDaPJT2Axa4IGYmJ i/zJSJJhQc21uXxbgRWp6s1doCNT9ZVWXT1uKcrP2Fja5zwESwCL4bb1GLwXXi3MiVex2OX QDnGlc3NtgbYqhq+A2AdFuq7iSU6O2Eb84a3A+02bAeRSvMKnQYTZwQJsGG1I53zV9dyae3 ii7mJ5z7sQMMU5nuv9Tpw== X-UI-Out-Filterresults: notjunk:1;V01:K0:lIJbiLBPxnI=:S5cFeXKO7/A7GXbClm53HN e+hn3g5wKK5n7xUptNzNm0gT1tXgUmUFBnqKK30HZCA+Jva0kL6DeBasfdq4Fyoe8n2Rbxo4b unMGIkcOUzwGYMPgf4Y52YJDaUPQIxo8wieM80CslrDG4V0SsgAZ0Y1TWL4Wv8/myDygouovQ nHpm/nMIYkFX1XdNEz/BW5aW02BxAIHHQ1oxItFcRW6bYVrFEYPpKbFcKhYd8X8AJaFz6hILU agYB4tugnI5fRydF0Jb8ikSns8uzAQVU23WB04c6Ix1SXjNAUBsP684fytGNFx6+VNNMt90Tq lMI5fogLCmQmHsuPPQlS+TioMe++ZaWGwna9C/QbqN180mhIQw2n0MPiWBxS+TRM1DevUPWPe +XJccdDfYvvOH4gXyEmjt8QTjoSFtNWlS8XUcNNfUS7Tc6iSyVFuhlkGeyIHRdTORJTOtT//W s5jtV1RFnx/56O80kZWHR322kLCyIJLG7n5gWVDGA4HA1+ELkOJ2ILTzCQqClgsS+TyveLESr Pstmb3JQB2wLQ8NxzcWn4qUd3LucNkBVN895VpgAPWnUnbq/D71LvxuhUHV+iL5URcPnVbSOA skD5G1H09+Z9rtjPYP5DLalfMKBjZK8JtsPnSdom1IhnwTF8EFlLihRCHZYMR4BvM4XiYJawf UdBXv9+iSxJ3yrQj1bzl6K86pGJ8nr4TnvfEcU195J0G6N52j0jL4eyAyDshRucFdSnFEXbQN 2OZGdRmrPXpDEy/KyRsZnOmpfjxfnRu1A7JXww== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-7-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957213216483.2087719962534; Tue, 13 Mar 2018 09:06:53 -0700 (PDT) Received: from localhost ([::1]:40829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmRw-0007mq-8n for importer@patchew.org; Tue, 13 Mar 2018 12:06:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLZ-0002xg-6g for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLT-0002xA-0e for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:17 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:47197) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLS-0002wD-Me for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:10 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MZhpC-1fDrj514Lm-00LTW2; Tue, 13 Mar 2018 17:00:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:14 +0100 Message-Id: <20180313155918.23591-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zMEaGY3B2lZFHulRsg53j/S/i2ma/v9WAKjHNLFYCI6biYZFDhQ dzHwekAE98P9bT3+KOMtuf4TzJu5tLEAI3/U3JbeV/Kw+csgN0B5F7gMIP4BjuKWDfhCkkl oeRA8B5pVs8pynC6D3o8zYHbeNjqPxUAy76gj9zyHpVoz2A0OdASvRAC8+PjFK36fSBGDzn j0J25SXPNHDZ7hm73C8AQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WpgTlbl0ijc=:kw+jzcA+QLDSSY4NQYkjsT DGwpx8iqSxx9fq0wNoD4LX9tCXWeBq1l/OVZeGJwHEVk0XTRrHJubhSESaEUIiNC19LUBXmeG U5EZ1gNkrnVpU51LAcPB6efb0LBQw2aWExZ0AlvfuZubHqAvbQcomDlWAnAika8OFUhSiMyIF doT2Nf9sbPjlmWi4nles+ldzJlDz4q6ViIwKhgzU1cQJjr+lVEQhgiyQlWE9IbJ+vMUh2zzSC A7AzlLikdVzpWY90xeIkyXVbnrNitcXy92Qew+mxRNEkajdQ4kw7XDH5jzOaAhjH0nONVi5sY ZetQxrOyUFM0m7JFu8sg1WbvtQBvufjC3QpvZXrBEuOEPhh7mcJMRFz9mwgFsS+uJ14B+X25e sfElwhjYPbRMIPlaT1elNmDW0mBfKkl+MUcwzGi8Mi/7P8pZauBIRTEcluzNVTaeMU0IImIGx 8wA4zQr92C5iLPmlV6ZWIaM86EzhrvNTma9dABT0zACfKAPx8dNkUjL2Mn9fznlTEwIbYv76g +u1yM22jWVUuptSSzMcOHaC2AE4sEsElHpZx4bTm4sXWxBJbamgYJ3hR9VJftrkTmNYplFewe Zpd7NMgxRusVOL/vM2TD/jsJ0Mv1agrKb3n7ny4ME3o2tlmzexJAhMqNaBp3FnCQWV1xKXmqJ /4pi9sx7Nke2YTt7kaZyne/JXNZWAflvipydWTrFGByC/JYsOmqrJViW4ugjfjez3N/NXf+be 1xwVPgIiUpdiK1YAeN3hLieLNowJ8lUfiPUd0w== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-8-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957149982354.4275487232111; Tue, 13 Mar 2018 09:05:49 -0700 (PDT) Received: from localhost ([::1]:40817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmQu-0006vF-Rw for importer@patchew.org; Tue, 13 Mar 2018 12:05:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLZ-0002yl-C4 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLT-0002xe-Fr for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:17 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:42499) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLT-0002wW-5t for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:11 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0McitZ-1fD2762huL-00Htg1; Tue, 13 Mar 2018 17:00:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:15 +0100 Message-Id: <20180313155918.23591-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hBP9n9yj35UsWZ1q0yzG+m0HAqEDwK1XMOai0qi+vH/1DOWGiAZ AfF4M6LXlaZXYvjQ0tXC1X+ULgVxQURLFIZxr6PepQ6XQOzM2aUqNM5SSVYVL47fO5muTZb QocCv9uYPxTC89y2HW//orzVfH9u62uP1uyKI7pA4zP7lnC5ACHThqTI/o11vRlqSlUDt9b aYNp8t9LRkTR2B0+3mpCQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:rI9JIK7tmVQ=:eX/QMSCYy2hi4WRnGRCvk3 4gkGLyFxd3a/jsVLGlJiYqjumH0p0ttTWtMWUhr5rSzl+xbOZcXnulO5f/IfX9Et6bHH2eyKT ywGOEnLl66TMlJGvrr/N1Ru4Dd5mQsybexW/zfRmgsjIk/LZJMngodi5mZgeOvvbJjkbrH7Z5 22KjoZLcE2pIVncnJG3pGVj4Cbpcneo/Wpaonn3Z6CcUvja/4CJ1ejnEpTWzFLmp/ACc15Z4k mYkV7A88OeBREOXcxI4UDuUpSGPzKvqR04uQah5GFdszPo3mT52dwhihpVrdTmoT8ljTeFpYW 5SICGCEOyH9N+sveqOnrmQjtiKujhgB+iNMIRgw6cHShNDa0jXBFH8uvjtyi47xmeIXFh8Y4f 0DuPUw4W5VoZwah6PUYltvA8Rtlug6GmC3vsbqsjLzXUnLB+gfc+VULbS+gt1c2O7oXI4SxP4 H1m2POPwIsRQtbiaUqO6PQy0EuKJZKcPqXbcoJQXKFnb67Q0YbC0ZD2Z3+7S9GJa9079/fAjy YiBj0N3yv7Szy5LnEp0VNHnVaNYeT8rGjA7cgwKlsXTYDnEVBp5PYbC8qFmybUkl0QxSBmIHG k9+bwd3qvcecbowmhcbpbGKHBsctuj0aC3FuZbZdUbGD0l05UGezT9hDA64PQrs89FzvkGRL0 jbRB0Qv5c/AeXwHr9JlRKWUoK1PkQgbTxjxJu8Dg/L0FiO6ejiwooB3wRu6dwEltAd0thaSYr zqIH/Th8U9TdCMEmZfnPokRDFlAhI9GYiWPRnw== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-9-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957394258977.3193931446273; Tue, 13 Mar 2018 09:09:54 -0700 (PDT) Received: from localhost ([::1]:40867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmUr-0001tr-A3 for importer@patchew.org; Tue, 13 Mar 2018 12:09:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLZ-0002yB-8E for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLU-0002yR-DH for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:17 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:48435) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLT-0002xJ-Vc for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:12 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MVHys-1f9Pl608kw-00YgwQ; Tue, 13 Mar 2018 17:00:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:16 +0100 Message-Id: <20180313155918.23591-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:xcdosrBNbDpw4pgdGJrOcTWAPQximIpy20G3eAxbZWRzsmipLqz Xqw1HmyO0iEFNuWzij89SZ96OnaIra/r1JAi2JCr7HSqrM+uebrScqAzWRW08PPdCRp1ata VMHP/azvrAFJB804w2mQoMue311Yp34h4o/H+KtrD2FyxUgOpBtKhLEYxHOBYfQjWSxHU4f C7R+0EItxiw1Hqk2T1A3g== X-UI-Out-Filterresults: notjunk:1;V01:K0:r08lQ/fvbQU=:jTB16U+2yU7pPnNwqF3SgE rTU/yAAs0CRZjffkqepoCbuitfKj16/64YmnwPS0kkOIxDCElieEfkBRrMxcLpZVK5q26ILA4 QF2Kgou1UH5cq9agGn47gG+nUE2j8O9PlnEZVOl7pxq3BqvzL186AbATladjbW4N68jJp1+RR jTR9p41lW3ofyotllDTTLKY9heRL/HmN1x0CGHbK4MWmppGamab63MtTq+3yuQNbfbHO5M/KX l6PbsFalyvCFUgqjSfGFQhWRDPVLzVjOHEyMPiN9wJ8Cmim3HNdb6NeKUed1kCCYjj5bK9Ten Pv54MlV8WUvhlpIUcx8ahzfVGA8wQjGbWTfaRY2T3lM6wF/4x7JAEsqyduq+PH+L9kdI2GIYC /YS/0d0ecNg6hzzJrgznsYcglY8cTqEvsAD8SBQ2hIKVKhF4wJ0wwzF6fUBU4kEWBeUa8eH6R AYHNz2aaSlQRmiux0MfBhBXXTB/UQzclH0pjs4OnonxQwKXD0ylwHkJEBmuFlBousdBhxLpbU k3rJcyOjrIeuV+OuRmplDE1KxzOmyKC8vnF98CJ7A4W4flOuCMlaqJJ5fL1e429FD0UM10V/e XEZDu2PdTKf13uMhQq853XHs0K9+53RZ1zOfgAqaFG07Ba49gEiDi9g9rud84DLRT9M2TV6yl upESWNxHRQc3qr6oCzrMv15hVxwVkNZpuLPMI5s8qpcr80bYh5AZ8j95A89oVxJYdTZTnVRfR RfbVidZG6bjsnmJvrHqvn0pZOjlcLJi67hw6GQ== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-10-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957512399176.54752460128327; Tue, 13 Mar 2018 09:11:52 -0700 (PDT) Received: from localhost ([::1]:40897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmWl-0003jg-DP for importer@patchew.org; Tue, 13 Mar 2018 12:11:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLa-00030P-Hh for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLV-0002z4-MM for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:18 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:48735) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLU-0002xk-AJ for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:12 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M6hai-1ehFfi3agm-00wR64; Tue, 13 Mar 2018 17:00:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:17 +0100 Message-Id: <20180313155918.23591-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:z0f5HWLpqZFoKObMUdZ3gnuGFB/y7mulx2chyQEd5bajSwh53/v yYYSEO4QPiShpb2SdYrMfZNK33rBrc9SJX2HLLu5Am+jvPzwn+2C/WEJQKmHCkglv6qrUWK AweFMYYW32ju5K3JswfIjbfLurCn4+55VvHdWdcHuWcF/x7YqxeKM0R8Khw63q5oyuLFFlN rJyXYH2DoA9oJibm8DmIQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:EVGokpSDua0=:MPK9Bstrc01T+lMcsxfqZW JhgSqOgDuHPpwKf7tjPY44ilqQyOSP7hcQAEk6bNvFMS0rtmANDiv07SGelXRF1Un+hfh75ZX 8ImnPSNS2uTDTlEx15yBl1aho9o25zCVkDE4U8HdDPUCv4k+rsvkXIDROJyoH24TsmqZ83Z1J 8EZMeVqlh9M8Q1vqxWU6jZQXDVZLyTr+q+imbj4eduzJVSwWgrV31RTXQLTviknherhe1nSkh 9yg2hDEYwBhFFbWlXqIApiCDO+6XvmIyUcZu3KCD7Bs79tSqLmwLBZnVUQdCnAo/g0r/6W+Lo rd0A0r0DIg+8UAkiWpm0Xbmf4lUtQYNILdBoUiXl0e3zf+5gyi5h9jmNxgaEw+1+1/wE8CcsP bBIlxrWt51RFi97OmidEiJpn/NSsbQs2cL7v2LcoFM8EYuzPRJb5gql5FdOEIsmmCjL3pMnY9 muPv6mQpLl3M4tcfUoR8uPIUK2MmKJhAM+a4T6QXEO7fEc8RHbkIzuTLDjealqlESv6L4z3wy RxUQBvjvlxSzX3w2FuZ6A3bt4owyt0QjTXV+SROpCGPCSgF1pMlMAB/gjrrffvIRxWSaWtYFy Kmv2PGRquQCG8AB+GMBmfDxeii42N7m/j2rVsKnogfRsV2q3QXLrerTxxL77tNxlVy+pmI+I9 mHbIHpWS/5DLgAc4xLxoL0zLUngaPkYECAB6AqJZI3gwidp0eawFd+2hFUYwhHG04Wjs4AdsQ cThAwi/8wSUNZIdzVeSJD+E7Tyogj0n+2uKw9A== 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] [PULL 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: Laurent Vivier 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 Message-Id: <20180312202728.23790-11-laurent@vivier.eu> --- 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 Fri Mar 29 10:55:10 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 1520957787822166.65699027027563; Tue, 13 Mar 2018 09:16:27 -0700 (PDT) Received: from localhost ([::1]:40945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmbD-0007n0-0W for importer@patchew.org; Tue, 13 Mar 2018 12:16:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmLb-00031q-46 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmLW-0002zT-At for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:19 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36137) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evmLV-0002yK-Ar for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:00:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MaG3Y-1fFW9T13DU-00JpcW; Tue, 13 Mar 2018 17:00:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 16:59:18 +0100 Message-Id: <20180313155918.23591-12-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313155918.23591-1-laurent@vivier.eu> References: <20180313155918.23591-1-laurent@vivier.eu> X-Provags-ID: V03:K0:kcBRsbtDeEMF0egAJyFEQsXIhZVdMmBV2OZuoih2cs+zLpeZt8o khKwnb+A4OBh3cY7hNqhkKFyWSyXMPqgNs5nmdWVJ5On20P9Gao5Q0vsSNHxGbc70+Y+Mgw i8Zq4YOdwfRuwzUeWXXuwGu0eeo0gkqLRRF6u30OzaxRDuHxm4P5mW6cY7zic9fTslk7X6D wcRm7PWW1h9LMyGx+Mr3w== X-UI-Out-Filterresults: notjunk:1;V01:K0:P8RheztN6SU=:tf9nZx2CjCBZk5dSNJZG0U 8TC/UwhaHO8xZbNO0Ed7cf5bW5YQVnAqEKqQonc7rra7HyUCo1Viqgg8QiInsggjTcRw1eKNs go3sNldtrdUm4HqxOqC3oiF2H3SgEuE/y1VFRcXa323c08RkT4E4c9mGNI9N2Y0quRoNFvTDv LSLnodbDBzUFVrEdYEthppBJyIGgjA+bugv2mVJcPMEcrToAikOtWlQZ8o0tWjicSb3h1lnme 6Xb6KfpJc/Q2C9NMZeCsmPTxWEzA8UI5h2iL9u//EgtQEIF2lQKfNUqwygT/Kcj90hwc6K/KT ennrohSHcvAu5yWAvjXTTmZKjr22F8IcAYQVPMReb1EQglCBDDE/Hawytg7dvAIyJsMvsstgU 5IJzhxPKHbtsT6vCzrZkXEQH1XYiHUU2nRQCEaE/PR92fR0/9EQ9wE1fNR+sOTWvUt9CRVSnK QcitS3d2vMrWNQiKC0NUqfMTZtgBdnzHnZuc9XJ0DmK4KT4gWyK1USAjEmAv6l/Ib7MPZiESv bNYmjdmK4GHYyn0Af6wHkTSFs302cJTQAyENQ2yPQffaTvdN4jZAezqAM9qZUYgmMpQlntXVe SnGfSmwmPTOU31HWSVTVlACJloT9dzMtMPwmdDDnkvdEelHuvRfIoQXmROM1yUvIuzVi+dtEf qtZcFnp8QsvaQVR3rLvbHBD40d/aS/yv+h4ak0CP+IUKZKvIlM6ykR5Cg7TrflVXRPINVA5R4 kBCfFK652T1s4JALsEVeL38TUQXe/MufCCKC5g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 11/11] target/m68k: implement fcosh X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+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 Message-Id: <20180312202728.23790-12-laurent@vivier.eu> --- target/m68k/fpu_helper.c | 5 +++ target/m68k/helper.h | 1 + target/m68k/softfloat.c | 81 ++++++++++++++++++++++++++++++++++++++++++++= ++++ target/m68k/softfloat.h | 1 + target/m68k/translate.c | 3 ++ 5 files changed, 91 insertions(+) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 4c969dfe00..6eeffdf9bb 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -648,3 +648,8 @@ void HELPER(fsinh)(CPUM68KState *env, FPReg *res, FPReg= *val) { res->d =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