Module Name: src Committed By: matt Date: Mon Jul 30 18:40:36 UTC 2012
Modified Files: src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lcl.h Log Message: Fix mips asm to not use outdated stuff. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h diff -u src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h:1.1.1.2 src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h:1.2 --- src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h:1.1.1.2 Thu Jul 26 15:00:11 2012 +++ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h Mon Jul 30 18:40:36 2012 @@ -284,14 +284,17 @@ extern "C" { # if defined(__GNUC__) && __GNUC__>=2 # define BN_UMULT_HIGH(a,b) ({ \ register BN_ULONG ret; \ - asm ("dmultu %1,%2" \ - : "=h"(ret) \ - : "r"(a), "r"(b) : "l"); \ + asm ("dmultu %1,%2" "\n\t" \ + "mfhi %0" "\n\t" \ + : "=r"(ret) \ + : "r"(a), "r"(b) : "lo", "hi"); \ ret; }) # define BN_UMULT_LOHI(low,high,a,b) \ - asm ("dmultu %2,%3" \ - : "=l"(low),"=h"(high) \ - : "r"(a), "r"(b)); + asm ("dmultu %2,%3" "\n\t" \ + "mflo %0" "\n\t" \ + "mfhi %1" "\n\t" \ + : "=r"(low),"=r"(high) \ + : "r"(a), "r"(b) : "lo", "hi"); # endif # endif /* cpu */ #endif /* OPENSSL_NO_ASM */