Author: jasone
Date: Tue Aug 18 06:28:37 2015
New Revision: 286870
URL: https://svnweb.freebsd.org/changeset/base/286870

Log:
  Add jemalloc support for 8 KiB, 16 KiB, and 64 KiB pages.

Modified:
  head/contrib/jemalloc/FREEBSD-upgrade
  head/contrib/jemalloc/include/jemalloc/internal/size_classes.h

Modified: head/contrib/jemalloc/FREEBSD-upgrade
==============================================================================
--- head/contrib/jemalloc/FREEBSD-upgrade       Tue Aug 18 06:16:19 2015        
(r286869)
+++ head/contrib/jemalloc/FREEBSD-upgrade       Tue Aug 18 06:28:37 2015        
(r286870)
@@ -74,7 +74,7 @@ do_extract() {
     # Generate various files.
     ./autogen.sh --enable-cc-silence --enable-dss --enable-xmalloc \
       --enable-utrace --with-xslroot=/usr/local/share/xsl/docbook \
-      --with-private-namespace=__
+      --with-private-namespace=__ --with-lg-page-sizes=12,13,14,16
     gmake dist
   )
 }

Modified: head/contrib/jemalloc/include/jemalloc/internal/size_classes.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/size_classes.h      Tue Aug 
18 06:16:19 2015        (r286869)
+++ head/contrib/jemalloc/include/jemalloc/internal/size_classes.h      Tue Aug 
18 06:28:37 2015        (r286870)
@@ -182,305 +182,313 @@
 #define        LG_LARGE_MINCLASS       14
 #endif
 
-#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 4 && LG_PAGE == 
12)
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 3 && LG_PAGE == 
13)
 #define        SIZE_CLASSES \
   /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
     SC(  0,      3,        3,      0, yes,  3) \
-                                               \
     SC(  1,      3,        3,      1, yes,  3) \
-    SC(  2,      4,        4,      1, yes,  4) \
-    SC(  3,      4,        4,      2, yes,  4) \
-    SC(  4,      4,        4,      3, yes,  4) \
+    SC(  2,      3,        3,      2, yes,  3) \
+    SC(  3,      3,        3,      3, yes,  3) \
                                                \
-    SC(  5,      6,        4,      1, yes,  4) \
-    SC(  6,      6,        4,      2, yes,  4) \
-    SC(  7,      6,        4,      3, yes,  4) \
-    SC(  8,      6,        4,      4, yes,  4) \
+    SC(  4,      5,        3,      1, yes,  3) \
+    SC(  5,      5,        3,      2, yes,  3) \
+    SC(  6,      5,        3,      3, yes,  3) \
+    SC(  7,      5,        3,      4, yes,  3) \
                                                \
-    SC(  9,      7,        5,      1, yes,  5) \
-    SC( 10,      7,        5,      2, yes,  5) \
-    SC( 11,      7,        5,      3, yes,  5) \
-    SC( 12,      7,        5,      4, yes,  5) \
+    SC(  8,      6,        4,      1, yes,  4) \
+    SC(  9,      6,        4,      2, yes,  4) \
+    SC( 10,      6,        4,      3, yes,  4) \
+    SC( 11,      6,        4,      4, yes,  4) \
                                                \
-    SC( 13,      8,        6,      1, yes,  6) \
-    SC( 14,      8,        6,      2, yes,  6) \
-    SC( 15,      8,        6,      3, yes,  6) \
-    SC( 16,      8,        6,      4, yes,  6) \
+    SC( 12,      7,        5,      1, yes,  5) \
+    SC( 13,      7,        5,      2, yes,  5) \
+    SC( 14,      7,        5,      3, yes,  5) \
+    SC( 15,      7,        5,      4, yes,  5) \
                                                \
-    SC( 17,      9,        7,      1, yes,  7) \
-    SC( 18,      9,        7,      2, yes,  7) \
-    SC( 19,      9,        7,      3, yes,  7) \
-    SC( 20,      9,        7,      4, yes,  7) \
+    SC( 16,      8,        6,      1, yes,  6) \
+    SC( 17,      8,        6,      2, yes,  6) \
+    SC( 18,      8,        6,      3, yes,  6) \
+    SC( 19,      8,        6,      4, yes,  6) \
                                                \
-    SC( 21,     10,        8,      1, yes,  8) \
-    SC( 22,     10,        8,      2, yes,  8) \
-    SC( 23,     10,        8,      3, yes,  8) \
-    SC( 24,     10,        8,      4, yes,  8) \
+    SC( 20,      9,        7,      1, yes,  7) \
+    SC( 21,      9,        7,      2, yes,  7) \
+    SC( 22,      9,        7,      3, yes,  7) \
+    SC( 23,      9,        7,      4, yes,  7) \
                                                \
-    SC( 25,     11,        9,      1, yes,  9) \
-    SC( 26,     11,        9,      2, yes,  9) \
-    SC( 27,     11,        9,      3, yes,  9) \
-    SC( 28,     11,        9,      4, yes,  9) \
+    SC( 24,     10,        8,      1, yes,  8) \
+    SC( 25,     10,        8,      2, yes,  8) \
+    SC( 26,     10,        8,      3, yes,  8) \
+    SC( 27,     10,        8,      4, yes,  8) \
                                                \
-    SC( 29,     12,       10,      1, yes, no) \
-    SC( 30,     12,       10,      2, yes, no) \
-    SC( 31,     12,       10,      3, yes, no) \
-    SC( 32,     12,       10,      4, yes, no) \
+    SC( 28,     11,        9,      1, yes,  9) \
+    SC( 29,     11,        9,      2, yes,  9) \
+    SC( 30,     11,        9,      3, yes,  9) \
+    SC( 31,     11,        9,      4, yes,  9) \
                                                \
-    SC( 33,     13,       11,      1, yes, no) \
-    SC( 34,     13,       11,      2, yes, no) \
-    SC( 35,     13,       11,      3, yes, no) \
-    SC( 36,     13,       11,      4,  no, no) \
+    SC( 32,     12,       10,      1, yes, no) \
+    SC( 33,     12,       10,      2, yes, no) \
+    SC( 34,     12,       10,      3, yes, no) \
+    SC( 35,     12,       10,      4, yes, no) \
                                                \
-    SC( 37,     14,       12,      1,  no, no) \
-    SC( 38,     14,       12,      2,  no, no) \
-    SC( 39,     14,       12,      3,  no, no) \
-    SC( 40,     14,       12,      4,  no, no) \
+    SC( 36,     13,       11,      1, yes, no) \
+    SC( 37,     13,       11,      2, yes, no) \
+    SC( 38,     13,       11,      3, yes, no) \
+    SC( 39,     13,       11,      4, yes, no) \
                                                \
