Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/ecl/ecl_gf.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mpi.h"
 #include "mp_gf2m.h"
 #include "ecl-priv.h"
 #include "mpi-priv.h"
 #include <stdlib.h>
 
@@ skipping 224 matching lines @@
         switch(MP_USED(b)) {
         case 3:
                 r2 = MP_DIGIT(b,2);
         case 2:
                 r1 = MP_DIGIT(b,1);
         case 1:
                 r0 = MP_DIGIT(b,0);
         }
 
 #ifndef MPI_AMD64_ADD
-        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
-        MP_ADD_CARRY(a1, r1, r1, carry, carry);
-        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+        carry = 0;
+        MP_ADD_CARRY(a0, r0, r0, carry);
+        MP_ADD_CARRY(a1, r1, r1, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry);
 #else
         __asm__ (
                 "xorq   %3,%3           \n\t"
                 "addq   %4,%0           \n\t"
                 "adcq   %5,%1           \n\t"
                 "adcq   %6,%2           \n\t"
                 "adcq   $0,%3           \n\t"
                 : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(carry)
                 : "r" (a0), "r" (a1), "r" (a2),
                   "0" (r0), "1" (r1), "2" (r2)
                 : "%cc" );
 #endif
 
         MP_CHECKOK(s_mp_pad(r, 3));
         MP_DIGIT(r, 2) = r2;
         MP_DIGIT(r, 1) = r1;
         MP_DIGIT(r, 0) = r0;
         MP_SIGN(r) = MP_ZPOS;
         MP_USED(r) = 3;
 
         /* Do quick 'subract' if we've gone over 
          * (add the 2's complement of the curve field) */
          a2 = MP_DIGIT(&meth->irr,2);
         if (carry ||  r2 >  a2 ||
                 ((r2 == a2) && mp_cmp(r,&meth->irr) != MP_LT)) {
                 a1 = MP_DIGIT(&meth->irr,1);
                 a0 = MP_DIGIT(&meth->irr,0);
 #ifndef MPI_AMD64_ADD
-                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a1, r1, carry, carry);
-                MP_SUB_BORROW(r2, a2, r2, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a0, r0, carry);
+                MP_SUB_BORROW(r1, a1, r1, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry);
 #else
                 __asm__ (
                         "subq   %3,%0           \n\t"
                         "sbbq   %4,%1           \n\t"
                         "sbbq   %5,%2           \n\t"
                         : "=r"(r0), "=r"(r1), "=r"(r2)
                         : "r" (a0), "r" (a1), "r" (a2),
                           "0" (r0), "1" (r1), "2" (r2)
                         : "%cc" );
 #endif
@@ skipping 33 matching lines @@
                 r3 = MP_DIGIT(b,3);
         case 3:
                 r2 = MP_DIGIT(b,2);
         case 2:
                 r1 = MP_DIGIT(b,1);
         case 1:
                 r0 = MP_DIGIT(b,0);
         }
 
 #ifndef MPI_AMD64_ADD
-        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
-        MP_ADD_CARRY(a1, r1, r1, carry, carry);
-        MP_ADD_CARRY(a2, r2, r2, carry, carry);
-        MP_ADD_CARRY(a3, r3, r3, carry, carry);
+        carry = 0;
+        MP_ADD_CARRY(a0, r0, r0, carry);
+        MP_ADD_CARRY(a1, r1, r1, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry);
 #else
         __asm__ (
                 "xorq   %4,%4           \n\t"
                 "addq   %5,%0           \n\t"
                 "adcq   %6,%1           \n\t"
                 "adcq   %7,%2           \n\t"
                 "adcq   %8,%3           \n\t"
                 "adcq   $0,%4           \n\t"
                 : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r"(carry)
                 : "r" (a0), "r" (a1), "r" (a2), "r" (a3),
@@ skipping 11 matching lines @@
 
         /* Do quick 'subract' if we've gone over 
          * (add the 2's complement of the curve field) */
          a3 = MP_DIGIT(&meth->irr,3);
         if (carry ||  r3 >  a3 ||
                 ((r3 == a3) && mp_cmp(r,&meth->irr) != MP_LT)) {
                 a2 = MP_DIGIT(&meth->irr,2);
                 a1 = MP_DIGIT(&meth->irr,1);
                 a0 = MP_DIGIT(&meth->irr,0);
 #ifndef MPI_AMD64_ADD
-                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a1, r1, carry, carry);
-                MP_SUB_BORROW(r2, a2, r2, carry, carry);
-                MP_SUB_BORROW(r3, a3, r3, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a0, r0, carry);
+                MP_SUB_BORROW(r1, a1, r1, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry);
 #else
                 __asm__ (
                         "subq   %4,%0           \n\t"
                         "sbbq   %5,%1           \n\t"
                         "sbbq   %6,%2           \n\t"
                         "sbbq   %7,%3           \n\t"
                         : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3)
                         : "r" (a0), "r" (a1), "r" (a2), "r" (a3),
                           "0" (r0), "1" (r1), "2" (r2), "3" (r3)
                         : "%cc" );
