1 files changed, 133 insertions, 133 deletions
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c
index fd86704..e80d98b 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c
@@ -1,133 +1,133 @@
-/* mpih-w-sdiv -- implement udiv_qrnnd on machines with only signed
+/* mpih-w-sdiv -- implement udiv_qrnnd on machines with only signed
- *                division.
+ *                division.
- * Copyright (C) 1992, 1994, 1996, 1998, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1996, 1998, 2002 Free Software Foundation, Inc.
- * Contributed by Peter L. Montgomery.
+ * Contributed by Peter L. Montgomery.
- *
+ *
- * This file is part of Libgcrypt.
+ * This file is part of Libgcrypt.
- *
+ *
- * Libgcrypt is free software; you can redistribute it and/or modify
+ * Libgcrypt is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
+ * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
+ * the License, or (at your option) any later version.
- *
+ *
- * Libgcrypt is distributed in the hope that it will be useful,
+ * Libgcrypt is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
+ * GNU Lesser General Public License for more details.
- *
+ *
- * You should have received a copy of the GNU Lesser General Public
+ * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
+ * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+ */
-#include <config.h>
+#include <config.h>
-#include <stdio.h>
+#include <stdio.h>
-#include <stdlib.h>
+#include <stdlib.h>
-#include "mpi-internal.h"
+#include "mpi-internal.h"
-#include "longlong.h"
+#include "longlong.h"
-#if 0  /* not yet ported to MPI */
+#if 0  /* not yet ported to MPI */
-mpi_limb_t
+mpi_limb_t
-mpihelp_udiv_w_sdiv( mpi_limp_t *rp,
+mpihelp_udiv_w_sdiv( mpi_limp_t *rp,
-                     mpi_limp_t *a1,
+                     mpi_limp_t *a1,
-                     mpi_limp_t *a0,
+                     mpi_limp_t *a0,
-                     mpi_limp_t *d   )
+                     mpi_limp_t *d   )
-{
+{
-  mp_limb_t q, r;
+  mp_limb_t q, r;
-  mp_limb_t c0, c1, b1;
+  mp_limb_t c0, c1, b1;
-  if ((mpi_limb_signed_t) d >= 0)
+  if ((mpi_limb_signed_t) d >= 0)
-    {
+    {
-      if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))
+      if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))
-        {
+        {
-          /* dividend, divisor, and quotient are nonnegative */
+          /* dividend, divisor, and quotient are nonnegative */
-          sdiv_qrnnd (q, r, a1, a0, d);
+          sdiv_qrnnd (q, r, a1, a0, d);
-        }
+        }
-      else
+      else
-        {
+        {
-          /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */
+          /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */
-          sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));
+          sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));
-          /* Divide (c1*2^32 + c0) by d */
+          /* Divide (c1*2^32 + c0) by d */
-          sdiv_qrnnd (q, r, c1, c0, d);
+          sdiv_qrnnd (q, r, c1, c0, d);
-          /* Add 2^31 to quotient */
+          /* Add 2^31 to quotient */
-          q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);
+          q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);
-        }
+        }
-    }
+    }
-  else
+  else
-    {
+    {
-      b1 = d >> 1;                      /* d/2, between 2^30 and 2^31 - 1 */
+      b1 = d >> 1;                      /* d/2, between 2^30 and 2^31 - 1 */
-      c1 = a1 >> 1;                     /* A/2 */
+      c1 = a1 >> 1;                     /* A/2 */
-      c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);
+      c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);
-      if (a1 < b1)                      /* A < 2^32*b1, so A/2 < 2^31*b1 */
+      if (a1 < b1)                      /* A < 2^32*b1, so A/2 < 2^31*b1 */
-        {
+        {
-          sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
+          sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
-          r = 2*r + (a0 & 1);           /* Remainder from A/(2*b1) */
+          r = 2*r + (a0 & 1);           /* Remainder from A/(2*b1) */
-          if ((d & 1) != 0)
+          if ((d & 1) != 0)
-            {
+            {
-              if (r >= q)
+              if (r >= q)
-                r = r - q;
+                r = r - q;
-              else if (q - r <= d)
+              else if (q - r <= d)
-                {
+                {
-                  r = r - q + d;
+                  r = r - q + d;
-                  q--;
+                  q--;
-                }
+                }
-              else
+              else
-                {
+                {
-                  r = r - q + 2*d;
+                  r = r - q + 2*d;
-                  q -= 2;
+                  q -= 2;
-                }
+                }
-            }
+            }
-        }
+        }
-      else if (c1 < b1)                 /* So 2^31 <= (A/2)/b1 < 2^32 */
+      else if (c1 < b1)                 /* So 2^31 <= (A/2)/b1 < 2^32 */
-        {
+        {
-          c1 = (b1 - 1) - c1;
+          c1 = (b1 - 1) - c1;
-          c0 = ~c0;                     /* logical NOT */
+          c0 = ~c0;                     /* logical NOT */
-          sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
+          sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
-          q = ~q;                       /* (A/2)/b1 */
+          q = ~q;                       /* (A/2)/b1 */
-          r = (b1 - 1) - r;
+          r = (b1 - 1) - r;
-          r = 2*r + (a0 & 1);           /* A/(2*b1) */
+          r = 2*r + (a0 & 1);           /* A/(2*b1) */
-          if ((d & 1) != 0)
+          if ((d & 1) != 0)
-            {
+            {
-              if (r >= q)
+              if (r >= q)
-                r = r - q;
+                r = r - q;
-              else if (q - r <= d)
+              else if (q - r <= d)
-                {
+                {
-                  r = r - q + d;
+                  r = r - q + d;
-                  q--;
+                  q--;
-                }
+                }
-              else
+              else
-                {
+                {
-                  r = r - q + 2*d;
+                  r = r - q + 2*d;
-                  q -= 2;
+                  q -= 2;
-                }
+                }
-            }
+            }
-        }
+        }
-      else                              /* Implies c1 = b1 */
+      else                              /* Implies c1 = b1 */
-        {                               /* Hence a1 = d - 1 = 2*b1 - 1 */
+        {                               /* Hence a1 = d - 1 = 2*b1 - 1 */
-          if (a0 >= -d)
+          if (a0 >= -d)
-            {
+            {
-              q = -1;
+              q = -1;
-              r = a0 + d;
+              r = a0 + d;
-            }
+            }
-          else
+          else
-            {
+            {
-              q = -2;
+              q = -2;
-              r = a0 + 2*d;
+              r = a0 + 2*d;
-            }
+            }
-        }
+        }
-    }
+    }
-  *rp = r;
+  *rp = r;
-  return q;
+  return q;
-}
+}
-#endif
+#endif

diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c index fd86704..e80d98b 100755..100644 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/mpi/generic/udiv-w-sdiv.c
@@ -1,133 +1,133 @@
1	/* mpih-w-sdiv -- implement udiv_qrnnd on machines with only signed	1	/* mpih-w-sdiv -- implement udiv_qrnnd on machines with only signed
2	* division.	2	* division.
3	* Copyright (C) 1992, 1994, 1996, 1998, 2002 Free Software Foundation, Inc.	3	* Copyright (C) 1992, 1994, 1996, 1998, 2002 Free Software Foundation, Inc.
4	* Contributed by Peter L. Montgomery.	4	* Contributed by Peter L. Montgomery.
5	*	5	*
6	* This file is part of Libgcrypt.	6	* This file is part of Libgcrypt.
7	*	7	*
8	* Libgcrypt is free software; you can redistribute it and/or modify	8	* Libgcrypt is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU Lesser General Public License as	9	* it under the terms of the GNU Lesser General Public License as
10	* published by the Free Software Foundation; either version 2.1 of	10	* published by the Free Software Foundation; either version 2.1 of
11	* the License, or (at your option) any later version.	11	* the License, or (at your option) any later version.
12	*	12	*
13	* Libgcrypt is distributed in the hope that it will be useful,	13	* Libgcrypt is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU Lesser General Public License for more details.	16	* GNU Lesser General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU Lesser General Public	18	* You should have received a copy of the GNU Lesser General Public
19	* License along with this program; if not, write to the Free Software	19	* License along with this program; if not, write to the Free Software
20	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA	20	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
21	*/	21	*/
22		22
23	#include <config.h>	23	#include <config.h>
24	#include <stdio.h>	24	#include <stdio.h>
25	#include <stdlib.h>	25	#include <stdlib.h>
26	#include "mpi-internal.h"	26	#include "mpi-internal.h"
27	#include "longlong.h"	27	#include "longlong.h"
28		28
29		29
30	#if 0 /* not yet ported to MPI */	30	#if 0 /* not yet ported to MPI */
31		31
32	mpi_limb_t	32	mpi_limb_t
33	mpihelp_udiv_w_sdiv( mpi_limp_t *rp,	33	mpihelp_udiv_w_sdiv( mpi_limp_t *rp,
34	mpi_limp_t *a1,	34	mpi_limp_t *a1,
35	mpi_limp_t *a0,	35	mpi_limp_t *a0,
36	mpi_limp_t *d )	36	mpi_limp_t *d )
37	{	37	{
38	mp_limb_t q, r;	38	mp_limb_t q, r;
39	mp_limb_t c0, c1, b1;	39	mp_limb_t c0, c1, b1;
40		40
41	if ((mpi_limb_signed_t) d >= 0)	41	if ((mpi_limb_signed_t) d >= 0)
42	{	42	{
43	if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))	43	if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))
44	{	44	{
45	/* dividend, divisor, and quotient are nonnegative */	45	/* dividend, divisor, and quotient are nonnegative */
46	sdiv_qrnnd (q, r, a1, a0, d);	46	sdiv_qrnnd (q, r, a1, a0, d);
47	}	47	}
48	else	48	else
49	{	49	{
50	/* Compute c12^32 + c0 = a12^32 + a0 - 2^31d /	50	/* Compute c12^32 + c0 = a12^32 + a0 - 2^31d /
51	sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));	51	sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));
52	/* Divide (c12^32 + c0) by d /	52	/* Divide (c12^32 + c0) by d /
53	sdiv_qrnnd (q, r, c1, c0, d);	53	sdiv_qrnnd (q, r, c1, c0, d);
54	/* Add 2^31 to quotient */	54	/* Add 2^31 to quotient */
55	q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);	55	q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);
56	}	56	}
57	}	57	}
58	else	58	else
59	{	59	{
60	b1 = d >> 1; /* d/2, between 2^30 and 2^31 - 1 */	60	b1 = d >> 1; /* d/2, between 2^30 and 2^31 - 1 */
61	c1 = a1 >> 1; /* A/2 */	61	c1 = a1 >> 1; /* A/2 */
62	c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);	62	c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);
63		63
64	if (a1 < b1) /* A < 2^32b1, so A/2 < 2^31b1 */	64	if (a1 < b1) /* A < 2^32b1, so A/2 < 2^31b1 */
65	{	65	{
66	sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */	66	sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
67		67
68	r = 2r + (a0 & 1); / Remainder from A/(2b1) /	68	r = 2r + (a0 & 1); / Remainder from A/(2b1) /
69	if ((d & 1) != 0)	69	if ((d & 1) != 0)
70	{	70	{
71	if (r >= q)	71	if (r >= q)
72	r = r - q;	72	r = r - q;
73	else if (q - r <= d)	73	else if (q - r <= d)
74	{	74	{
75	r = r - q + d;	75	r = r - q + d;
76	q--;	76	q--;
77	}	77	}
78	else	78	else
79	{	79	{
80	r = r - q + 2*d;	80	r = r - q + 2*d;
81	q -= 2;	81	q -= 2;
82	}	82	}
83	}	83	}
84	}	84	}
85	else if (c1 < b1) /* So 2^31 <= (A/2)/b1 < 2^32 */	85	else if (c1 < b1) /* So 2^31 <= (A/2)/b1 < 2^32 */
86	{	86	{
87	c1 = (b1 - 1) - c1;	87	c1 = (b1 - 1) - c1;
88	c0 = ~c0; /* logical NOT */	88	c0 = ~c0; /* logical NOT */
89		89
90	sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */	90	sdiv_qrnnd (q, r, c1, c0, b1); /* (A/2) / (d/2) */
91		91
92	q = ~q; /* (A/2)/b1 */	92	q = ~q; /* (A/2)/b1 */
93	r = (b1 - 1) - r;	93	r = (b1 - 1) - r;
94		94
95	r = 2r + (a0 & 1); / A/(2b1) /	95	r = 2r + (a0 & 1); / A/(2b1) /
96		96
97	if ((d & 1) != 0)	97	if ((d & 1) != 0)
98	{	98	{
99	if (r >= q)	99	if (r >= q)
100	r = r - q;	100	r = r - q;
101	else if (q - r <= d)	101	else if (q - r <= d)
102	{	102	{
103	r = r - q + d;	103	r = r - q + d;
104	q--;	104	q--;
105	}	105	}
106	else	106	else
107	{	107	{
108	r = r - q + 2*d;	108	r = r - q + 2*d;
109	q -= 2;	109	q -= 2;
110	}	110	}
111	}	111	}
112	}	112	}
113	else /* Implies c1 = b1 */	113	else /* Implies c1 = b1 */
114	{ /* Hence a1 = d - 1 = 2b1 - 1 /	114	{ /* Hence a1 = d - 1 = 2b1 - 1 /
115	if (a0 >= -d)	115	if (a0 >= -d)
116	{	116	{
117	q = -1;	117	q = -1;
118	r = a0 + d;	118	r = a0 + d;
119	}	119	}
120	else	120	else
121	{	121	{
122	q = -2;	122	q = -2;
123	r = a0 + 2*d;	123	r = a0 + 2*d;
124	}	124	}
125	}	125	}
126	}	126	}
127		127
128	*rp = r;	128	*rp = r;
129	return q;	129	return q;
130	}	130	}
131		131
132	#endif	132	#endif
133		133