$NetBSD: patch-al,v 1.1 2000/03/20 02:25:36 itojun Exp $

--- gmp-2.0.2-ssh-2/longlong.h.orig	Wed Apr 29 19:32:35 1998
+++ gmp-2.0.2-ssh-2/longlong.h	Tue Dec 14 23:03:54 1999
@@ -190,26 +190,40 @@
 	     "rI" ((USItype)(bh)),					\
 	     "r" ((USItype)(al)),					\
 	     "rI" ((USItype)(bl)))
+#if defined(__ARM_ARCH_3M__) || defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+/* Use umull if available */
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
-	mov	%|r0, %2, lsr #16
-	mov	%|r2, %3, lsr #16
-	bic	%|r1, %2, %|r0, lsl #16
-	bic	%|r2, %3, %|r2, lsl #16
-	mul	%1, %|r1, %|r2
-	mul	%|r2, %|r0, %|r2
-	mul	%|r1, %0, %|r1
-	mul	%0, %|r0, %0
-	adds	%|r1, %|r2, %|r1
+	umull	%0, %1, %2, %3"						\
+	   : "=&r" ((USItype) (xl)),					\
+	     "=&r" ((USItype) (xh))					\
+	   : "r" ((USItype) (a)),					\
+	     "r" ((USItype) (b)))
+#define UMUL_TIME 4
+#else /* umull */
+#define umul_ppmm(xh, xl, a, b) \
+do {register USItype __t0, __t1, __t2;					\
+  __asm__ ("%@ Inlined umul_ppmm
+	mov	%2, %5, lsr #16
+	mov	%0, %6, lsr #16
+	bic	%3, %5, %2, lsl #16
+	bic	%4, %6, %0, lsl #16
+	mul	%1, %3, %4
+	mul	%4, %2, %4
+	mul	%3, %0, %3
+	mul	%0, %2, %0
+	adds	%3, %4, %3
 	addcs	%0, %0, #65536
-	adds	%1, %1, %|r1, lsl #16
-	adc	%0, %0, %|r1, lsr #16"					\
-	   : "=&r" ((USItype)(xh)),					\
-	     "=r" ((USItype)(xl))					\
-	   : "r" ((USItype)(a)),					\
-	     "r" ((USItype)(b))						\
-	   : "r0", "r1", "r2")
+	adds	%1, %1, %3, lsl #16
+	adc	%0, %0, %3, lsr #16"					\
+           : "=&r" ((USItype) (xh)),					\
+             "=r" ((USItype) (xl)),					\
+             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)			\
+           : "r" ((USItype) (a)),					\
+             "r" ((USItype) (b)));} while (0)
+
 #define UMUL_TIME 20
+#endif /* umull */
 #define UDIV_TIME 100
 #endif /* __arm__ */
 
@@ -719,7 +733,7 @@
 	     "g" ((USItype)(d)));					\
   (r) = __xx.__i.__l; (q) = __xx.__i.__h; })
 #define count_trailing_zeros(count,x) \
-  do {
+  do {									\
     __asm__ ("ffsd	%2,%0"						\
 	     : "=r" ((USItype) (count))					\
 	     : "0" ((USItype) 0),					\