-    SC( 41,     15,       13,      1,  no, no) \
-    SC( 42,     15,       13,      2,  no, no) \
-    SC( 43,     15,       13,      3,  no, no) \
-    SC( 44,     15,       13,      4,  no, no) \
+    SC( 40,     14,       12,      1, yes, no) \
+    SC( 41,     14,       12,      2, yes, no) \
+    SC( 42,     14,       12,      3, yes, no) \
+    SC( 43,     14,       12,      4,  no, no) \
                                                \
-    SC( 45,     16,       14,      1,  no, no) \
-    SC( 46,     16,       14,      2,  no, no) \
-    SC( 47,     16,       14,      3,  no, no) \
-    SC( 48,     16,       14,      4,  no, no) \
+    SC( 44,     15,       13,      1,  no, no) \
+    SC( 45,     15,       13,      2,  no, no) \
+    SC( 46,     15,       13,      3,  no, no) \
+    SC( 47,     15,       13,      4,  no, no) \
                                                \
-    SC( 49,     17,       15,      1,  no, no) \
-    SC( 50,     17,       15,      2,  no, no) \
-    SC( 51,     17,       15,      3,  no, no) \
-    SC( 52,     17,       15,      4,  no, no) \
+    SC( 48,     16,       14,      1,  no, no) \
+    SC( 49,     16,       14,      2,  no, no) \
+    SC( 50,     16,       14,      3,  no, no) \
+    SC( 51,     16,       14,      4,  no, no) \
                                                \
-    SC( 53,     18,       16,      1,  no, no) \
-    SC( 54,     18,       16,      2,  no, no) \
-    SC( 55,     18,       16,      3,  no, no) \
-    SC( 56,     18,       16,      4,  no, no) \
+    SC( 52,     17,       15,      1,  no, no) \
+    SC( 53,     17,       15,      2,  no, no) \
+    SC( 54,     17,       15,      3,  no, no) \
+    SC( 55,     17,       15,      4,  no, no) \
                                                \
-    SC( 57,     19,       17,      1,  no, no) \
-    SC( 58,     19,       17,      2,  no, no) \
-    SC( 59,     19,       17,      3,  no, no) \
-    SC( 60,     19,       17,      4,  no, no) \
+    SC( 56,     18,       16,      1,  no, no) \
+    SC( 57,     18,       16,      2,  no, no) \
+    SC( 58,     18,       16,      3,  no, no) \
+    SC( 59,     18,       16,      4,  no, no) \
                                                \
-    SC( 61,     20,       18,      1,  no, no) \
-    SC( 62,     20,       18,      2,  no, no) \
-    SC( 63,     20,       18,      3,  no, no) \
-    SC( 64,     20,       18,      4,  no, no) \
+    SC( 60,     19,       17,      1,  no, no) \
+    SC( 61,     19,       17,      2,  no, no) \
+    SC( 62,     19,       17,      3,  no, no) \
+    SC( 63,     19,       17,      4,  no, no) \
                                                \
-    SC( 65,     21,       19,      1,  no, no) \
-    SC( 66,     21,       19,      2,  no, no) \
-    SC( 67,     21,       19,      3,  no, no) \
-    SC( 68,     21,       19,      4,  no, no) \
+    SC( 64,     20,       18,      1,  no, no) \
+    SC( 65,     20,       18,      2,  no, no) \
+    SC( 66,     20,       18,      3,  no, no) \
+    SC( 67,     20,       18,      4,  no, no) \
                                                \
-    SC( 69,     22,       20,      1,  no, no) \
-    SC( 70,     22,       20,      2,  no, no) \
-    SC( 71,     22,       20,      3,  no, no) \
-    SC( 72,     22,       20,      4,  no, no) \
+    SC( 68,     21,       19,      1,  no, no) \
+    SC( 69,     21,       19,      2,  no, no) \
+    SC( 70,     21,       19,      3,  no, no) \
+    SC( 71,     21,       19,      4,  no, no) \
                                                \
-    SC( 73,     23,       21,      1,  no, no) \
-    SC( 74,     23,       21,      2,  no, no) \
-    SC( 75,     23,       21,      3,  no, no) \
-    SC( 76,     23,       21,      4,  no, no) \
+    SC( 72,     22,       20,      1,  no, no) \
+    SC( 73,     22,       20,      2,  no, no) \
+    SC( 74,     22,       20,      3,  no, no) \
+    SC( 75,     22,       20,      4,  no, no) \
                                                \
-    SC( 77,     24,       22,      1,  no, no) \
-    SC( 78,     24,       22,      2,  no, no) \
-    SC( 79,     24,       22,      3,  no, no) \
-    SC( 80,     24,       22,      4,  no, no) \
+    SC( 76,     23,       21,      1,  no, no) \
+    SC( 77,     23,       21,      2,  no, no) \
+    SC( 78,     23,       21,      3,  no, no) \
+    SC( 79,     23,       21,      4,  no, no) \
                                                \
-    SC( 81,     25,       23,      1,  no, no) \
-    SC( 82,     25,       23,      2,  no, no) \
-    SC( 83,     25,       23,      3,  no, no) \
-    SC( 84,     25,       23,      4,  no, no) \
+    SC( 80,     24,       22,      1,  no, no) \
+    SC( 81,     24,       22,      2,  no, no) \
+    SC( 82,     24,       22,      3,  no, no) \
+    SC( 83,     24,       22,      4,  no, no) \
                                                \
-    SC( 85,     26,       24,      1,  no, no) \
-    SC( 86,     26,       24,      2,  no, no) \
-    SC( 87,     26,       24,      3,  no, no) \
-    SC( 88,     26,       24,      4,  no, no) \
+    SC( 84,     25,       23,      1,  no, no) \
+    SC( 85,     25,       23,      2,  no, no) \
+    SC( 86,     25,       23,      3,  no, no) \
+    SC( 87,     25,       23,      4,  no, no) \
                                                \
-    SC( 89,     27,       25,      1,  no, no) \
-    SC( 90,     27,       25,      2,  no, no) \
-    SC( 91,     27,       25,      3,  no, no) \
-    SC( 92,     27,       25,      4,  no, no) \
+    SC( 88,     26,       24,      1,  no, no) \
+    SC( 89,     26,       24,      2,  no, no) \
+    SC( 90,     26,       24,      3,  no, no) \
+    SC( 91,     26,       24,      4,  no, no) \
                                                \
-    SC( 93,     28,       26,      1,  no, no) \
-    SC( 94,     28,       26,      2,  no, no) \
-    SC( 95,     28,       26,      3,  no, no) \
-    SC( 96,     28,       26,      4,  no, no) \
+    SC( 92,     27,       25,      1,  no, no) \
+    SC( 93,     27,       25,      2,  no, no) \
+    SC( 94,     27,       25,      3,  no, no) \
+    SC( 95,     27,       25,      4,  no, no) \
                                                \
