From nobody Tue Feb 10 13:18:07 2026 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