X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=b0ce2baa04aa138b24a81004257414b7ad81a3cc;hp=5728a8db425f7b724a44717ba8510b400654637e;hb=69b55ccc03b56af1f6c05eb45866ab198307487f;hpb=dc8523c6503e014a463df42520b48f597c7655be diff --git a/code.c b/code.c old mode 100755 new mode 100644 index 5728a8d..b0ce2ba --- a/code.c +++ b/code.c @@ -23,61 +23,56 @@ */ #include "gmqcc.h" -prog_section_statement *code_statements; -int *code_linenums; -prog_section_def *code_defs; -prog_section_field *code_fields; -prog_section_function *code_functions; -int *code_globals; -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) +void code_push_statement(code_t *code, prog_section_statement *stmt, int linenum) { - vec_push(code_statements, *stmt); - vec_push(code_linenums, linenum); + vec_push(code->statements, *stmt); + vec_push(code->linenums, linenum); } -void code_pop_statement() +void code_pop_statement(code_t *code) { - vec_pop(code_statements); - vec_pop(code_linenums); + vec_pop(code->statements); + vec_pop(code->linenums); } -void code_init() { - 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_t *code_init() { + static prog_section_function empty_function = {0,0,0,0,0,0,0,{0,0,0,0,0,0,0,0}}; + static prog_section_statement empty_statement = {0,{0},{0},{0}}; + static prog_section_def empty_def = {0, 0, 0}; - code_entfields = 0; + code_t *code = (code_t*)mem_a(sizeof(code_t)); + int i = 0; - code_string_cache = util_htnew(OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS) ? 0x100 : 1024); + memset(code, 0, sizeof(code_t)); + 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 */ for(; i < 28; i++) - vec_push(code_globals, 0); + vec_push(code->globals, 0); + + vec_push(code->chars, '\0'); + vec_push(code->functions, empty_function); + + code_push_statement(code, &empty_statement, 0); + + vec_push(code->defs, empty_def); + vec_push(code->fields, empty_def); - vec_push(code_chars, '\0'); - vec_push(code_functions, empty_function); - code_push_statement(&empty_statement, 0); - vec_push(code_defs, empty_def); - vec_push(code_fields, empty_def); + return code; } void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin); -uint32_t code_genstring(const char *str) + +uint32_t code_genstring(code_t *code, const char *str) { uint32_t off; size_t hash; @@ -87,69 +82,70 @@ uint32_t code_genstring(const char *str) return 0; if (!*str) { - if (!code_string_cached_empty) { - code_string_cached_empty = vec_size(code_chars); - vec_push(code_chars, 0); + if (!code->string_cached_empty) { + code->string_cached_empty = vec_size(code->chars); + vec_push(code->chars, 0); } - return code_string_cached_empty; + return code->string_cached_empty; } if (OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS)) { - hash = ((unsigned char*)str)[strlen(str)-1]; - existing = code_util_str_htgeth(code_string_cache, str, hash); + 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); + hash = util_hthash(code->string_cache, str); + existing = util_htgeth(code->string_cache, str, hash); } if (existing) return HASH_ENTRY_TO_QCINT(existing); - off = vec_size(code_chars); - vec_upload(code_chars, str, strlen(str)+1); + 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)); + util_htseth(code->string_cache, str, hash, QCINT_TO_HASH_ENTRY(off)); return off; } -qcint code_alloc_field (size_t qcsize) +qcint code_alloc_field (code_t *code, size_t qcsize) { - qcint pos = (qcint)code_entfields; - code_entfields += qcsize; + qcint pos = (qcint)code->entfields; + code->entfields += qcsize; return pos; } -bool code_write(const char *filename, const char *lnofile) { +bool code_write(code_t *code, const char *filename, const char *lnofile) { prog_header code_header; FILE *fp = NULL; size_t it = 2; code_header.statements.offset = sizeof(prog_header); - code_header.statements.length = vec_size(code_statements); - code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * vec_size(code_statements)); - code_header.defs.length = vec_size(code_defs); - code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * vec_size(code_defs)); - code_header.fields.length = vec_size(code_fields); - code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * vec_size(code_fields)); - code_header.functions.length = vec_size(code_functions); - code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * vec_size(code_functions)); - code_header.globals.length = vec_size(code_globals); - 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.statements.length = vec_size(code->statements); + code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * vec_size(code->statements)); + code_header.defs.length = vec_size(code->defs); + code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * vec_size(code->defs)); + code_header.fields.length = vec_size(code->fields); + code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * vec_size(code->fields)); + code_header.functions.length = vec_size(code->functions); + code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * vec_size(code->functions)); + code_header.globals.length = vec_size(code->globals); + 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_OPTION_BOOL(OPTION_FORCECRC)) code_header.crc16 = OPTS_OPTION_U16(OPTION_FORCED_CRC); else - code_header.crc16 = code_crc; - code_header.entfield = code_entfields; + code_header.crc16 = code->crc; + code_header.entfield = code->entfields; if (OPTS_FLAG(DARKPLACES_STRING_TABLE_BUG)) { util_debug("GEN", "Patching stringtable for -fdarkplaces-stringtablebug\n"); /* >= + P */ - vec_push(code_chars, '\0'); /* > */ - vec_push(code_chars, '\0'); /* = */ - vec_push(code_chars, '\0'); /* P */ + vec_push(code->chars, '\0'); /* > */ + vec_push(code->chars, '\0'); /* = */ + vec_push(code->chars, '\0'); /* P */ } /* ensure all data is in LE format */ @@ -162,11 +158,11 @@ bool code_write(const char *filename, const char *lnofile) { util_endianswap(&code_header.strings, 2, sizeof(code_header.statements.offset)); util_endianswap(&code_header.globals, 2, sizeof(code_header.statements.offset)); util_endianswap(&code_header.entfield, 1, sizeof(code_header.entfield)); - util_endianswap(code_statements, vec_size(code_statements), sizeof(prog_section_statement)); - util_endianswap(code_defs, vec_size(code_defs), sizeof(prog_section_def)); - util_endianswap(code_fields, vec_size(code_fields), sizeof(prog_section_field)); - util_endianswap(code_functions, vec_size(code_functions), sizeof(prog_section_function)); - util_endianswap(code_globals, vec_size(code_globals), sizeof(int32_t)); + util_endianswap(code->statements, vec_size(code->statements), sizeof(prog_section_statement)); + util_endianswap(code->defs, vec_size(code->defs), sizeof(prog_section_def)); + util_endianswap(code->fields, vec_size(code->fields), sizeof(prog_section_field)); + util_endianswap(code->functions, vec_size(code->functions), sizeof(prog_section_function)); + util_endianswap(code->globals, vec_size(code->globals), sizeof(int32_t)); if (lnofile) { uint32_t version = 1; @@ -175,17 +171,17 @@ bool code_write(const char *filename, const char *lnofile) { if (!fp) return false; - util_endianswap(&version, 1, sizeof(version)); - util_endianswap(code_linenums, vec_size(code_linenums), sizeof(code_linenums[0])); + util_endianswap(&version, 1, sizeof(version)); + util_endianswap(code->linenums, vec_size(code->linenums), sizeof(code->linenums[0])); - 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)) + 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"); } @@ -198,13 +194,13 @@ bool code_write(const char *filename, const char *lnofile) { if (!fp) return false; - 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)) + 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)) { fs_file_close(fp); return false; @@ -223,37 +219,37 @@ bool code_write(const char *filename, const char *lnofile) { /* FUNCTIONS */ util_debug("GEN", "FUNCTIONS:\n"); - for (; it < vec_size(code_functions); it++) { - size_t j = code_functions[it].entry; + for (; it < vec_size(code->functions); it++) { + size_t j = code->functions[it].entry; util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize ={%d,%d,%d,%d,%d,%d,%d,%d} }\n", - code_functions[it].entry, - code_functions[it].firstlocal, - code_functions[it].locals, - code_functions[it].profile, - code_functions[it].name, - code_functions[it].file, - code_functions[it].nargs, - code_functions[it].argsize[0], - code_functions[it].argsize[1], - code_functions[it].argsize[2], - code_functions[it].argsize[3], - code_functions[it].argsize[4], - code_functions[it].argsize[5], - code_functions[it].argsize[6], - code_functions[it].argsize[7] + code->functions[it].entry, + code->functions[it].firstlocal, + code->functions[it].locals, + code->functions[it].profile, + code->functions[it].name, + code->functions[it].file, + code->functions[it].nargs, + code->functions[it].argsize[0], + code->functions[it].argsize[1], + code->functions[it].argsize[2], + code->functions[it].argsize[3], + code->functions[it].argsize[4], + code->functions[it].argsize[5], + code->functions[it].argsize[6], + code->functions[it].argsize[7] ); - util_debug("GEN", " NAME: %s\n", &code_chars[code_functions[it].name]); + util_debug("GEN", " NAME: %s\n", &code->chars[code->functions[it].name]); /* Internal functions have no code */ - if (code_functions[it].entry >= 0) { + if (code->functions[it].entry >= 0) { util_debug("GEN", " CODE:\n"); for (;;) { - if (code_statements[j].opcode != INSTR_DONE) + if (code->statements[j].opcode != INSTR_DONE) util_debug("GEN", " %-12s {% 5i,% 5i,% 5i}\n", - asm_instr[code_statements[j].opcode].m, - code_statements[j].o1.s1, - code_statements[j].o2.s1, - code_statements[j].o3.s1 + asm_instr[code->statements[j].opcode].m, + code->statements[j].o1.s1, + code->statements[j].o2.s1, + code->statements[j].o3.s1 ); else { util_debug("GEN", " DONE {0x00000,0x00000,0x00000}\n"); @@ -264,15 +260,17 @@ bool code_write(const char *filename, const char *lnofile) { } } - vec_free(code_statements); - vec_free(code_linenums); - vec_free(code_defs); - vec_free(code_fields); - vec_free(code_functions); - vec_free(code_globals); - vec_free(code_chars); - util_htdel(code_string_cache); + vec_free(code->statements); + vec_free(code->linenums); + vec_free(code->defs); + vec_free(code->fields); + vec_free(code->functions); + vec_free(code->globals); + vec_free(code->chars); + + util_htdel(code->string_cache); fs_file_close(fp); + mem_d(code); return true; }