Commit ad2aa727 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/bn/*: x86[_64] division instruction doesn't handle constants, change... 


crypto/bn/*: x86[_64] division instruction doesn't handle constants, change constraint from 'g' to 'r'.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit 68b4a6e9)
parent bbf00748

crypto/bn/asm/x86_64-gcc.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d) 
    BN_ULONG ret, waste;



 asm("divq      %4":"=a"(ret), "=d"(waste)

 :     "a"(l), "d"(h), "g"(d)

 :     "a"(l), "d"(h), "r"(d)

 :     "cc");



    return ret;

crypto/bn/bn_div.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, 
        ({  asm volatile (                      \

                "divl   %4"                     \

                : "=a"(q), "=d"(rem)            \

                : "a"(n1), "d"(n0), "g"(d0)     \

                : "a"(n1), "d"(n0), "r"(d0)     \

                : "cc");                        \

            q;                                  \

        })
@@ -120,7 +120,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, 
        ({  asm volatile (                      \

                "divq   %4"                     \

                : "=a"(q), "=d"(rem)            \

                : "a"(n1), "d"(n0), "g"(d0)     \

                : "a"(n1), "d"(n0), "r"(d0)     \

                : "cc");                        \

            q;                                  \

        })