_MEM_ -> MEM_ again at use

[xonotic/gmqcc.git] / code.c

diff --git a/code.c b/code.c
index 81e8aa62077e00cdd7c7e95c3cceac8ff13d965e..d11db046ed6b19fb112ec6fab86e03375220dd91 100644 (file)
--- a/code.c
+++ b/code.c
@@ -22,25 +22,6 @@
  */
 #include "gmqcc.h"
 
-typedef struct {
-    uint32_t offset;      /* Offset in file of where data begins  */
-    uint32_t length;      /* Length of section (how many of)      */
-} prog_section;
-
-typedef struct {
-    uint32_t     version;      /* Program version (6)     */
-    uint16_t     crc16;        /* What is this?           */
-    uint16_t     skip;         /* see propsal.txt         */
-
-    prog_section statements;   /* prog_section_statement  */
-    prog_section defs;         /* prog_section_def        */
-    prog_section fields;       /* prog_section_field      */
-    prog_section functions;    /* prog_section_function   */
-    prog_section strings;      /* What is this?           */
-    prog_section globals;      /* What is this?           */
-    uint32_t     entfield;     /* Number of entity fields */
-} prog_header;
-
 /*
  * The macros below expand to a typesafe vector implementation, which
  * can be viewed in gmqcc.h
@@ -103,6 +84,33 @@ void code_init() {
     code_statements_add(empty_statement);
 }
 
+uint32_t code_genstring(const char *str)
+{
+    uint32_t off = code_chars_elements;
+    while (*str) {
+        code_chars_add(*str);
+        ++str;
+    }
+    code_chars_add(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 < code_chars_elements) {
+        if (!strcmp(str, code_chars_data + s))
+            return s;
+        while (code_chars_data[s]) ++s;
+        ++s;
+    }
+    return code_genstring(str);
+}
+
 void code_test() {
     prog_section_def       d1 = { TYPE_VOID,     28, 1 };
     prog_section_def       d2 = { TYPE_FUNCTION, 29, 8 };
@@ -189,12 +197,12 @@ bool code_write(const char *filename) {
         return false;
 
     if (1 != fwrite(&code_header,         sizeof(prog_header), 1, fp) ||
-        1 != fwrite(code_statements_data, sizeof(prog_section_statement)*code_statements_elements, 1, fp) ||
-        1 != fwrite(code_defs_data,       sizeof(prog_section_def)      *code_defs_elements,       1, fp) ||
-        1 != fwrite(code_fields_data,     sizeof(prog_section_field)    *code_fields_elements,     1, fp) ||
-        1 != fwrite(code_functions_data,  sizeof(prog_section_function) *code_functions_elements,  1, fp) ||
-        1 != fwrite(code_globals_data,    sizeof(int32_t)               *code_globals_elements,    1, fp) ||
-        1 != fwrite(code_chars_data,      1                             *code_chars_elements,      1, fp))
+        code_statements_elements != fwrite(code_statements_data, sizeof(prog_section_statement), code_statements_elements, fp) ||
+        code_defs_elements       != fwrite(code_defs_data,       sizeof(prog_section_def)      , code_defs_elements      , fp) ||
+        code_fields_elements     != fwrite(code_fields_data,     sizeof(prog_section_field)    , code_fields_elements    , fp) ||
+        code_functions_elements  != fwrite(code_functions_data,  sizeof(prog_section_function) , code_functions_elements , fp) ||
+        code_globals_elements    != fwrite(code_globals_data,    sizeof(int32_t)               , code_globals_elements   , fp) ||
+        code_chars_elements      != fwrite(code_chars_data,      1                             , code_chars_elements     , fp))
     {
         fclose(fp);
         return false;