Fix another Blub bug .. learn to use comments properly :P

[xonotic/gmqcc.git] / code.c

diff --git a/code.c b/code.c
index 0ad8becb8de54bc50c47cb434164bb46a95f2c62..3590b41b97c203c47c96583fffa078aa034deec1 100644 (file)
--- a/code.c
+++ b/code.c
@@ -33,6 +33,13 @@ char                   *code_chars;
 uint16_t                code_crc;
 uint32_t                code_entfields;
 
+/* This is outrageous! */
+#define QCINT_ENTRY void*
+#define QCINT_TO_HASH_ENTRY(q) ((void*)(uintptr_t)(q))
+#define HASH_ENTRY_TO_QCINT(h) ((qcint)(uintptr_t)(h))
+static ht     code_string_cache;
+static qcint  code_string_cached_empty;
+
 void code_push_statement(prog_section_statement *stmt, int linenum)
 {
     vec_push(code_statements, *stmt);
@@ -46,13 +53,15 @@ void code_pop_statement()
 }
 
 void code_init() {
-    prog_section_function  empty_function  = {0,0,0,0,0,0,0,{0}};
+    prog_section_function  empty_function  = {0,0,0,0,0,0,0,{0,0,0,0,0,0,0,0}};
     prog_section_statement empty_statement = {0,{0},{0},{0}};
     prog_section_def       empty_def       = {0, 0, 0};
     int                    i               = 0;
 
     code_entfields = 0;
 
+    code_string_cache = util_htnew(OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS) ? 0x100 : 1024);
+
     /*
      * The way progs.dat is suppose to work is odd, there needs to be
      * some null (empty) statements, functions, and 28 globals
@@ -67,31 +76,40 @@ void code_init() {
     vec_push(code_fields,     empty_def);
 }
 
+void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin);
 uint32_t code_genstring(const char *str)
 {
-    uint32_t off = vec_size(code_chars);
-    while (*str) {
-        vec_push(code_chars, *str);
-        ++str;
+    uint32_t off;
+    size_t   hash;
+    QCINT_ENTRY existing;
+
+    if (!str)
+        return 0;
+
+    if (!*str) {
+        if (!code_string_cached_empty) {
+            code_string_cached_empty = vec_size(code_chars);
+            vec_push(code_chars, 0);
+        }
+        return code_string_cached_empty;
     }
-    vec_push(code_chars, 0);
-    return off;
-}
 
-uint32_t code_cachedstring(const char *str)
-{
-    size_t s = 0;
-    /* We could implement knuth-morris-pratt or something
-     * and also take substrings, but I'm uncomfortable with
-     * pointing to subparts of strings for the sake of clarity...
-     */
-    while (s < vec_size(code_chars)) {
-        if (!strcmp(str, code_chars + s))
-            return s;
-        while (code_chars[s]) ++s;
-        ++s;
+    if (OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS)) {
+        hash = ((unsigned char*)str)[strlen(str)-1];
+        existing = code_util_str_htgeth(code_string_cache, str, hash);
+    } else {
+        hash = util_hthash(code_string_cache, str);
+        existing = util_htgeth(code_string_cache, str, hash);
     }
-    return code_genstring(str);
+
+    if (existing)
+        return HASH_ENTRY_TO_QCINT(existing);
+
+    off = vec_size(code_chars);
+    vec_upload(code_chars, str, strlen(str)+1);
+
+    util_htseth(code_string_cache, str, hash, QCINT_TO_HASH_ENTRY(off));
+    return off;
 }
 
 qcint code_alloc_field (size_t qcsize)