-    SC( 97,     29,       27,      1,  no, no) \
-    SC( 98,     29,       27,      2,  no, no) \
-    SC( 99,     29,       27,      3,  no, no) \
-    SC(100,     29,       27,      4,  no, no) \
+    SC( 96,     28,       26,      1,  no, no) \
+    SC( 97,     28,       26,      2,  no, no) \
+    SC( 98,     28,       26,      3,  no, no) \
+    SC( 99,     28,       26,      4,  no, no) \
                                                \
-    SC(101,     30,       28,      1,  no, no) \
-    SC(102,     30,       28,      2,  no, no) \
-    SC(103,     30,       28,      3,  no, no) \
-    SC(104,     30,       28,      4,  no, no) \
+    SC(100,     29,       27,      1,  no, no) \
+    SC(101,     29,       27,      2,  no, no) \
+    SC(102,     29,       27,      3,  no, no) \
+    SC(103,     29,       27,      4,  no, no) \
                                                \
-    SC(105,     31,       29,      1,  no, no) \
-    SC(106,     31,       29,      2,  no, no) \
-    SC(107,     31,       29,      3,  no, no) \
+    SC(104,     30,       28,      1,  no, no) \
+    SC(105,     30,       28,      2,  no, no) \
+    SC(106,     30,       28,      3,  no, no) \
+    SC(107,     30,       28,      4,  no, no) \
+                                               \
+    SC(108,     31,       29,      1,  no, no) \
+    SC(109,     31,       29,      2,  no, no) \
+    SC(110,     31,       29,      3,  no, no) \
 
 #define        SIZE_CLASSES_DEFINED
-#define        NTBINS                  1
-#define        NLBINS                  29
-#define        NBINS                   36
-#define        NSIZES                  108
-#define        LG_TINY_MAXCLASS        3
+#define        NTBINS                  0
+#define        NLBINS                  32
+#define        NBINS                   43
+#define        NSIZES                  111
+#define        LG_TINY_MAXCLASS        "NA"
 #define        LOOKUP_MAXCLASS         ((((size_t)1) << 11) + (((size_t)4) << 
9))
-#define        SMALL_MAXCLASS          ((((size_t)1) << 13) + (((size_t)3) << 
11))
-#define        LG_LARGE_MINCLASS       14
+#define        SMALL_MAXCLASS          ((((size_t)1) << 14) + (((size_t)3) << 
12))
+#define        LG_LARGE_MINCLASS       15
 #endif
 
-#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 4 && LG_QUANTUM == 4 && LG_PAGE == 
12)
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 3 && LG_PAGE == 
14)
 #define        SIZE_CLASSES \
   /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
-    SC(  0,      4,        4,      0, yes,  4) \
-    SC(  1,      4,        4,      1, yes,  4) \
-    SC(  2,      4,        4,      2, yes,  4) \
-    SC(  3,      4,        4,      3, yes,  4) \
-                                               \
-    SC(  4,      6,        4,      1, yes,  4) \
-    SC(  5,      6,        4,      2, yes,  4) \
-    SC(  6,      6,        4,      3, yes,  4) \
-    SC(  7,      6,        4,      4, yes,  4) \
+    SC(  0,      3,        3,      0, yes,  3) \
+    SC(  1,      3,        3,      1, yes,  3) \
+    SC(  2,      3,        3,      2, yes,  3) \
+    SC(  3,      3,        3,      3, yes,  3) \
                                                \
-    SC(  8,      7,        5,      1, yes,  5) \
-    SC(  9,      7,        5,      2, yes,  5) \
-    SC( 10,      7,        5,      3, yes,  5) \
-    SC( 11,      7,        5,      4, yes,  5) \
+    SC(  4,      5,        3,      1, yes,  3) \
+    SC(  5,      5,        3,      2, yes,  3) \
+    SC(  6,      5,        3,      3, yes,  3) \
+    SC(  7,      5,        3,      4, yes,  3) \
                                                \
-    SC( 12,      8,        6,      1, yes,  6) \
-    SC( 13,      8,        6,      2, yes,  6) \
-    SC( 14,      8,        6,      3, yes,  6) \
-    SC( 15,      8,        6,      4, yes,  6) \
+    SC(  8,      6,        4,      1, yes,  4) \
+    SC(  9,      6,        4,      2, yes,  4) \
+    SC( 10,      6,        4,      3, yes,  4) \
+    SC( 11,      6,        4,      4, yes,  4) \
                                                \
-    SC( 16,      9,        7,      1, yes,  7) \
-    SC( 17,      9,        7,      2, yes,  7) \
-    SC( 18,      9,        7,      3, yes,  7) \
-    SC( 19,      9,        7,      4, yes,  7) \
+    SC( 12,      7,        5,      1, yes,  5) \
+    SC( 13,      7,        5,      2, yes,  5) \
+    SC( 14,      7,        5,      3, yes,  5) \
+    SC( 15,      7,        5,      4, yes,  5) \
                                                \
-    SC( 20,     10,        8,      1, yes,  8) \
-    SC( 21,     10,        8,      2, yes,  8) \
-    SC( 22,     10,        8,      3, yes,  8) \
-    SC( 23,     10,        8,      4, yes,  8) \
+    SC( 16,      8,        6,      1, yes,  6) \
+    SC( 17,      8,        6,      2, yes,  6) \
+    SC( 18,      8,        6,      3, yes,  6) \
+    SC( 19,      8,        6,      4, yes,  6) \
                                                \
-    SC( 24,     11,        9,      1, yes,  9) \
-    SC( 25,     11,        9,      2, yes,  9) \
-    SC( 26,     11,        9,      3, yes,  9) \
-    SC( 27,     11,        9,      4, yes,  9) \
+    SC( 20,      9,        7,      1, yes,  7) \
+    SC( 21,      9,        7,      2, yes,  7) \
+    SC( 22,      9,        7,      3, yes,  7) \
+    SC( 23,      9,        7,      4, yes,  7) \
                                                \
-    SC( 28,     12,       10,      1, yes, no) \
-    SC( 29,     12,       10,      2, yes, no) \
-    SC( 30,     12,       10,      3, yes, no) \
-    SC( 31,     12,       10,      4, yes, no) \
+    SC( 24,     10,        8,      1, yes,  8) \
+    SC( 25,     10,        8,      2, yes,  8) \
+    SC( 26,     10,        8,      3, yes,  8) \
+    SC( 27,     10,        8,      4, yes,  8) \
                                                \
