Commit a6e8c1da authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.11-pull-request' into staging 



# gpg: Signature made Sun 10 Sep 2017 17:17:28 BST
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-2.11-pull-request:
  target/m68k: Switch fpu_rom from make_floatx80() to make_floatx80_init()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fcea7370 6fa9ba09

target/m68k/fpu_helper.c

+22 −22
Original line number Diff line number Diff line
@@ -29,28 +29,28 @@ 
 */



static const floatx80 fpu_rom[128] = {

    [0x00] = floatx80_pi,                                   /* Pi */

    [0x0b] = make_floatx80(0x3ffd, 0x9a209a84fbcff798ULL),  /* Log10(2) */

    [0x0c] = make_floatx80(0x4000, 0xadf85458a2bb4a9aULL),  /* e        */

    [0x0d] = make_floatx80(0x3fff, 0xb8aa3b295c17f0bcULL),  /* Log2(e)  */

    [0x0e] = make_floatx80(0x3ffd, 0xde5bd8a937287195ULL),  /* Log10(e) */

    [0x0f] = floatx80_zero,                                 /* Zero     */

    [0x30] = floatx80_ln2,                                  /* ln(2)    */

    [0x31] = make_floatx80(0x4000, 0x935d8dddaaa8ac17ULL),  /* ln(10)   */

    [0x32] = floatx80_one,                                  /* 10^0     */

    [0x33] = make_floatx80(0x4002, 0xa000000000000000ULL),  /* 10^1     */

    [0x34] = make_floatx80(0x4005, 0xc800000000000000ULL),  /* 10^2     */

    [0x35] = make_floatx80(0x400c, 0x9c40000000000000ULL),  /* 10^4     */

    [0x36] = make_floatx80(0x4019, 0xbebc200000000000ULL),  /* 10^8     */

    [0x37] = make_floatx80(0x4034, 0x8e1bc9bf04000000ULL),  /* 10^16    */

    [0x38] = make_floatx80(0x4069, 0x9dc5ada82b70b59eULL),  /* 10^32    */

    [0x39] = make_floatx80(0x40d3, 0xc2781f49ffcfa6d5ULL),  /* 10^64    */

    [0x3a] = make_floatx80(0x41a8, 0x93ba47c980e98ce0ULL),  /* 10^128   */

    [0x3b] = make_floatx80(0x4351, 0xaa7eebfb9df9de8eULL),  /* 10^256   */

    [0x3c] = make_floatx80(0x46a3, 0xe319a0aea60e91c7ULL),  /* 10^512   */

    [0x3d] = make_floatx80(0x4d48, 0xc976758681750c17ULL),  /* 10^1024  */

    [0x3e] = make_floatx80(0x5a92, 0x9e8b3b5dc53d5de5ULL),  /* 10^2048  */

    [0x3f] = make_floatx80(0x7525, 0xc46052028a20979bULL),  /* 10^4096  */

    [0x00] = make_floatx80_init(0x4000, 0xc90fdaa22168c235ULL),  /* Pi       */

    [0x0b] = make_floatx80_init(0x3ffd, 0x9a209a84fbcff798ULL),  /* Log10(2) */

    [0x0c] = make_floatx80_init(0x4000, 0xadf85458a2bb4a9aULL),  /* e        */

    [0x0d] = make_floatx80_init(0x3fff, 0xb8aa3b295c17f0bcULL),  /* Log2(e)  */

    [0x0e] = make_floatx80_init(0x3ffd, 0xde5bd8a937287195ULL),  /* Log10(e) */

    [0x0f] = make_floatx80_init(0x0000, 0x0000000000000000ULL),  /* Zero     */

    [0x30] = make_floatx80_init(0x3ffe, 0xb17217f7d1cf79acULL),  /* ln(2)    */

    [0x31] = make_floatx80_init(0x4000, 0x935d8dddaaa8ac17ULL),  /* ln(10)   */

    [0x32] = make_floatx80_init(0x3fff, 0x8000000000000000ULL),  /* 10^0     */

    [0x33] = make_floatx80_init(0x4002, 0xa000000000000000ULL),  /* 10^1     */

    [0x34] = make_floatx80_init(0x4005, 0xc800000000000000ULL),  /* 10^2     */

    [0x35] = make_floatx80_init(0x400c, 0x9c40000000000000ULL),  /* 10^4     */

    [0x36] = make_floatx80_init(0x4019, 0xbebc200000000000ULL),  /* 10^8     */

    [0x37] = make_floatx80_init(0x4034, 0x8e1bc9bf04000000ULL),  /* 10^16    */

    [0x38] = make_floatx80_init(0x4069, 0x9dc5ada82b70b59eULL),  /* 10^32    */

    [0x39] = make_floatx80_init(0x40d3, 0xc2781f49ffcfa6d5ULL),  /* 10^64    */

    [0x3a] = make_floatx80_init(0x41a8, 0x93ba47c980e98ce0ULL),  /* 10^128   */

    [0x3b] = make_floatx80_init(0x4351, 0xaa7eebfb9df9de8eULL),  /* 10^256   */

    [0x3c] = make_floatx80_init(0x46a3, 0xe319a0aea60e91c7ULL),  /* 10^512   */

    [0x3d] = make_floatx80_init(0x4d48, 0xc976758681750c17ULL),  /* 10^1024  */

    [0x3e] = make_floatx80_init(0x5a92, 0x9e8b3b5dc53d5de5ULL),  /* 10^2048  */

    [0x3f] = make_floatx80_init(0x7525, 0xc46052028a20979bULL),  /* 10^4096  */

};



int32_t HELPER(reds32)(CPUM68KState *env, FPReg *val)