Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/mpi/mpcpucache.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 "prtypes.h"
 
 /*
  * This file implements a single function: s_mpi_getProcessorLineSize();
  * s_mpi_getProcessorLineSize() returns the size in bytes of the cache line
  * if a cache exists, or zero if there is no cache. If more than one
  * cache line exists, it should return the smallest line size (which is 
  * usually the L1 cache).
  *
  * mp_modexp uses this information to make sure that private key information
  * isn't being leaked through the cache.
@@ skipping 596 matching lines @@
 
 
 #define MAN_UNKNOWN 9
 
 #if !defined(AMD_64)
 #define SSE2_FLAG (1<<26)
 unsigned long
 s_mpi_is_sse2()
 {
     unsigned long eax, ebx, ecx, edx;
-    int manufacturer = MAN_UNKNOWN;
-    int i;
-    char string[13];
 
     if (is386() || is486()) {
         return 0;
     }
     freebl_cpuid(0, &eax, &ebx, &ecx, &edx);
-    /* string holds the CPU's manufacturer ID string - a twelve
-     * character ASCII string stored in ebx, edx, ecx, and
-     * the 32-bit extended feature flags are in edx, ecx.
-     */
-    *(int *)string = ebx;
-    *(int *)&string[4] = (int)edx;
-    *(int *)&string[8] = (int)ecx;
-    string[12] = 0;
 
     /* has no SSE2 extensions */
     if (eax == 0) {
         return 0;
     }
 
-    for (i=0; i < n_manufacturers; i++) {
-        if ( strcmp(manMap[i],string) == 0) {
-            manufacturer = i;
-            break;
-        }
-    }
-
     freebl_cpuid(1,&eax,&ebx,&ecx,&edx);
     return (edx & SSE2_FLAG) == SSE2_FLAG;
 }
 #endif
 
 unsigned long
 s_mpi_getProcessorLineSize()
 {
     unsigned long eax, ebx, ecx, edx;
+    PRUint32 cpuid[3];
     unsigned long cpuidLevel;
     unsigned long cacheLineSize = 0;
     int manufacturer = MAN_UNKNOWN;
     int i;
-    char string[65];
+    char string[13];
 
 #if !defined(AMD_64)
     if (is386()) {
         return 0; /* 386 had no cache */
     } if (is486()) {
         return 32; /* really? need more info */
     }
 #endif
 
     /* Pentium, cpuid command is available */
     freebl_cpuid(0, &eax, &ebx, &ecx, &edx);
     cpuidLevel = eax;
     /* string holds the CPU's manufacturer ID string - a twelve
      * character ASCII string stored in ebx, edx, ecx, and
      * the 32-bit extended feature flags are in edx, ecx.
      */
-    *(int *)string = ebx;
-    *(int *)&string[4] = (int)edx;
-    *(int *)&string[8] = (int)ecx;
+    cpuid[0] = ebx;
+    cpuid[1] = ecx;
+    cpuid[2] = edx;
+    memcpy(string, cpuid, sizeof(cpuid));
     string[12] = 0;
 
     manufacturer = MAN_UNKNOWN;
     for (i=0; i < n_manufacturers; i++) {
         if ( strcmp(manMap[i],string) == 0) {
             manufacturer = i;
         }
     }
 
     if (manufacturer == INTEL) {
@@ skipping 110 matching lines @@
 #endif
 
 #ifdef TEST_IT
 #include <stdio.h>
 
 main()
 {
     printf("line size = %d\n", s_mpi_getProcessorLineSize());
 } 
 #endif