-    SC( 32,     13,       11,      1, yes, no) \
-    SC( 33,     13,       11,      2, yes, no) \
-    SC( 34,     13,       11,      3, yes, no) \
-    SC( 35,     13,       11,      4,  no, no) \
+    SC( 28,     11,        9,      1, yes,  9) \
+    SC( 29,     11,        9,      2, yes,  9) \
+    SC( 30,     11,        9,      3, yes,  9) \
+    SC( 31,     11,        9,      4, yes,  9) \
                                                \
-    SC( 36,     14,       12,      1,  no, no) \
-    SC( 37,     14,       12,      2,  no, no) \
-    SC( 38,     14,       12,      3,  no, no) \
-    SC( 39,     14,       12,      4,  no, no) \
+    SC( 32,     12,       10,      1, yes, no) \
+    SC( 33,     12,       10,      2, yes, no) \
+    SC( 34,     12,       10,      3, yes, no) \
+    SC( 35,     12,       10,      4, yes, no) \
                                                \
-    SC( 40,     15,       13,      1,  no, no) \
-    SC( 41,     15,       13,      2,  no, no) \
-    SC( 42,     15,       13,      3,  no, no) \
-    SC( 43,     15,       13,      4,  no, no) \
+    SC( 36,     13,       11,      1, yes, no) \
+    SC( 37,     13,       11,      2, yes, no) \
+    SC( 38,     13,       11,      3, yes, no) \
+    SC( 39,     13,       11,      4, yes, no) \
                                                \
-    SC( 44,     16,       14,      1,  no, no) \
-    SC( 45,     16,       14,      2,  no, no) \
-    SC( 46,     16,       14,      3,  no, no) \
-    SC( 47,     16,       14,      4,  no, no) \
+    SC( 40,     14,       12,      1, yes, no) \
+    SC( 41,     14,       12,      2, yes, no) \
+    SC( 42,     14,       12,      3, yes, no) \
+    SC( 43,     14,       12,      4, yes, no) \
+                                               \
+    SC( 44,     15,       13,      1, yes, no) \
+    SC( 45,     15,       13,      2, yes, no) \
+    SC( 46,     15,       13,      3, yes, no) \
+    SC( 47,     15,       13,      4,  no, no) \
                                                \
-    SC( 48,     17,       15,      1,  no, no) \
-    SC( 49,     17,       15,      2,  no, no) \
-    SC( 50,     17,       15,      3,  no, no) \
-    SC( 51,     17,       15,      4,  no, no) \
+    SC( 48,     16,       14,      1,  no, no) \
+    SC( 49,     16,       14,      2,  no, no) \
+    SC( 50,     16,       14,      3,  no, no) \
+    SC( 51,     16,       14,      4,  no, no) \
                                                \
-    SC( 52,     18,       16,      1,  no, no) \
-    SC( 53,     18,       16,      2,  no, no) \
-    SC( 54,     18,       16,      3,  no, no) \
-    SC( 55,     18,       16,      4,  no, no) \
+    SC( 52,     17,       15,      1,  no, no) \
+    SC( 53,     17,       15,      2,  no, no) \
+    SC( 54,     17,       15,      3,  no, no) \
+    SC( 55,     17,       15,      4,  no, no) \
                                                \
-    SC( 56,     19,       17,      1,  no, no) \
-    SC( 57,     19,       17,      2,  no, no) \
-    SC( 58,     19,       17,      3,  no, no) \
-    SC( 59,     19,       17,      4,  no, no) \
+    SC( 56,     18,       16,      1,  no, no) \
+    SC( 57,     18,       16,      2,  no, no) \
+    SC( 58,     18,       16,      3,  no, no) \
+    SC( 59,     18,       16,      4,  no, no) \
                                                \
-    SC( 60,     20,       18,      1,  no, no) \
-    SC( 61,     20,       18,      2,  no, no) \
-    SC( 62,     20,       18,      3,  no, no) \
-    SC( 63,     20,       18,      4,  no, no) \
+    SC( 60,     19,       17,      1,  no, no) \
+    SC( 61,     19,       17,      2,  no, no) \
+    SC( 62,     19,       17,      3,  no, no) \
+    SC( 63,     19,       17,      4,  no, no) \
                                                \
-    SC( 64,     21,       19,      1,  no, no) \
-    SC( 65,     21,       19,      2,  no, no) \
-    SC( 66,     21,       19,      3,  no, no) \
-    SC( 67,     21,       19,      4,  no, no) \
+    SC( 64,     20,       18,      1,  no, no) \
+    SC( 65,     20,       18,      2,  no, no) \
+    SC( 66,     20,       18,      3,  no, no) \
+    SC( 67,     20,       18,      4,  no, no) \
                                                \
-    SC( 68,     22,       20,      1,  no, no) \
-    SC( 69,     22,       20,      2,  no, no) \
-    SC( 70,     22,       20,      3,  no, no) \
-    SC( 71,     22,       20,      4,  no, no) \
+    SC( 68,     21,       19,      1,  no, no) \
+    SC( 69,     21,       19,      2,  no, no) \
+    SC( 70,     21,       19,      3,  no, no) \
+    SC( 71,     21,       19,      4,  no, no) \
                                                \
-    SC( 72,     23,       21,      1,  no, no) \
-    SC( 73,     23,       21,      2,  no, no) \
-    SC( 74,     23,       21,      3,  no, no) \
-    SC( 75,     23,       21,      4,  no, no) \
+    SC( 72,     22,       20,      1,  no, no) \
+    SC( 73,     22,       20,      2,  no, no) \
+    SC( 74,     22,       20,      3,  no, no) \
+    SC( 75,     22,       20,      4,  no, no) \
                                                \
-    SC( 76,     24,       22,      1,  no, no) \
-    SC( 77,     24,       22,      2,  no, no) \
-    SC( 78,     24,       22,      3,  no, no) \
-    SC( 79,     24,       22,      4,  no, no) \
+    SC( 76,     23,       21,      1,  no, no) \
+    SC( 77,     23,       21,      2,  no, no) \
+    SC( 78,     23,       21,      3,  no, no) \
+    SC( 79,     23,       21,      4,  no, no) \
                                                \
-    SC( 80,     25,       23,      1,  no, no) \
-    SC( 81,     25,       23,      2,  no, no) \
-    SC( 82,     25,       23,      3,  no, no) \
-    SC( 83,     25,       23,      4,  no, no) \
+    SC( 80,     24,       22,      1,  no, no) \
+    SC( 81,     24,       22,      2,  no, no) \
+    SC( 82,     24,       22,      3,  no, no) \
+    SC( 83,     24,       22,      4,  no, no) \
                                                \
