Cleanups

[xonotic/gmqcc.git] / typedef.c

diff --git a/typedef.c b/typedef.c
index 9486576bd61585d8e16221f478a6c1588f88f54e..4ee7348f7430eaa5b84f9c59ff1bab556562a06d 100644 (file)
--- a/typedef.c
+++ b/typedef.c
@@ -24,12 +24,6 @@
 #include <stdint.h> /* replace if stdint.h doesn't exist! */
 #include <limits.h>
 #include "gmqcc.h"
-
-/*
- * This implements a hashtable for typedef type keywords which end up
- * being translated to their full-expressed type.  This uses a singly
- * linked list with a fast hash function.
- */
 static typedef_node *typedef_table[1024];
 
 void typedef_init() {
@@ -38,118 +32,19 @@ void typedef_init() {
                typedef_table[i] = NULL;
 }
 
-/*
- * Fast collisionless hashfunction based off of:
- * http://www.azillionmonkeys.com/qed/hash.html
- * By: Paul Hsieh
- * 
- * The code is licensed under LGPL 2.1 or Paul
- * Hsieh's derivative license. Stated on his page
- * quote:
- * 
- *     The LGPL 2.1 is not necessarily a more liberal license than my 
- *     derivative license, but this additional licensing makes the code
- *     available to more developers. Note that this does not give you 
- *     multi-licensing rights. You can only use the code under one of
- *     the licenses at a time. 
- * 
- *  Paul Hsieh derivative license
- *
- *     The derivative content includes raw computer source code, ideas, 
- *     opinions, and excerpts whose original source is covered under 
- *     another license and transformations of such derivatives.
- *     Note that mere excerpts by themselves (with the exception of raw
- *     source code) are not considered derivative works under this license.
- *     Use and redistribution is limited to the following conditions:
- * 
- *     One may not create a derivative work which, in any way, violates the
- *     Paul Hsieh exposition license described above on the original content.
- *
- *     One may not apply a license to a derivative work that precludes anyone
- *     else from using and redistributing derivative content.
- *
- *     One may not attribute any derivative content to authors not involved
- *     in the creation of the content, though an attribution to the author
- *     is not necessary.
- * 
- *  Paul Hsieh exposition license
- *
- *     The content of all text, figures, tables and displayed layout is
- *     copyrighted by its author and owner Paul Hsieh unless specifically
- *     denoted otherwise. Redistribution is limited to the following conditions:
- *
- *     The redistributor must fully attribute the content's authorship and
- *     make a good faith effort to cite the original location of the original
- *     content.
- *
- *     The content may not be modified via excerpt or otherwise with the
- *     exception of additional citations such as described above without prior
- *     consent of Paul Hsieh.
- *
- *     The content may not be subject to a change in license without prior
- *     consent of Paul Hsieh.
- *
- *     The content may be used for commercial purposes.
- */
-
-#if (defined(__GNUC__) && defined(__i386__)) || defined(_MSC_VER)
-/*
- * Unalligned loads are faster if we can do them, otherwise fall back
- * to safer version below.
- */
-#   define load16(D) (*((const uint16_t*)(D)))
-#else
-#   define load16(D) ((((uint32_t)(((const uint8_t*)(D))[1])) << 8) + \
-                        (uint32_t)(((const uint8_t*)(D))[0]))
-#endif
-unsigned int inline typedef_hash(const char *data) {
-       uint32_t hash = strlen(data);
-       uint32_t size = hash;
-       uint32_t temp = 0;
+unsigned int typedef_hash(const char *s) {
+       unsigned int hash = 0;
+       unsigned int size = strlen(s);
+       unsigned int iter;
        
-       int last;
-       if (size <= 0|| data == NULL)
-               return -1;
-       
-       last   = size & 3;
-       size >>= 2;
-       
-       /* main loop */
-       for (;size > 0; size--) {
-               hash += (load16(data));
-               temp  = (load16(data+2) << 11) ^ hash;
-               hash  = (hash << 16) ^ temp;
-               data += sizeof(uint16_t) << 1;
-               hash += hash >> 11;
+       for (iter = 0; iter < size; iter++) {
+               hash += s[iter];
+               hash += (hash << 10);
+               hash ^= (hash >> 6);
        }
-       
-       /* ends */
-       switch (last) {
-               case 3:
-                       hash += load16(data);
-                       hash ^= hash << 16;
-                       hash ^= ((signed char)data[sizeof(uint16_t)]) << 8;
-                       hash += hash >> 11;
-                       break;
-               case 2:
-                       hash += load16(data);
-                       hash ^= hash << 11;
-                       hash += hash >> 17;
-                       break;
-               case 1:
-                       hash += (signed char)*data;
-                       hash ^= hash << 10;
-                       hash += hash >> 1;
-                       break;
-       }
-       
-       /* force avalanching of final 127 bits */
-       hash ^= hash << 3;
-       hash += hash >> 5;
-       hash ^= hash << 4;
-       hash += hash >> 17;
-       hash ^= hash << 25;
-       hash += hash >> 6;
+       hash += (hash << 3);
+       hash ^= (hash >> 11);
+       hash += (hash << 15);
        
        return hash % 1024;
 }