Merged 1.075 frontend.

dmd/root/stringtable.c

@@ -9,15 +9,70 @@
 
 
 #include <stdio.h>
-#include <string.h>
+#include <stdint.h>                     // uint{8|16|32}_t
+#include <string.h>                     // memcpy()
 #include <stdlib.h>
 
 #include "root.h"
-#include "rmem.h"
-#include "dchar.h"
-#include "lstring.h"
+#include "rmem.h"                       // mem
 #include "stringtable.h"
 
+hash_t calcHash(const char *str, size_t len)
+{
+    hash_t hash = 0;
+
+    while (1)
+    {
+        switch (len)
+        {
+            case 0:
+                return hash;
+
+            case 1:
+                hash *= 37;
+                hash += *(const uint8_t *)str;
+                return hash;
+
+            case 2:
+                hash *= 37;
+#if LITTLE_ENDIAN
+                hash += *(const uint16_t *)str;
+#else
+                hash += str[0] * 256 + str[1];
+#endif
+                return hash;
+
+            case 3:
+                hash *= 37;
+#if LITTLE_ENDIAN
+                hash += (*(const uint16_t *)str << 8) +
+                        ((const uint8_t *)str)[2];
+#else
+                hash += (str[0] * 256 + str[1]) * 256 + str[2];
+#endif
+                return hash;
+
+            default:
+                hash *= 37;
+#if LITTLE_ENDIAN
+                hash += *(const uint32_t *)str;
+#else
+                hash += ((str[0] * 256 + str[1]) * 256 + str[2]) * 256 + str[3];
+#endif
+                str += 4;
+                len -= 4;
+                break;
+        }
+    }
+}
+
+void StringValue::ctor(const char *p, unsigned length)
+{
+    this->length = length;
+    this->lstring[length] = 0;
+    memcpy(this->lstring, p, length * sizeof(char));
+}
+
 void StringTable::init(unsigned size)
 {
     table = (void **)mem.calloc(size, sizeof(void *));
@@ -46,21 +101,20 @@ struct StringEntry
 
     StringValue value;
 
-    static StringEntry *alloc(const dchar *s, unsigned len);
+    static StringEntry *alloc(const char *s, unsigned len);
 };
 
-StringEntry *StringEntry::alloc(const dchar *s, unsigned len)
+StringEntry *StringEntry::alloc(const char *s, unsigned len)
 {
     StringEntry *se;
 
-    se = (StringEntry *) mem.calloc(1,sizeof(StringEntry) - sizeof(Lstring) + Lstring::size(len));
-    se->value.lstring.length = len;
-    se->hash = Dchar::calcHash(s,len);
-    memcpy(se->value.lstring.string, s, len * sizeof(dchar));
+    se = (StringEntry *) mem.calloc(1,sizeof(StringEntry) + len + 1);
+    se->value.ctor(s, len);
+    se->hash = calcHash(s,len);
     return se;
 }
 
-void **StringTable::search(const dchar *s, unsigned len)
+void **StringTable::search(const char *s, unsigned len)
 {
     hash_t hash;
     unsigned u;
@@ -68,7 +122,7 @@ void **StringTable::search(const dchar *s, unsigned len)
     StringEntry **se;
 
     //printf("StringTable::search(%p,%d)\n",s,len);
-    hash = Dchar::calcHash(s,len);
+    hash = calcHash(s,len);
     u = hash % tabledim;
     se = (StringEntry **)&table[u];
     //printf("\thash = %d, u = %d\n",hash,u);
@@ -77,10 +131,10 @@ void **StringTable::search(const dchar *s, unsigned len)
         cmp = (*se)->hash - hash;
         if (cmp == 0)
         {
-            cmp = (*se)->value.lstring.len() - len;
+            cmp = (*se)->value.len() - len;
             if (cmp == 0)
             {
-                cmp = Dchar::memcmp(s,(*se)->value.lstring.toDchars(),len);
+                cmp = ::memcmp(s,(*se)->value.toDchars(),len);
                 if (cmp == 0)
                     break;
             }
@@ -94,7 +148,7 @@ void **StringTable::search(const dchar *s, unsigned len)
     return (void **)se;
 }
 
-StringValue *StringTable::lookup(const dchar *s, unsigned len)
+StringValue *StringTable::lookup(const char *s, unsigned len)
 {   StringEntry *se;
 
     se = *(StringEntry **)search(s,len);
@@ -104,7 +158,7 @@ StringValue *StringTable::lookup(const dchar *s, unsigned len)
         return NULL;
 }
 
-StringValue *StringTable::update(const dchar *s, unsigned len)
+StringValue *StringTable::update(const char *s, unsigned len)
 {   StringEntry **pse;
     StringEntry *se;
 
@@ -118,7 +172,7 @@ StringValue *StringTable::update(const dchar *s, unsigned len)
     return &se->value;
 }
 
-StringValue *StringTable::insert(const dchar *s, unsigned len)
+StringValue *StringTable::insert(const char *s, unsigned len)
 {   StringEntry **pse;
     StringEntry *se;
 
@@ -133,7 +187,3 @@ StringValue *StringTable::insert(const dchar *s, unsigned len)
     }
     return &se->value;
 }
-
-
-
-