-    SC( 84,     26,       24,      1,  no, no) \
-    SC( 85,     26,       24,      2,  no, no) \
-    SC( 86,     26,       24,      3,  no, no) \
-    SC( 87,     26,       24,      4,  no, no) \
+    SC( 84,     25,       23,      1,  no, no) \
+    SC( 85,     25,       23,      2,  no, no) \
+    SC( 86,     25,       23,      3,  no, no) \
+    SC( 87,     25,       23,      4,  no, no) \
                                                \
-    SC( 88,     27,       25,      1,  no, no) \
-    SC( 89,     27,       25,      2,  no, no) \
-    SC( 90,     27,       25,      3,  no, no) \
-    SC( 91,     27,       25,      4,  no, no) \
+    SC( 88,     26,       24,      1,  no, no) \
+    SC( 89,     26,       24,      2,  no, no) \
+    SC( 90,     26,       24,      3,  no, no) \
+    SC( 91,     26,       24,      4,  no, no) \
                                                \
-    SC( 92,     28,       26,      1,  no, no) \
-    SC( 93,     28,       26,      2,  no, no) \
-    SC( 94,     28,       26,      3,  no, no) \
-    SC( 95,     28,       26,      4,  no, no) \
+    SC( 92,     27,       25,      1,  no, no) \
+    SC( 93,     27,       25,      2,  no, no) \
+    SC( 94,     27,       25,      3,  no, no) \
+    SC( 95,     27,       25,      4,  no, no) \
                                                \
-    SC( 96,     29,       27,      1,  no, no) \
-    SC( 97,     29,       27,      2,  no, no) \
-    SC( 98,     29,       27,      3,  no, no) \
-    SC( 99,     29,       27,      4,  no, no) \
+    SC( 96,     28,       26,      1,  no, no) \
+    SC( 97,     28,       26,      2,  no, no) \
+    SC( 98,     28,       26,      3,  no, no) \
+    SC( 99,     28,       26,      4,  no, no) \
                                                \
-    SC(100,     30,       28,      1,  no, no) \
-    SC(101,     30,       28,      2,  no, no) \
-    SC(102,     30,       28,      3,  no, no) \
-    SC(103,     30,       28,      4,  no, no) \
+    SC(100,     29,       27,      1,  no, no) \
+    SC(101,     29,       27,      2,  no, no) \
+    SC(102,     29,       27,      3,  no, no) \
+    SC(103,     29,       27,      4,  no, no) \
                                                \
-    SC(104,     31,       29,      1,  no, no) \
-    SC(105,     31,       29,      2,  no, no) \
-    SC(106,     31,       29,      3,  no, no) \
+    SC(104,     30,       28,      1,  no, no) \
+    SC(105,     30,       28,      2,  no, no) \
+    SC(106,     30,       28,      3,  no, no) \
+    SC(107,     30,       28,      4,  no, no) \
+                                               \
+    SC(108,     31,       29,      1,  no, no) \
+    SC(109,     31,       29,      2,  no, no) \
+    SC(110,     31,       29,      3,  no, no) \
 
 #define        SIZE_CLASSES_DEFINED
 #define        NTBINS                  0
-#define        NLBINS                  28
-#define        NBINS                   35
-#define        NSIZES                  107
+#define        NLBINS                  32
+#define        NBINS                   47
+#define        NSIZES                  111
 #define        LG_TINY_MAXCLASS        "NA"
 #define        LOOKUP_MAXCLASS         ((((size_t)1) << 11) + (((size_t)4) << 
9))
-#define        SMALL_MAXCLASS          ((((size_t)1) << 13) + (((size_t)3) << 
11))
-#define        LG_LARGE_MINCLASS       14
+#define        SMALL_MAXCLASS          ((((size_t)1) << 15) + (((size_t)3) << 
13))
+#define        LG_LARGE_MINCLASS       16
 #endif
 
-#if (LG_SIZEOF_PTR == 3 && LG_TINY_MIN == 3 && LG_QUANTUM == 3 && LG_PAGE == 
12)
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 3 && LG_PAGE == 
16)
 #define        SIZE_CLASSES \
   /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
     SC(  0,      3,        3,      0, yes,  3) \
@@ -531,26 +539,26 @@
     SC( 36,     13,       11,      1, yes, no) \
     SC( 37,     13,       11,      2, yes, no) \
     SC( 38,     13,       11,      3, yes, no) \
-    SC( 39,     13,       11,      4,  no, no) \
-                                               \
-    SC( 40,     14,       12,      1,  no, no) \
-    SC( 41,     14,       12,      2,  no, no) \
-    SC( 42,     14,       12,      3,  no, no) \
-    SC( 43,     14,       12,      4,  no, no) \
-                                               \
-    SC( 44,     15,       13,      1,  no, no) \
-    SC( 45,     15,       13,      2,  no, no) \
-    SC( 46,     15,       13,      3,  no, no) \
-    SC( 47,     15,       13,      4,  no, no) \
-                                               \
-    SC( 48,     16,       14,      1,  no, no) \
-    SC( 49,     16,       14,      2,  no, no) \
-    SC( 50,     16,       14,      3,  no, no) \
-    SC( 51,     16,       14,      4,  no, no) \
+    SC( 39,     13,       11,      4, yes, no) \
                                                \
-    SC( 52,     17,       15,      1,  no, no) \
-    SC( 53,     17,       15,      2,  no, no) \
-    SC( 54,     17,       15,      3,  no, no) \
+    SC( 40,     14,       12,      1, yes, no) \
+    SC( 41,     14,       12,      2, yes, no) \
+    SC( 42,     14,       12,      3, yes, no) \
+    SC( 43,     14,       12,      4, yes, no) \
+                                               \
+    SC( 44,     15,       13,      1, yes, no) \
+    SC( 45,     15,       13,      2, yes, no) \
+    SC( 46,     15,       13,      3, yes, no) \
+    SC( 47,     15,       13,      4, yes, no) \
+                                               \
+    SC( 48,     16,       14,      1, yes, no) \
+    SC( 49,     16,       14,      2, yes, no) \
+    SC( 50,     16,       14,      3, yes, no) \
+    SC( 51,     16,       14,      4, yes, no) \
+                                               \
+    SC( 52,     17,       15,      1, yes, no) \
+    SC( 53,     17,       15,      2, yes, no) \
+    SC( 54,     17,       15,      3, yes, no) \
     SC( 55,     17,       15,      4,  no, no) \
                                                \
     SC( 56,     18,       16,      1,  no, no) \
@@ -621,489 +629,4627 @@
     SC(108,     31,       29,      1,  no, no) \
     SC(109,     31,       29,      2,  no, no) \
     SC(110,     31,       29,      3,  no, no) \