@@ skipping 38 matching lines @@
         case 4:
                 r3 = MP_DIGIT(b,3);
         case 3:
                 r2 = MP_DIGIT(b,2);
         case 2:
                 r1 = MP_DIGIT(b,1);
         case 1:
                 r0 = MP_DIGIT(b,0);
         }
 
-        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
-        MP_ADD_CARRY(a1, r1, r1, carry, carry);
-        MP_ADD_CARRY(a2, r2, r2, carry, carry);
-        MP_ADD_CARRY(a3, r3, r3, carry, carry);
-        MP_ADD_CARRY(a4, r4, r4, carry, carry);
+        carry = 0;
+        MP_ADD_CARRY(a0, r0, r0, carry);
+        MP_ADD_CARRY(a1, r1, r1, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry);
+        MP_ADD_CARRY(a4, r4, r4, carry);
 
         MP_CHECKOK(s_mp_pad(r, 5));
         MP_DIGIT(r, 4) = r4;
         MP_DIGIT(r, 3) = r3;
         MP_DIGIT(r, 2) = r2;
         MP_DIGIT(r, 1) = r1;
         MP_DIGIT(r, 0) = r0;
         MP_SIGN(r) = MP_ZPOS;
         MP_USED(r) = 5;
 
         /* Do quick 'subract' if we've gone over 
          * (add the 2's complement of the curve field) */
          a4 = MP_DIGIT(&meth->irr,4);
         if (carry ||  r4 >  a4 ||
                 ((r4 == a4) && mp_cmp(r,&meth->irr) != MP_LT)) {
                 a3 = MP_DIGIT(&meth->irr,3);
                 a2 = MP_DIGIT(&meth->irr,2);
                 a1 = MP_DIGIT(&meth->irr,1);
                 a0 = MP_DIGIT(&meth->irr,0);
-                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a1, r1, carry, carry);
-                MP_SUB_BORROW(r2, a2, r2, carry, carry);
-                MP_SUB_BORROW(r3, a3, r3, carry, carry);
-                MP_SUB_BORROW(r4, a4, r4, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a0, r0, carry);
+                MP_SUB_BORROW(r1, a1, r1, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry);
+                MP_SUB_BORROW(r4, a4, r4, carry);
                 MP_DIGIT(r, 4) = r4;
                 MP_DIGIT(r, 3) = r3;
                 MP_DIGIT(r, 2) = r2;
                 MP_DIGIT(r, 1) = r1;
                 MP_DIGIT(r, 0) = r0;
         }
         
         s_mp_clamp(r);
 
   CLEANUP:
@@ skipping 32 matching lines @@
         case 4:
                 r3 = MP_DIGIT(b,3);
         case 3:
                 r2 = MP_DIGIT(b,2);
         case 2:
                 r1 = MP_DIGIT(b,1);
         case 1:
                 r0 = MP_DIGIT(b,0);
         }
 
-        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
-        MP_ADD_CARRY(a1, r1, r1, carry, carry);
-        MP_ADD_CARRY(a2, r2, r2, carry, carry);
-        MP_ADD_CARRY(a3, r3, r3, carry, carry);
-        MP_ADD_CARRY(a4, r4, r4, carry, carry);
-        MP_ADD_CARRY(a5, r5, r5, carry, carry);
+        carry = 0;
+        MP_ADD_CARRY(a0, r0, r0, carry);
+        MP_ADD_CARRY(a1, r1, r1, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry);
+        MP_ADD_CARRY(a4, r4, r4, carry);
+        MP_ADD_CARRY(a5, r5, r5, carry);
 
         MP_CHECKOK(s_mp_pad(r, 6));
         MP_DIGIT(r, 5) = r5;
         MP_DIGIT(r, 4) = r4;
         MP_DIGIT(r, 3) = r3;
         MP_DIGIT(r, 2) = r2;
         MP_DIGIT(r, 1) = r1;
         MP_DIGIT(r, 0) = r0;
         MP_SIGN(r) = MP_ZPOS;
         MP_USED(r) = 6;
 
         /* Do quick 'subract' if we've gone over 
          * (add the 2's complement of the curve field) */
         a5 = MP_DIGIT(&meth->irr,5);
         if (carry ||  r5 >  a5 ||
                 ((r5 == a5) && mp_cmp(r,&meth->irr) != MP_LT)) {
                 a4 = MP_DIGIT(&meth->irr,4);
                 a3 = MP_DIGIT(&meth->irr,3);
                 a2 = MP_DIGIT(&meth->irr,2);
                 a1 = MP_DIGIT(&meth->irr,1);
                 a0 = MP_DIGIT(&meth->irr,0);
-                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
-                MP_SUB_BORROW(r1, a1, r1, carry, carry);
-                MP_SUB_BORROW(r2, a2, r2, carry, carry);
-                MP_SUB_BORROW(r3, a3, r3, carry, carry);
-                MP_SUB_BORROW(r4, a4, r4, carry, carry);
-                MP_SUB_BORROW(r5, a5, r5, carry, carry);
+                carry = 0;
+                MP_SUB_BORROW(r0, a0, r0, carry);
+                MP_SUB_BORROW(r1, a1, r1, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry);
+                MP_SUB_BORROW(r4, a4, r4, carry);
+                MP_SUB_BORROW(r5, a5, r5, carry);
                 MP_DIGIT(r, 5) = r5;
                 MP_DIGIT(r, 4) = r4;
                 MP_DIGIT(r, 3) = r3;
                 MP_DIGIT(r, 2) = r2;
                 MP_DIGIT(r, 1) = r1;
                 MP_DIGIT(r, 0) = r0;
         }
         
         s_mp_clamp(r);
 
