Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/nsprpub/pr/src/misc/prdtoa.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 28 matching lines @@
  * This file is based on the third-party code dtoa.c.  We minimize our
  * modifications to third-party code to make it easy to merge new versions.
  * The author of dtoa.c was not willing to add the parentheses suggested by
  * GCC, so we suppress these warnings.
  */
 #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
 #pragma GCC diagnostic ignored "-Wparentheses"
 #endif
 
 #include "primpl.h"
+#include "prbit.h"
 
 #define MULTIPLE_THREADS
 #define ACQUIRE_DTOA_LOCK(n)    PR_Lock(dtoa_lock[n])
 #define FREE_DTOA_LOCK(n)       PR_Unlock(dtoa_lock[n])
 
 static PRLock *dtoa_lock[2];
 
 void _PR_InitDtoa(void)
 {
     dtoa_lock[0] = PR_NewLock();
@@ skipping 676 matching lines @@
         }
 
  static int
 hi0bits
 #ifdef KR_headers
         (x) register ULong x;
 #else
         (register ULong x)
 #endif
 {
+#ifdef PR_HAVE_BUILTIN_BITSCAN32
+        return( (!x) ? 32 : pr_bitscan_clz32(x) );
+#else
         register int k = 0;
 
         if (!(x & 0xffff0000)) {
                 k = 16;
                 x <<= 16;
                 }
         if (!(x & 0xff000000)) {
                 k += 8;
                 x <<= 8;
                 }
         if (!(x & 0xf0000000)) {
                 k += 4;
                 x <<= 4;
                 }
         if (!(x & 0xc0000000)) {
                 k += 2;
                 x <<= 2;
                 }
         if (!(x & 0x80000000)) {
                 k++;
                 if (!(x & 0x40000000))
                         return 32;
                 }
         return k;
+#endif /* PR_HAVE_BUILTIN_BITSCAN32 */
         }
 
  static int
 lo0bits
 #ifdef KR_headers
         (y) ULong *y;
 #else
         (ULong *y)
 #endif
 {
+#ifdef PR_HAVE_BUILTIN_BITSCAN32
+        int k;
+        ULong x = *y;
+
+        if (x>1)
+                *y = ( x >> (k = pr_bitscan_ctz32(x)) );
+        else
+                k = ((x ^ 1) << 5);
+#else
         register int k;
         register ULong x = *y;
 
         if (x & 7) {
                 if (x & 1)
                         return 0;
                 if (x & 2) {
                         *y = x >> 1;
                         return 1;
                         }
@@ skipping 17 matching lines @@
                 k += 2;
                 x >>= 2;
                 }
         if (!(x & 1)) {
                 k++;
                 x >>= 1;
                 if (!x)
                         return 32;
                 }
         *y = x;
+#endif /* PR_HAVE_BUILTIN_BITSCAN32 */
         return k;
         }
 
  static Bigint *
 i2b
 #ifdef KR_headers
         (i) int i;
 #else
         (int i)
 #endif
@@ skipping 2702 matching lines @@
         }
 
         while (*nump != '\0') {
             *bufp++ = *nump++;
         }
         *bufp++ = '\0';
     }
 done:
     PR_DELETE(num);
 }