-    SC(111,     31,       29,      4,  no, no) \
+
+#define        SIZE_CLASSES_DEFINED
+#define        NTBINS                  0
+#define        NLBINS                  32
+#define        NBINS                   55
+#define        NSIZES                  111
+#define        LG_TINY_MAXCLASS        "NA"
+#define        LOOKUP_MAXCLASS         ((((size_t)1) << 11) + (((size_t)4) << 
9))
+#define        SMALL_MAXCLASS          ((((size_t)1) << 17) + (((size_t)3) << 
15))
+#define        LG_LARGE_MINCLASS       18
+#endif
+
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 4 && LG_PAGE == 
12)
+#define        SIZE_CLASSES \
+  /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
+    SC(  0,      3,        3,      0, yes,  3) \
                                                \
-    SC(112,     32,       30,      1,  no, no) \
-    SC(113,     32,       30,      2,  no, no) \
-    SC(114,     32,       30,      3,  no, no) \
-    SC(115,     32,       30,      4,  no, no) \
+    SC(  1,      3,        3,      1, yes,  3) \
+    SC(  2,      4,        4,      1, yes,  4) \
+    SC(  3,      4,        4,      2, yes,  4) \
+    SC(  4,      4,        4,      3, yes,  4) \
                                                \
-    SC(116,     33,       31,      1,  no, no) \
-    SC(117,     33,       31,      2,  no, no) \
-    SC(118,     33,       31,      3,  no, no) \
-    SC(119,     33,       31,      4,  no, no) \
+    SC(  5,      6,        4,      1, yes,  4) \
+    SC(  6,      6,        4,      2, yes,  4) \
+    SC(  7,      6,        4,      3, yes,  4) \
+    SC(  8,      6,        4,      4, yes,  4) \
                                                \
-    SC(120,     34,       32,      1,  no, no) \
-    SC(121,     34,       32,      2,  no, no) \
-    SC(122,     34,       32,      3,  no, no) \
-    SC(123,     34,       32,      4,  no, no) \
+    SC(  9,      7,        5,      1, yes,  5) \
+    SC( 10,      7,        5,      2, yes,  5) \
+    SC( 11,      7,        5,      3, yes,  5) \
+    SC( 12,      7,        5,      4, yes,  5) \
                                                \
-    SC(124,     35,       33,      1,  no, no) \
-    SC(125,     35,       33,      2,  no, no) \
-    SC(126,     35,       33,      3,  no, no) \
-    SC(127,     35,       33,      4,  no, no) \
+    SC( 13,      8,        6,      1, yes,  6) \
+    SC( 14,      8,        6,      2, yes,  6) \
+    SC( 15,      8,        6,      3, yes,  6) \
+    SC( 16,      8,        6,      4, yes,  6) \
                                                \
