diff options
| author | Werner Koch <[email protected]> | 2010-10-22 07:35:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-10-22 07:35:30 +0000 |
| commit | f7ab9d61bfc5e501260a0628b754910be40ad898 (patch) | |
| tree | 3682a72dcde7b77e7f7d0c35e18315887a80aa57 | |
| parent | Remove warnings on VMS (diff) | |
| download | gnupg-f7ab9d61bfc5e501260a0628b754910be40ad898.tar.gz gnupg-f7ab9d61bfc5e501260a0628b754910be40ad898.zip | |
mips fixes
| -rw-r--r-- | mpi/ChangeLog | 5 | ||||
| -rw-r--r-- | mpi/longlong.h | 52 |
2 files changed, 35 insertions, 22 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 509f2f424..a154d354a 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2010-10-22 Jason Woodward <[email protected]> (wk) + + * longlong.h (umul_ppmm) [mips32]: Fix typo. + (umul_ppmm) [mips64]: Don't use =h with gcc >= 4.4. + 2010-06-01 Werner Koch <[email protected]> * longlong.h (umul_ppmm) <__mips__>: Add code for gcc 4.4. This diff --git a/mpi/longlong.h b/mpi/longlong.h index aeecf1e68..147986f3e 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -710,7 +710,7 @@ extern USItype __udiv_qrnnd (); ************** MIPS ***************** ***************************************/ #if defined (__mips__) && W_TYPE_SIZE == 32 -#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR >= 4 ) +#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) #define umul_ppmm(w1, w0, u, v) \ do { \ UDItype __ll = (UDItype)(u) * (v); \ @@ -727,8 +727,8 @@ extern USItype __udiv_qrnnd (); #else #define umul_ppmm(w1, w0, u, v) \ __asm__ ("multu %2,%3 \n" \ - "mflo %0 \n" \ - "mfhi %1" \ + "mflo %0 \n" \ + "mfhi %1" \ : "=d" ((USItype)(w0)), \ "=d" ((USItype)(w1)) \ : "d" ((USItype)(u)), \ @@ -742,25 +742,33 @@ extern USItype __udiv_qrnnd (); ************** MIPS/64 ************** ***************************************/ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 -#define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3" \ - : "=l" ((UDItype)(w0)), \ - "=h" ((UDItype)(w1)) \ - : "d" ((UDItype)(u)), \ - "d" ((UDItype)(v))) -#else -#define umul_ppmm(w1, w0, u, v) \ - __asm__ ("dmultu %2,%3 \n" \ - "mflo %0 \n" \ - "mfhi %1" \ - : "=d" ((UDItype)(w0)), \ - "=d" ((UDItype)(w1)) \ - : "d" ((UDItype)(u)), \ - "d" ((UDItype)(v))) -#endif -#define UMUL_TIME 20 -#define UDIV_TIME 140 +# if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) +# define umul_ppmm(w1, w0, u, v) \ + do { \ + typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ + __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ + w1 = __ll >> 64; \ + w0 = __ll; \ + } while (0) +# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 +# define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3" \ + : "=l" ((UDItype)(w0)), \ + "=h" ((UDItype)(w1)) \ + : "d" ((UDItype)(u)), \ + "d" ((UDItype)(v))) +# else +# define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3 \n" \ + "mflo %0 \n" \ + "mfhi %1" \ + : "=d" ((UDItype)(w0)), \ + "=d" ((UDItype)(w1)) \ + : "d" ((UDItype)(u)), \ + "d" ((UDItype)(v))) +# endif +# define UMUL_TIME 20 +# define UDIV_TIME 140 #endif /* __mips__ */ |