@@ skipping 27 matching lines @@
         switch(MP_USED(b)) {
         case 3:
                 b2 = MP_DIGIT(b,2);
         case 2:
                 b1 = MP_DIGIT(b,1);
         case 1:
                 b0 = MP_DIGIT(b,0);
         }
 
 #ifndef MPI_AMD64_ADD
-        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
-        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
-        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+        borrow = 0;
+        MP_SUB_BORROW(r0, b0, r0, borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow);
 #else
         __asm__ (
                 "xorq   %3,%3           \n\t"
                 "subq   %4,%0           \n\t"
                 "sbbq   %5,%1           \n\t"
                 "sbbq   %6,%2           \n\t"
                 "adcq   $0,%3           \n\t"
                 : "=r"(r0), "=r"(r1), "=r"(r2), "=r" (borrow)
                 : "r" (b0), "r" (b1), "r" (b2), 
                   "0" (r0), "1" (r1), "2" (r2)
                 : "%cc" );
 #endif
 
         /* Do quick 'add' if we've gone under 0
          * (subtract the 2's complement of the curve field) */
         if (borrow) {
                 b2 = MP_DIGIT(&meth->irr,2);
                 b1 = MP_DIGIT(&meth->irr,1);
                 b0 = MP_DIGIT(&meth->irr,0);
 #ifndef MPI_AMD64_ADD
-                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
-                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
-                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
+                borrow = 0;
+                MP_ADD_CARRY(b0, r0, r0, borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow);
 #else
                 __asm__ (
                         "addq   %3,%0           \n\t"
                         "adcq   %4,%1           \n\t"
                         "adcq   %5,%2           \n\t"
                         : "=r"(r0), "=r"(r1), "=r"(r2)
                         : "r" (b0), "r" (b1), "r" (b2),
                           "0" (r0), "1" (r1), "2" (r2)
                         : "%cc" );
 #endif
@@ skipping 42 matching lines @@
                 b3 = MP_DIGIT(b,3);
         case 3:
                 b2 = MP_DIGIT(b,2);
         case 2:
                 b1 = MP_DIGIT(b,1);
         case 1:
                 b0 = MP_DIGIT(b,0);
         }
 
 #ifndef MPI_AMD64_ADD
-        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
-        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
-        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
-        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
+        borrow = 0;
+        MP_SUB_BORROW(r0, b0, r0, borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow);
 #else
         __asm__ (
                 "xorq   %4,%4           \n\t"
                 "subq   %5,%0           \n\t"
                 "sbbq   %6,%1           \n\t"
                 "sbbq   %7,%2           \n\t"
                 "sbbq   %8,%3           \n\t"
                 "adcq   $0,%4           \n\t"
                 : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r" (borrow)
                 : "r" (b0), "r" (b1), "r" (b2), "r" (b3),
                   "0" (r0), "1" (r1), "2" (r2), "3" (r3)
                 : "%cc" );
 #endif
 
         /* Do quick 'add' if we've gone under 0
          * (subtract the 2's complement of the curve field) */
         if (borrow) {
                 b3 = MP_DIGIT(&meth->irr,3);
                 b2 = MP_DIGIT(&meth->irr,2);
                 b1 = MP_DIGIT(&meth->irr,1);
                 b0 = MP_DIGIT(&meth->irr,0);
 #ifndef MPI_AMD64_ADD
-                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
-                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
-                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
-                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
+                borrow = 0;
+                MP_ADD_CARRY(b0, r0, r0, borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow);
 #else
                 __asm__ (
                         "addq   %4,%0           \n\t"
                         "adcq   %5,%1           \n\t"
                         "adcq   %6,%2           \n\t"
                         "adcq   %7,%3           \n\t"
                         : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3)
                         : "r" (b0), "r" (b1), "r" (b2), "r" (b3),
                           "0" (r0), "1" (r1), "2" (r2), "3" (r3)
                         : "%cc" );