-    SC(128,     36,       34,      1,  no, no) \
-    SC(129,     36,       34,      2,  no, no) \
-    SC(130,     36,       34,      3,  no, no) \
-    SC(131,     36,       34,      4,  no, no) \
+    SC( 17,      9,        7,      1, yes,  7) \
+    SC( 18,      9,        7,      2, yes,  7) \
+    SC( 19,      9,        7,      3, yes,  7) \
+    SC( 20,      9,        7,      4, yes,  7) \
+                                               \
+    SC( 21,     10,        8,      1, yes,  8) \
+    SC( 22,     10,        8,      2, yes,  8) \
+    SC( 23,     10,        8,      3, yes,  8) \
+    SC( 24,     10,        8,      4, yes,  8) \
+                                               \
+    SC( 25,     11,        9,      1, yes,  9) \
+    SC( 26,     11,        9,      2, yes,  9) \
+    SC( 27,     11,        9,      3, yes,  9) \
+    SC( 28,     11,        9,      4, yes,  9) \
+                                               \
+    SC( 29,     12,       10,      1, yes, no) \
+    SC( 30,     12,       10,      2, yes, no) \
+    SC( 31,     12,       10,      3, yes, no) \
+    SC( 32,     12,       10,      4, yes, no) \
+                                               \
+    SC( 33,     13,       11,      1, yes, no) \
+    SC( 34,     13,       11,      2, yes, no) \
+    SC( 35,     13,       11,      3, yes, no) \
+    SC( 36,     13,       11,      4,  no, no) \
+                                               \
+    SC( 37,     14,       12,      1,  no, no) \
+    SC( 38,     14,       12,      2,  no, no) \
+    SC( 39,     14,       12,      3,  no, no) \
+    SC( 40,     14,       12,      4,  no, no) \
+                                               \
+    SC( 41,     15,       13,      1,  no, no) \
+    SC( 42,     15,       13,      2,  no, no) \
+    SC( 43,     15,       13,      3,  no, no) \
+    SC( 44,     15,       13,      4,  no, no) \
+                                               \
+    SC( 45,     16,       14,      1,  no, no) \
+    SC( 46,     16,       14,      2,  no, no) \
+    SC( 47,     16,       14,      3,  no, no) \
+    SC( 48,     16,       14,      4,  no, no) \
+                                               \
+    SC( 49,     17,       15,      1,  no, no) \
+    SC( 50,     17,       15,      2,  no, no) \
+    SC( 51,     17,       15,      3,  no, no) \
+    SC( 52,     17,       15,      4,  no, no) \
+                                               \
+    SC( 53,     18,       16,      1,  no, no) \
+    SC( 54,     18,       16,      2,  no, no) \
+    SC( 55,     18,       16,      3,  no, no) \
+    SC( 56,     18,       16,      4,  no, no) \
+                                               \
+    SC( 57,     19,       17,      1,  no, no) \
+    SC( 58,     19,       17,      2,  no, no) \
+    SC( 59,     19,       17,      3,  no, no) \
+    SC( 60,     19,       17,      4,  no, no) \
+                                               \
+    SC( 61,     20,       18,      1,  no, no) \
+    SC( 62,     20,       18,      2,  no, no) \
+    SC( 63,     20,       18,      3,  no, no) \
+    SC( 64,     20,       18,      4,  no, no) \
+                                               \
+    SC( 65,     21,       19,      1,  no, no) \
+    SC( 66,     21,       19,      2,  no, no) \
+    SC( 67,     21,       19,      3,  no, no) \
+    SC( 68,     21,       19,      4,  no, no) \
+                                               \
+    SC( 69,     22,       20,      1,  no, no) \
+    SC( 70,     22,       20,      2,  no, no) \
+    SC( 71,     22,       20,      3,  no, no) \
+    SC( 72,     22,       20,      4,  no, no) \
+                                               \
+    SC( 73,     23,       21,      1,  no, no) \
+    SC( 74,     23,       21,      2,  no, no) \
+    SC( 75,     23,       21,      3,  no, no) \
+    SC( 76,     23,       21,      4,  no, no) \
+                                               \
+    SC( 77,     24,       22,      1,  no, no) \
+    SC( 78,     24,       22,      2,  no, no) \
+    SC( 79,     24,       22,      3,  no, no) \
+    SC( 80,     24,       22,      4,  no, no) \
+                                               \
+    SC( 81,     25,       23,      1,  no, no) \
+    SC( 82,     25,       23,      2,  no, no) \
+    SC( 83,     25,       23,      3,  no, no) \
+    SC( 84,     25,       23,      4,  no, no) \
+                                               \
+    SC( 85,     26,       24,      1,  no, no) \
+    SC( 86,     26,       24,      2,  no, no) \
+    SC( 87,     26,       24,      3,  no, no) \
+    SC( 88,     26,       24,      4,  no, no) \
+                                               \
+    SC( 89,     27,       25,      1,  no, no) \
+    SC( 90,     27,       25,      2,  no, no) \
+    SC( 91,     27,       25,      3,  no, no) \
+    SC( 92,     27,       25,      4,  no, no) \
+                                               \
+    SC( 93,     28,       26,      1,  no, no) \
+    SC( 94,     28,       26,      2,  no, no) \
+    SC( 95,     28,       26,      3,  no, no) \
+    SC( 96,     28,       26,      4,  no, no) \
+                                               \
+    SC( 97,     29,       27,      1,  no, no) \
+    SC( 98,     29,       27,      2,  no, no) \
+    SC( 99,     29,       27,      3,  no, no) \
+    SC(100,     29,       27,      4,  no, no) \
+                                               \
+    SC(101,     30,       28,      1,  no, no) \
+    SC(102,     30,       28,      2,  no, no) \
+    SC(103,     30,       28,      3,  no, no) \
+    SC(104,     30,       28,      4,  no, no) \
+                                               \
+    SC(105,     31,       29,      1,  no, no) \
+    SC(106,     31,       29,      2,  no, no) \
+    SC(107,     31,       29,      3,  no, no) \
+
+#define        SIZE_CLASSES_DEFINED
+#define        NTBINS                  1
+#define        NLBINS                  29
+#define        NBINS                   36
+#define        NSIZES                  108
+#define        LG_TINY_MAXCLASS        3
+#define        LOOKUP_MAXCLASS         ((((size_t)1) << 11) + (((size_t)4) << 
9))
+#define        SMALL_MAXCLASS          ((((size_t)1) << 13) + (((size_t)3) << 
11))
+#define        LG_LARGE_MINCLASS       14
+#endif
+
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 4 && LG_PAGE == 
13)
+#define        SIZE_CLASSES \
+  /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
+    SC(  0,      3,        3,      0, yes,  3) \
+                                               \
+    SC(  1,      3,        3,      1, yes,  3) \
+    SC(  2,      4,        4,      1, yes,  4) \
+    SC(  3,      4,        4,      2, yes,  4) \
+    SC(  4,      4,        4,      3, yes,  4) \
+                                               \
+    SC(  5,      6,        4,      1, yes,  4) \
+    SC(  6,      6,        4,      2, yes,  4) \
+    SC(  7,      6,        4,      3, yes,  4) \
+    SC(  8,      6,        4,      4, yes,  4) \
+                                               \
+    SC(  9,      7,        5,      1, yes,  5) \
+    SC( 10,      7,        5,      2, yes,  5) \
+    SC( 11,      7,        5,      3, yes,  5) \
+    SC( 12,      7,        5,      4, yes,  5) \
+                                               \
+    SC( 13,      8,        6,      1, yes,  6) \
+    SC( 14,      8,        6,      2, yes,  6) \
+    SC( 15,      8,        6,      3, yes,  6) \
+    SC( 16,      8,        6,      4, yes,  6) \
+                                               \
+    SC( 17,      9,        7,      1, yes,  7) \
+    SC( 18,      9,        7,      2, yes,  7) \
+    SC( 19,      9,        7,      3, yes,  7) \
+    SC( 20,      9,        7,      4, yes,  7) \
+                                               \
+    SC( 21,     10,        8,      1, yes,  8) \
+    SC( 22,     10,        8,      2, yes,  8) \
+    SC( 23,     10,        8,      3, yes,  8) \
+    SC( 24,     10,        8,      4, yes,  8) \
+                                               \
+    SC( 25,     11,        9,      1, yes,  9) \
+    SC( 26,     11,        9,      2, yes,  9) \
+    SC( 27,     11,        9,      3, yes,  9) \
+    SC( 28,     11,        9,      4, yes,  9) \
+                                               \
+    SC( 29,     12,       10,      1, yes, no) \
+    SC( 30,     12,       10,      2, yes, no) \
+    SC( 31,     12,       10,      3, yes, no) \
+    SC( 32,     12,       10,      4, yes, no) \
+                                               \
+    SC( 33,     13,       11,      1, yes, no) \
+    SC( 34,     13,       11,      2, yes, no) \
+    SC( 35,     13,       11,      3, yes, no) \
+    SC( 36,     13,       11,      4, yes, no) \
+                                               \
+    SC( 37,     14,       12,      1, yes, no) \
+    SC( 38,     14,       12,      2, yes, no) \
+    SC( 39,     14,       12,      3, yes, no) \
+    SC( 40,     14,       12,      4,  no, no) \
+                                               \
+    SC( 41,     15,       13,      1,  no, no) \
+    SC( 42,     15,       13,      2,  no, no) \
+    SC( 43,     15,       13,      3,  no, no) \
+    SC( 44,     15,       13,      4,  no, no) \
+                                               \
+    SC( 45,     16,       14,      1,  no, no) \
+    SC( 46,     16,       14,      2,  no, no) \
+    SC( 47,     16,       14,      3,  no, no) \
+    SC( 48,     16,       14,      4,  no, no) \
+                                               \
+    SC( 49,     17,       15,      1,  no, no) \
+    SC( 50,     17,       15,      2,  no, no) \
+    SC( 51,     17,       15,      3,  no, no) \
+    SC( 52,     17,       15,      4,  no, no) \
+                                               \
+    SC( 53,     18,       16,      1,  no, no) \
+    SC( 54,     18,       16,      2,  no, no) \
+    SC( 55,     18,       16,      3,  no, no) \
+    SC( 56,     18,       16,      4,  no, no) \
+                                               \
+    SC( 57,     19,       17,      1,  no, no) \
+    SC( 58,     19,       17,      2,  no, no) \
+    SC( 59,     19,       17,      3,  no, no) \
+    SC( 60,     19,       17,      4,  no, no) \
+                                               \
+    SC( 61,     20,       18,      1,  no, no) \
+    SC( 62,     20,       18,      2,  no, no) \
+    SC( 63,     20,       18,      3,  no, no) \
+    SC( 64,     20,       18,      4,  no, no) \
+                                               \
+    SC( 65,     21,       19,      1,  no, no) \
+    SC( 66,     21,       19,      2,  no, no) \
+    SC( 67,     21,       19,      3,  no, no) \
+    SC( 68,     21,       19,      4,  no, no) \
+                                               \
+    SC( 69,     22,       20,      1,  no, no) \
+    SC( 70,     22,       20,      2,  no, no) \
+    SC( 71,     22,       20,      3,  no, no) \
+    SC( 72,     22,       20,      4,  no, no) \
+                                               \
+    SC( 73,     23,       21,      1,  no, no) \
+    SC( 74,     23,       21,      2,  no, no) \
+    SC( 75,     23,       21,      3,  no, no) \
+    SC( 76,     23,       21,      4,  no, no) \
+                                               \
+    SC( 77,     24,       22,      1,  no, no) \
+    SC( 78,     24,       22,      2,  no, no) \
+    SC( 79,     24,       22,      3,  no, no) \
+    SC( 80,     24,       22,      4,  no, no) \
+                                               \
+    SC( 81,     25,       23,      1,  no, no) \
+    SC( 82,     25,       23,      2,  no, no) \
+    SC( 83,     25,       23,      3,  no, no) \
+    SC( 84,     25,       23,      4,  no, no) \
+                                               \
+    SC( 85,     26,       24,      1,  no, no) \
+    SC( 86,     26,       24,      2,  no, no) \
+    SC( 87,     26,       24,      3,  no, no) \
+    SC( 88,     26,       24,      4,  no, no) \
+                                               \
+    SC( 89,     27,       25,      1,  no, no) \
+    SC( 90,     27,       25,      2,  no, no) \
+    SC( 91,     27,       25,      3,  no, no) \
+    SC( 92,     27,       25,      4,  no, no) \
+                                               \
+    SC( 93,     28,       26,      1,  no, no) \
+    SC( 94,     28,       26,      2,  no, no) \
+    SC( 95,     28,       26,      3,  no, no) \
+    SC( 96,     28,       26,      4,  no, no) \
+                                               \
+    SC( 97,     29,       27,      1,  no, no) \
+    SC( 98,     29,       27,      2,  no, no) \
+    SC( 99,     29,       27,      3,  no, no) \
+    SC(100,     29,       27,      4,  no, no) \
+                                               \
+    SC(101,     30,       28,      1,  no, no) \
+    SC(102,     30,       28,      2,  no, no) \
+    SC(103,     30,       28,      3,  no, no) \
+    SC(104,     30,       28,      4,  no, no) \
+                                               \
+    SC(105,     31,       29,      1,  no, no) \
+    SC(106,     31,       29,      2,  no, no) \
+    SC(107,     31,       29,      3,  no, no) \
+
+#define        SIZE_CLASSES_DEFINED
+#define        NTBINS                  1
+#define        NLBINS                  29
+#define        NBINS                   40
+#define        NSIZES                  108
+#define        LG_TINY_MAXCLASS        3
+#define        LOOKUP_MAXCLASS         ((((size_t)1) << 11) + (((size_t)4) << 
9))
+#define        SMALL_MAXCLASS          ((((size_t)1) << 14) + (((size_t)3) << 
12))
+#define        LG_LARGE_MINCLASS       15
+#endif
+
+#if (LG_SIZEOF_PTR == 2 && LG_TINY_MIN == 3 && LG_QUANTUM == 4 && LG_PAGE == 
14)
+#define        SIZE_CLASSES \
+  /* index, lg_grp, lg_delta, ndelta, bin, lg_delta_lookup */ \
+    SC(  0,      3,        3,      0, yes,  3) \
+                                               \
+    SC(  1,      3,        3,      1, yes,  3) \
+    SC(  2,      4,        4,      1, yes,  4) \
+    SC(  3,      4,        4,      2, yes,  4) \
+    SC(  4,      4,        4,      3, yes,  4) \
+                                               \
+    SC(  5,      6,        4,      1, yes,  4) \
+    SC(  6,      6,        4,      2, yes,  4) \
+    SC(  7,      6,        4,      3, yes,  4) \
+    SC(  8,      6,        4,      4, yes,  4) \
+                                               \
+    SC(  9,      7,        5,      1, yes,  5) \
+    SC( 10,      7,        5,      2, yes,  5) \
+    SC( 11,      7,        5,      3, yes,  5) \
+    SC( 12,      7,        5,      4, yes,  5) \
+                                               \
+    SC( 13,      8,        6,      1, yes,  6) \
+    SC( 14,      8,        6,      2, yes,  6) \
+    SC( 15,      8,        6,      3, yes,  6) \
+    SC( 16,      8,        6,      4, yes,  6) \
+                                               \
+    SC( 17,      9,        7,      1, yes,  7) \
+    SC( 18,      9,        7,      2, yes,  7) \
+    SC( 19,      9,        7,      3, yes,  7) \
+    SC( 20,      9,        7,      4, yes,  7) \
+                                               \
+    SC( 21,     10,        8,      1, yes,  8) \
+    SC( 22,     10,        8,      2, yes,  8) \
+    SC( 23,     10,        8,      3, yes,  8) \
+    SC( 24,     10,        8,      4, yes,  8) \
+                                               \
+    SC( 25,     11,        9,      1, yes,  9) \
+    SC( 26,     11,        9,      2, yes,  9) \
+    SC( 27,     11,        9,      3, yes,  9) \
+    SC( 28,     11,        9,      4, yes,  9) \
+                                               \
+    SC( 29,     12,       10,      1, yes, no) \
+    SC( 30,     12,       10,      2, yes, no) \
+    SC( 31,     12,       10,      3, yes, no) \
+    SC( 32,     12,       10,      4, yes, no) \
+                                               \
+    SC( 33,     13,       11,      1, yes, no) \
+    SC( 34,     13,       11,      2, yes, no) \
+    SC( 35,     13,       11,      3, yes, no) \
+    SC( 36,     13,       11,      4, yes, no) \
+                                               \
+    SC( 37,     14,       12,      1, yes, no) \
+    SC( 38,     14,       12,      2, yes, no) \
+    SC( 39,     14,       12,      3, yes, no) \
+    SC( 40,     14,       12,      4, yes, no) \
+                                               \
+    SC( 41,     15,       13,      1, yes, no) \
+    SC( 42,     15,       13,      2, yes, no) \
+    SC( 43,     15,       13,      3, yes, no) \
+    SC( 44,     15,       13,      4,  no, no) \
+                                               \

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to