[project @ 2005-10-14 13:11:21 by simonmar]

StrHash doesn't appear to be used; remove it.  I think it was an
earlier version of the string hashing code in Hash.c.

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index f98246c..3e3e2d6 100644 (file)
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -23,7 +23,6 @@
 #include "ProfHeap.h"
 #include "Stats.h"
 #include "Hash.h"
-#include "StrHash.h"
 #include "RetainerProfile.h"
 #include "LdvProfile.h"
 #include "Arena.h"

diff --git a/ghc/rts/StrHash.c b/ghc/rts/StrHash.c
deleted file mode 100644 (file)
index 092aa50..0000000
--- a/ghc/rts/StrHash.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -----------------------------------------------------------------------------
- *
- * (c) The GHC Team, 1994-2000
- *
- * Hashing functions based on:
- *
- *   "Fast Hashing of Variable Length Text Strings"
- *    Peter K. Pearson, CACM June 1990
- *
- * They return a 32 bit value containing 16 bits of hash value.
- *
- * ---------------------------------------------------------------------------*/
-
-#include "PosixSource.h"
-#include "Rts.h"
-#include "StrHash.h"
-
-static const unsigned char auxTable[] = {
-0x01, 0x57, 0x31, 0x0c, 0xb0, 0xb2, 0x66, 0xa6,
-0x79, 0xc1, 0x06, 0x54, 0xf9, 0xe6, 0x2c, 0xa3,
-0x0e, 0xc5, 0xd5, 0xb5, 0xa1, 0x55, 0xda, 0x50,
-0x40, 0xef, 0x18, 0xe2, 0xec, 0x8e, 0x26, 0xc8,
-0x6e, 0xb1, 0x68, 0x67, 0x8d, 0xfd, 0xff, 0x32,
-0x4d, 0x65, 0x51, 0x12, 0x2d, 0x60, 0x1f, 0xde,
-0x19, 0x6b, 0xbe, 0x46, 0x56, 0xed, 0xf0, 0x22,
-0x48, 0xf2, 0x14, 0xd6, 0xf4, 0xe3, 0x95, 0xeb,
-0x61, 0xea, 0x39, 0x16, 0x3c, 0xfa, 0x52, 0xaf,
-0xd0, 0x05, 0x7f, 0xc7, 0x6f, 0x3e, 0x87, 0xf8,
-0xae, 0xa9, 0xd3, 0x3a, 0x42, 0x9a, 0x6a, 0xc3,
-0xf5, 0xab, 0x11, 0xbb, 0xb6, 0xb3, 0x00, 0xf3,
-0x84, 0x38, 0x94, 0x4b, 0x80, 0x85, 0x9e, 0x64,
-0x82, 0x7e, 0x5b, 0x0d, 0x99, 0xf6, 0xd8, 0xdb,
-0x77, 0x44, 0xdf, 0x4e, 0x53, 0x58, 0xc9, 0x63,
-0x7a, 0x0b, 0x5c, 0x20, 0x88, 0x72, 0x34, 0x0a,
-0x8a, 0x1e, 0x30, 0xb7, 0x9c, 0x23, 0x3d, 0x1a,
-0x8f, 0x4a, 0xfb, 0x5e, 0x81, 0xa2, 0x3f, 0x98,
-0xaa, 0x07, 0x73, 0xa7, 0xf1, 0xce, 0x03, 0x96,
-0x37, 0x3b, 0x97, 0xdc, 0x5a, 0x35, 0x17, 0x83,
-0x7d, 0xad, 0x0f, 0xee, 0x4f, 0x5f, 0x59, 0x10,
-0x69, 0x89, 0xe1, 0xe0, 0xd9, 0xa0, 0x25, 0x7b,
-0x76, 0x49, 0x02, 0x9d, 0x2e, 0x74, 0x09, 0x91,
-0x86, 0xe4, 0xcf, 0xd4, 0xca, 0xd7, 0x45, 0xe5,
-0x1b, 0xbc, 0x43, 0x7c, 0xa8, 0xfc, 0x2a, 0x04,
-0x1d, 0x6c, 0x15, 0xf7, 0x13, 0xcd, 0x27, 0xcb,
-0xe9, 0x28, 0xba, 0x93, 0xc6, 0xc0, 0x9b, 0x21,
-0xa4, 0xbf, 0x62, 0xcc, 0xa5, 0xb4, 0x75, 0x4c,
-0x8c, 0x24, 0xd2, 0xac, 0x29, 0x36, 0x9f, 0x08,
-0xb9, 0xe8, 0x71, 0xc4, 0xe7, 0x2f, 0x92, 0x78,
-0x33, 0x41, 0x1c, 0x90, 0xfe, 0xdd, 0x5d, 0xbd,
-0xc2, 0x8b, 0x70, 0x2b, 0x47, 0x6d, 0xb8, 0xd1};
-
-hash_t
-hash_str(char *str)
-{
-    hash_t h1, h2;
-    hash_t ch = (hash_t) *(str++);
-
-    if (ch == 0) return 0;
-
-    h1 = (hash_t) auxTable[ch];
-    h2 = (hash_t) auxTable[ch+1];
-
-    while ( (ch = (hash_t)*(str++) ) != 0) {
-       h1 = (hash_t) auxTable[h1^ch];
-       h2 = (hash_t) auxTable[h2^ch];
-    }
-    
-    return ( h2 << 8 | h1 );
-}
-
-hash_t
-hash_fixed(char *data, nat len)
-{
-    hash_t ch = (hash_t) *(data++);
-    hash_t h1 = (hash_t) auxTable[ch];
-    hash_t h2 = (hash_t) auxTable[ch+1];
-
-    ASSERT(len > 0);
-
-    while (--len > 0) {
-       ch = (hash_t) *(data++);
-       h1 = (hash_t) auxTable[h1^ch];
-       h2 = (hash_t) auxTable[h2^ch];
-    }
-    
-    return ( h2 << 8 | h1 );
-}

diff --git a/ghc/rts/StrHash.h b/ghc/rts/StrHash.h
deleted file mode 100644 (file)
index bdf6196..0000000
--- a/ghc/rts/StrHash.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -----------------------------------------------------------------------------
- *
- * (c) The GHC Team, 1994-2000
- *
- * Hashing functions based on:
- *
- *   "Fast Hashing of Variable Length Text Strings"
- *    Peter K. Pearson, CACM June 1990
- *
- * They return a 32 bit value containing 16 bits of hash value.
- *
- * ---------------------------------------------------------------------------*/
-
-typedef unsigned long hash_t;
-
-hash_t hash_str(char *str);
-hash_t hash_fixed(char *data, nat len);