--- xnu/xnu-1228/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-792.21.3/libkern/c++/OSSymbol.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -51,24 +51,6 @@
 #define ACCUMSIZE(s)
 #endif
 
-#define INITIAL_POOL_SIZE  (exp2ml(1 + log2(kInitBucketCount)))
-
-#define GROW_FACTOR   (1)
-#define SHRINK_FACTOR (3)
-
-#define GROW_POOL()     do \
-    if (count * GROW_FACTOR > nBuckets) { \
-        reconstructSymbols(true); \
-    } \
-while (0)
-
-#define SHRINK_POOL()     do \
-    if (count * SHRINK_FACTOR < nBuckets && \
-        nBuckets > INITIAL_POOL_SIZE) { \
-        reconstructSymbols(false); \
-    } \
-while (0)
-
 class OSSymbolPool
 {
 private:
@@ -102,8 +84,7 @@
     static unsigned long log2(unsigned int x);
     static unsigned long exp2ml(unsigned int x);
 
-    void reconstructSymbols(void);
-    void reconstructSymbols(bool grow);
+    void reconstructSymbols();
 
 public:
     static void *operator new(size_t size);
@@ -138,14 +119,14 @@
 
 void OSSymbolPool::operator delete(void *mem, size_t size)
 {
-    kfree(mem, size);
+    kfree((vm_offset_t)mem, size);
     ACCUMSIZE(-size);
 }
 
 bool OSSymbolPool::init()
 {
     count = 0;
-    nBuckets = INITIAL_POOL_SIZE;
+    nBuckets = exp2ml(1 + log2(kInitBucketCount));
     buckets = (Bucket *) kalloc(nBuckets * sizeof(Bucket));
     ACCUMSIZE(nBuckets * sizeof(Bucket));
     if (!buckets)
@@ -170,12 +151,12 @@
 OSSymbolPool::~OSSymbolPool()
 {
     if (buckets) {
-        kfree(buckets, nBuckets * sizeof(Bucket));
+        kfree((vm_offset_t)buckets, nBuckets * sizeof(Bucket));
         ACCUMSIZE(-(nBuckets * sizeof(Bucket)));
     }
 
     if (poolGate)
-        kfree(poolGate, 36 * 4);
+        kfree((vm_offset_t) poolGate, 36 * 4);
 }
 
 unsigned long OSSymbolPool::log2(unsigned int x)
@@ -217,35 +198,14 @@
         return thisBucket->symbolP[stateP->j];
 }
 
-void OSSymbolPool::reconstructSymbols(void)
-{
-    this->reconstructSymbols(true);
-}
-
-void OSSymbolPool::reconstructSymbols(bool grow)
-{
-    unsigned int new_nBuckets = nBuckets;
+void OSSymbolPool::reconstructSymbols()
+{
+    OSSymbolPool old(this);
     OSSymbol *insert;
     OSSymbolPoolState state;
 
-    if (grow) {
-        new_nBuckets += new_nBuckets + 1;
-    } else {
-       /* Don't shrink the pool below the default initial size.
-        */
-        if (nBuckets <= INITIAL_POOL_SIZE) {
-            return;
-        }
-        new_nBuckets = (new_nBuckets - 1) / 2;
-    }
-
-   /* Create old pool to iterate after doing above check, cause it
-    * gets finalized at return.
-    */
-    OSSymbolPool old(this);
-
+    nBuckets += nBuckets + 1;
     count = 0;
-    nBuckets = new_nBuckets;
     buckets = (Bucket *) kalloc(nBuckets * sizeof(Bucket));
     ACCUMSIZE(nBuckets * sizeof(Bucket));
     /* @@@ gvdl: Zero test and panic if can't set up pool */
@@ -321,7 +281,8 @@
         thisBucket->symbolP = list;
         thisBucket->count++;
         count++;
-        GROW_POOL();
+        if (count > nBuckets)
+            reconstructSymbols();
 
         return sym;
     }
@@ -340,10 +301,11 @@
     /* @@@ gvdl: Zero test and panic if can't set up pool */
     list[0] = sym;
     bcopy(thisBucket->symbolP, list + 1, j * sizeof(OSSymbol *));
-    kfree(thisBucket->symbolP, j * sizeof(OSSymbol *));
+    kfree((vm_offset_t)thisBucket->symbolP, j * sizeof(OSSymbol *));
     ACCUMSIZE(-(j * sizeof(OSSymbol *)));
     thisBucket->symbolP = list;
-    GROW_POOL();
+    if (count > nBuckets)
+        reconstructSymbols();
 
     return sym;
 }
@@ -369,7 +331,6 @@
             thisBucket->symbolP = 0;
             count--;
             thisBucket->count--;
-            SHRINK_POOL();
             return;
         }
         return;
@@ -379,22 +340,20 @@
         probeSymbol = list[0];
         if (probeSymbol == sym) {
             thisBucket->symbolP = (OSSymbol **) list[1];
-            kfree(list, 2 * sizeof(OSSymbol *));
+            kfree((vm_offset_t)list, 2 * sizeof(OSSymbol *));
 	    ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
             count--;
             thisBucket->count--;
-            SHRINK_POOL();
             return;
         }
 
         probeSymbol = list[1];
         if (probeSymbol == sym) {
             thisBucket->symbolP = (OSSymbol **) list[0];
-            kfree(list, 2 * sizeof(OSSymbol *));
+            kfree((vm_offset_t)list, 2 * sizeof(OSSymbol *));
 	    ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
             count--;
             thisBucket->count--;
-            SHRINK_POOL();
             return;
         }
         return;
@@ -414,7 +373,7 @@
                 bcopy(thisBucket->symbolP + thisBucket->count-j,
                       list + thisBucket->count-1-j,
                       j * sizeof(OSSymbol *));
-            kfree(thisBucket->symbolP, thisBucket->count * sizeof(OSSymbol *));
+            kfree((vm_offset_t)thisBucket->symbolP, thisBucket->count * sizeof(OSSymbol *));
 	    ACCUMSIZE(-(thisBucket->count * sizeof(OSSymbol *)));
             thisBucket->symbolP = list;
             count--;