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

Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging 



Only use divdeu insn with Power7 and later.

# gpg: Signature made Sun 04 Nov 2018 10:05:50 GMT
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-softfloat-20181104:
  softfloat: Don't execute divdeu without power7

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7d56239f 7370981b

include/fpu/softfloat-macros.h

+2 −2
Original line number Diff line number Diff line
@@ -647,8 +647,8 @@ static inline uint64_t udiv_qrnnd(uint64_t *r, uint64_t n1, 
    asm("dlgr %0, %1" : "+r"(n) : "r"(d));

    *r = n >> 64;

    return n;

#elif defined(_ARCH_PPC64)

    /* From Power ISA 3.0B, programming note for divdeu.  */

#elif defined(_ARCH_PPC64) && defined(_ARCH_PWR7)

    /* From Power ISA 2.06, programming note for divdeu.  */

    uint64_t q1, q2, Q, r1, r2, R;

    asm("divdeu %0,%2,%4; divdu %1,%3,%4"

        : "=&r"(q1), "=r"(q2)