@@ skipping 46 matching lines @@
         case 4:
                 b3 = MP_DIGIT(b,3);
         case 3:
                 b2 = MP_DIGIT(b,2);
         case 2:
                 b1 = MP_DIGIT(b,1);
         case 1:
                 b0 = MP_DIGIT(b,0);
         }
 
-        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
-        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
-        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
-        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
-        MP_SUB_BORROW(r4, b4, r4, borrow, borrow);
+        borrow = 0;
+        MP_SUB_BORROW(r0, b0, r0, borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow);
+        MP_SUB_BORROW(r4, b4, r4, borrow);
 
         /* Do quick 'add' if we've gone under 0
          * (subtract the 2's complement of the curve field) */
         if (borrow) {
                 b4 = MP_DIGIT(&meth->irr,4);
                 b3 = MP_DIGIT(&meth->irr,3);
                 b2 = MP_DIGIT(&meth->irr,2);
                 b1 = MP_DIGIT(&meth->irr,1);
                 b0 = MP_DIGIT(&meth->irr,0);
-                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
-                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
-                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
-                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
+                borrow = 0;
+                MP_ADD_CARRY(b0, r0, r0, borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow);
         }
         MP_CHECKOK(s_mp_pad(r, 5));
         MP_DIGIT(r, 4) = r4;
         MP_DIGIT(r, 3) = r3;
         MP_DIGIT(r, 2) = r2;
         MP_DIGIT(r, 1) = r1;
         MP_DIGIT(r, 0) = r0;
         MP_SIGN(r) = MP_ZPOS;
         MP_USED(r) = 5;
         s_mp_clamp(r);
@@ skipping 34 matching lines @@
         case 4:
                 b3 = MP_DIGIT(b,3);
         case 3:
                 b2 = MP_DIGIT(b,2);
         case 2:
                 b1 = MP_DIGIT(b,1);
         case 1:
                 b0 = MP_DIGIT(b,0);
         }
 
-        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
-        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
-        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
-        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
-        MP_SUB_BORROW(r4, b4, r4, borrow, borrow);
-        MP_SUB_BORROW(r5, b5, r5, borrow, borrow);
+        borrow = 0;
+        MP_SUB_BORROW(r0, b0, r0, borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow);
+        MP_SUB_BORROW(r4, b4, r4, borrow);
+        MP_SUB_BORROW(r5, b5, r5, borrow);
 
         /* Do quick 'add' if we've gone under 0
          * (subtract the 2's complement of the curve field) */
         if (borrow) {
                 b5 = MP_DIGIT(&meth->irr,5);
                 b4 = MP_DIGIT(&meth->irr,4);
                 b3 = MP_DIGIT(&meth->irr,3);
                 b2 = MP_DIGIT(&meth->irr,2);
                 b1 = MP_DIGIT(&meth->irr,1);
                 b0 = MP_DIGIT(&meth->irr,0);
-                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
-                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
-                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
-                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
-                MP_ADD_CARRY(b4, r4, r4, borrow, borrow);
+                borrow = 0;
+                MP_ADD_CARRY(b0, r0, r0, borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow);
+                MP_ADD_CARRY(b4, r4, r4, borrow);
         }
 
         MP_CHECKOK(s_mp_pad(r, 6));
         MP_DIGIT(r, 5) = r5;
         MP_DIGIT(r, 4) = r4;
         MP_DIGIT(r, 3) = r3;
         MP_DIGIT(r, 2) = r2;
         MP_DIGIT(r, 1) = r1;
         MP_DIGIT(r, 0) = r0;
         MP_SIGN(r) = MP_ZPOS;
@@ skipping 111 matching lines @@
                 MP_CHECKOK(mp_init(&t));
                 MP_CHECKOK(mp_set_int(&t, 1));
                 MP_CHECKOK(mp_bdivmod(&t, b, &meth->irr, meth->irr_arr, r));
           CLEANUP:
                 mp_clear(&t);
                 return res;
         } else {
                 return mp_bdivmod(a, b, &meth->irr, meth->irr_arr, r);
         }
 }