security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-07 23:27:48 +02:00
Code Activity

Revert last two changes and replace by code from libgcrypt 1.4.6.

Browse Source
This commit is contained in:
Werner Koch 2010-12-23 19:05:31 +00:00
parent 933adc0850
commit 36366dab85
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mpi/ChangeLog
View File

@ -1,3 +1,8 @@
2010-10-28 Werner Koch <wk@g10code.com>
* longlong.h: Revert last two changes and replace by code from
libgcrypt 1.4.6.
2010-10-22 Jason Woodward <jason.woodward@timesys.com> (wk)
* longlong.h (umul_ppmm) [mips32]: Fix typo.

26
mpi/longlong.h
View File

@ -710,12 +710,13 @@ extern USItype __udiv_qrnnd ();
************** MIPS *****************
***************************************/
#if defined (__mips__) && W_TYPE_SIZE == 32
#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 )
#define umul_ppmm(w1, w0, u, v) \
#if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
#define umul_ppmm(w1, w0, u, v) \
do { \
UDItype __ll = (UDItype)(u) * (v); \
w1 = __ll >> 32; \
w0 = __ll; \
UDItype _r; \
_r = (UDItype) u * v; \
(w1) = _r >> 32; \
(w0) = (USItype) _r; \
} while (0)
#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
#define umul_ppmm(w1, w0, u, v) \
@ -742,14 +743,15 @@ extern USItype __udiv_qrnnd ();
************** MIPS/64 **************
***************************************/
#if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
# if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 )
# if (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
typedef unsigned int UTItype __attribute__ ((mode (TI)));
# 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)
do { \
UTItype _r; \
_r = (UTItype) u * v; \
(w1) = _r >> 64; \
(w0) = (UDItype) _r; \
} while (0)
# elif if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
# define umul_ppmm(w1, w0, u, v) \
__asm__ ("dmultu %2,%3" \