X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=eabc50c458a77fff4dfdc7e8b05ce82b63d3b981;hp=0ad8becb8de54bc50c47cb434164bb46a95f2c62;hb=10dd7aacfe87f97e10d61dff343e00b9c03eac69;hpb=13003bf6af9cf8c76cd024b0bf11695b92fba093 diff --git a/code.c b/code.c index 0ad8bec..eabc50c 100644 --- a/code.c +++ b/code.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -31,7 +31,14 @@ prog_section_function *code_functions; int *code_globals; char *code_chars; uint16_t code_crc; -uint32_t code_entfields; +static 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) { @@ -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) @@ -119,8 +137,8 @@ bool code_write(const char *filename, const char *lnofile) { code_header.strings.offset = code_header.globals.offset + (sizeof(int32_t) * vec_size(code_globals)); code_header.strings.length = vec_size(code_chars); code_header.version = 6; - if (opts.forcecrc) - code_header.crc16 = opts.forced_crc; + if (OPTS_OPTION_BOOL(OPTION_FORCECRC)) + code_header.crc16 = OPTS_OPTION_U16(OPTION_FORCED_CRC); else code_header.crc16 = code_crc; code_header.entfield = code_entfields; @@ -151,10 +169,9 @@ bool code_write(const char *filename, const char *lnofile) { util_endianswap(code_globals, vec_size(code_globals), sizeof(int32_t)); if (lnofile) { - uint32_t lnotype = *(unsigned int*)"LNOF"; uint32_t version = 1; - fp = file_open(lnofile, "wb"); + fp = fs_file_open(lnofile, "wb"); if (!fp) return false; @@ -162,34 +179,34 @@ bool code_write(const char *filename, const char *lnofile) { util_endianswap(code_linenums, vec_size(code_linenums), sizeof(code_linenums[0])); - if (file_write(&lnotype, sizeof(lnotype), 1, fp) != 1 || - file_write(&version, sizeof(version), 1, fp) != 1 || - file_write(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 || - file_write(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 || - file_write(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 || - file_write(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 || - file_write(code_linenums, sizeof(code_linenums[0]), vec_size(code_linenums), fp) != vec_size(code_linenums)) + if (fs_file_write("LNOF", 4, 1, fp) != 1 || + fs_file_write(&version, sizeof(version), 1, fp) != 1 || + fs_file_write(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 || + fs_file_write(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 || + fs_file_write(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 || + fs_file_write(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 || + fs_file_write(code_linenums, sizeof(code_linenums[0]), vec_size(code_linenums), fp) != vec_size(code_linenums)) { con_err("failed to write lno file\n"); } - file_close(fp); + fs_file_close(fp); fp = NULL; } - fp = file_open(filename, "wb"); + fp = fs_file_open(filename, "wb"); if (!fp) return false; - if (1 != file_write(&code_header, sizeof(prog_header) , 1 , fp) || - vec_size(code_statements) != file_write(code_statements, sizeof(prog_section_statement), vec_size(code_statements), fp) || - vec_size(code_defs) != file_write(code_defs, sizeof(prog_section_def) , vec_size(code_defs) , fp) || - vec_size(code_fields) != file_write(code_fields, sizeof(prog_section_field) , vec_size(code_fields) , fp) || - vec_size(code_functions) != file_write(code_functions, sizeof(prog_section_function) , vec_size(code_functions) , fp) || - vec_size(code_globals) != file_write(code_globals, sizeof(int32_t) , vec_size(code_globals) , fp) || - vec_size(code_chars) != file_write(code_chars, 1 , vec_size(code_chars) , fp)) + if (1 != fs_file_write(&code_header, sizeof(prog_header) , 1 , fp) || + vec_size(code_statements) != fs_file_write(code_statements, sizeof(prog_section_statement), vec_size(code_statements), fp) || + vec_size(code_defs) != fs_file_write(code_defs, sizeof(prog_section_def) , vec_size(code_defs) , fp) || + vec_size(code_fields) != fs_file_write(code_fields, sizeof(prog_section_field) , vec_size(code_fields) , fp) || + vec_size(code_functions) != fs_file_write(code_functions, sizeof(prog_section_function) , vec_size(code_functions) , fp) || + vec_size(code_globals) != fs_file_write(code_globals, sizeof(int32_t) , vec_size(code_globals) , fp) || + vec_size(code_chars) != fs_file_write(code_chars, 1 , vec_size(code_chars) , fp)) { - file_close(fp); + fs_file_close(fp); return false; } @@ -254,6 +271,8 @@ bool code_write(const char *filename, const char *lnofile) { vec_free(code_functions); vec_free(code_globals); vec_free(code_chars); - file_close(fp); + util_htdel(code_string_cache); + + fs_file_close(fp); return true; }