X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=42b46a4e93b28832da1b6e13296731ef3eac6e8d;hp=9b724cfc49100901230510793c5643c11c70e751;hb=a68f0fcb355db42acabe72da5939fbd1b04f6016;hpb=836935fba2ca234896da98dc2a2868d8fbedb4d1 diff --git a/code.c b/code.c index 9b724cf..42b46a4 100644 --- a/code.c +++ b/code.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -21,210 +21,352 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include #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; +/* + * We could use the old method of casting to uintptr_t then to void* + * or qcint_t; however, it's incredibly unsafe for two reasons. + * 1) The compilers aliasing optimization can legally make it unstable + * (it's undefined behaviour). + * + * 2) The cast itself depends on fresh storage (newly allocated in which + * ever function is using the cast macros), the contents of which are + * transferred in a way that the obligation to release storage is not + * propagated. + */ +typedef union { + void *enter; + qcint_t leave; +} code_hash_entry_t; -uint16_t code_crc; -uint32_t code_entfields; +/* Some sanity macros */ +#define CODE_HASH_ENTER(ENTRY) ((ENTRY).enter) +#define CODE_HASH_LEAVE(ENTRY) ((ENTRY).leave) + +void code_push_statement(code_t *code, prog_section_statement_t *stmt, int linenum) +{ + vec_push(code->statements, *stmt); + vec_push(code->linenums, linenum); +} -void code_push_statement(prog_section_statement *stmt, int linenum) +void code_pop_statement(code_t *code) { - vec_push(code_statements, *stmt); - vec_push(code_linenums, linenum); + vec_pop(code->statements); + vec_pop(code->linenums); } -void code_init() { - prog_section_function empty_function = {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_t empty_function = {0,0,0,0,0,0,0,{0,0,0,0,0,0,0,0}}; + static prog_section_statement_t empty_statement = {0,{0},{0},{0}}; + static prog_section_def_t empty_def = {0, 0, 0}; + + code_t *code = (code_t*)mem_a(sizeof(code_t)); + int i = 0; - code_entfields = 0; + 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; } -uint32_t code_genstring(const char *str) -{ - uint32_t off = vec_size(code_chars); - while (*str) { - vec_push(code_chars, *str); - ++str; +void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin); + +uint32_t code_genstring(code_t *code, const char *str) { + size_t hash; + code_hash_entry_t 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]; + CODE_HASH_ENTER(existing) = code_util_str_htgeth(code->string_cache, str, hash); + } else { + hash = util_hthash(code->string_cache, str); + CODE_HASH_ENTER(existing) = util_htgeth(code->string_cache, str, hash); } - return code_genstring(str); -} -void code_test() { - prog_section_def d1 = { TYPE_VOID, 28, 1 }; - prog_section_def d2 = { TYPE_FUNCTION, 29, 8 }; - prog_section_def d3 = { TYPE_STRING, 30, 14}; - prog_section_function f1 = { 1, 0, 0, 0, 1, 0,0, {0}}; - prog_section_function f2 = {-4, 0, 0, 0, 8, 0,0, {0}}; - prog_section_function f3 = { 0, 0, 0, 0, 14+13, 0,0, {0}}; - prog_section_function f4 = { 0, 0, 0, 0, 14+13+10, 0,0, {0}}; - prog_section_function f5 = { 0, 0, 0, 0, 14+13+10+7, 0,0, {0}}; - prog_section_function f6 = { 0, 0, 0, 0, 14+13+10+7+9, 0,0, {0}}; - prog_section_statement s1 = { INSTR_STORE_F, {30}, {OFS_PARM0}, {0}}; - prog_section_statement s2 = { INSTR_CALL1, {29}, {0}, {0}}; - prog_section_statement s3 = { INSTR_RETURN, {0}, {0}, {0}}; - - strcpy(vec_add(code_chars, 0x7), "m_init"); - strcpy(vec_add(code_chars, 0x6), "print"); - strcpy(vec_add(code_chars, 0xD), "hello world\n"); - strcpy(vec_add(code_chars, 0xA), "m_keydown"); - strcpy(vec_add(code_chars, 0x7), "m_draw"); - strcpy(vec_add(code_chars, 0x9), "m_toggle"); - strcpy(vec_add(code_chars, 0xB), "m_shutdown"); - - vec_push(code_globals, 1); /* m_init */ - vec_push(code_globals, 2); /* print */ - vec_push(code_globals, 14); /* hello world in string table */ - - /* now the defs */ - vec_push(code_defs, d1); /* m_init */ - vec_push(code_defs, d2); /* print */ - vec_push(code_defs, d3); /*hello_world*/ - vec_push(code_functions, f1); /* m_init */ - vec_push(code_functions, f2); /* print */ - vec_push(code_functions, f3); /* m_keydown */ - vec_push(code_functions, f4); - vec_push(code_functions, f5); - vec_push(code_functions, f6); - vec_push(code_statements, s1); - vec_push(code_statements, s2); - vec_push(code_statements, s3); + if (CODE_HASH_ENTER(existing)) + return CODE_HASH_LEAVE(existing); + + CODE_HASH_LEAVE(existing) = vec_size(code->chars); + vec_upload(code->chars, str, strlen(str)+1); + + util_htseth(code->string_cache, str, hash, CODE_HASH_ENTER(existing)); + return CODE_HASH_LEAVE(existing); } -qcint code_alloc_field (size_t qcsize) +qcint_t code_alloc_field (code_t *code, size_t qcsize) { - qcint pos = (qcint)code_entfields; - code_entfields += qcsize; + qcint_t pos = (qcint_t)code->entfields; + code->entfields += qcsize; return pos; } -bool code_write(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.version = 6; - if (opts_forcecrc) - code_header.crc16 = opts_forced_crc; +static size_t code_size_generic(code_t *code, prog_header_t *code_header, bool lno) { + size_t size = 0; + if (lno) { + size += 4; /* LNOF */ + size += sizeof(uint32_t); /* version */ + size += sizeof(code_header->defs.length); + size += sizeof(code_header->globals.length); + size += sizeof(code_header->fields.length); + size += sizeof(code_header->statements.length); + size += sizeof(code->linenums[0]) * vec_size(code->linenums); + } else { + size += sizeof(prog_header_t); + size += sizeof(prog_section_statement_t) * vec_size(code->statements); + size += sizeof(prog_section_def_t) * vec_size(code->defs); + size += sizeof(prog_section_field_t) * vec_size(code->fields); + size += sizeof(prog_section_function_t) * vec_size(code->functions); + size += sizeof(int32_t) * vec_size(code->globals); + size += 1 * vec_size(code->chars); + } + return size; +} + +#define code_size_binary(C, H) code_size_generic((C), (H), false) +#define code_size_debug(C, H) code_size_generic((C), (H), true) + +static void code_create_header(code_t *code, prog_header_t *code_header, const char *filename, const char *lnofile) { + size_t i; + + code_header->statements.offset = sizeof(prog_header_t); + code_header->statements.length = vec_size(code->statements); + code_header->defs.offset = code_header->statements.offset + (sizeof(prog_section_statement_t) * vec_size(code->statements)); + code_header->defs.length = vec_size(code->defs); + code_header->fields.offset = code_header->defs.offset + (sizeof(prog_section_def_t) * vec_size(code->defs)); + code_header->fields.length = vec_size(code->fields); + code_header->functions.offset = code_header->fields.offset + (sizeof(prog_section_field_t) * vec_size(code->fields)); + code_header->functions.length = vec_size(code->functions); + code_header->globals.offset = code_header->functions.offset + (sizeof(prog_section_function_t) * 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; + code_header->skip = 0; + + 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 */ + util_endianswap(&code_header->version, 1, sizeof(code_header->version)); + util_endianswap(&code_header->crc16, 1, sizeof(code_header->crc16)); + util_endianswap(&code_header->statements, 2, sizeof(code_header->statements.offset)); + util_endianswap(&code_header->defs, 2, sizeof(code_header->statements.offset)); + util_endianswap(&code_header->fields, 2, sizeof(code_header->statements.offset)); + util_endianswap(&code_header->functions, 2, sizeof(code_header->statements.offset)); + 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)); + + /* + * These are not part of the header but we ensure LE format here to save on duplicated + * code. + */ + util_endianswap(code->statements, vec_size(code->statements), sizeof(prog_section_statement_t)); + util_endianswap(code->defs, vec_size(code->defs), sizeof(prog_section_def_t)); + util_endianswap(code->fields, vec_size(code->fields), sizeof(prog_section_field_t)); + util_endianswap(code->functions, vec_size(code->functions), sizeof(prog_section_function_t)); + util_endianswap(code->globals, vec_size(code->globals), sizeof(int32_t)); + + + if (!OPTS_OPTION_BOOL(OPTION_QUIET)) { + if (lnofile) + con_out("writing '%s' and '%s'...\n", filename, lnofile); + else + con_out("writing '%s'\n", filename); + } + + if (!OPTS_OPTION_BOOL(OPTION_QUIET) && + !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + { + char buffer[1024]; + con_out("\nOptimizations:\n"); + for (i = 0; i < COUNT_OPTIMIZATIONS; ++i) { + if (opts_optimizationcount[i]) { + util_optimizationtostr(opts_opt_list[i].name, buffer, sizeof(buffer)); + con_out( + " %s: %u\n", + buffer, + (unsigned int)opts_optimizationcount[i] + ); + } + } } +} + +static void code_stats(const char *filename, const char *lnofile, code_t *code, prog_header_t *code_header) { + if (OPTS_OPTION_BOOL(OPTION_QUIET) || + OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + return; + + con_out("\nFile statistics:\n"); + con_out(" dat:\n"); + con_out(" name: %s\n", filename); + con_out(" size: %u (bytes)\n", code_size_binary(code, code_header)); + con_out(" crc: 0x%04X\n", code->crc); if (lnofile) { - uint32_t lnotype = *(unsigned int*)"LNOF"; + con_out(" lno:\n"); + con_out(" name: %s\n", lnofile); + con_out(" size: %u (bytes)\n", code_size_debug(code, code_header)); + } +} + +/* + * Same principle except this one allocates memory and writes the lno(optional) and the dat file + * directly out to allocated memory. Which is actually very useful for the future library support + * we're going to add. + */ +bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t **lnomem, size_t *sizelno) { + prog_header_t code_header; + uint32_t offset = 0; + + if (!datmem) + return false; + + code_create_header(code, &code_header, "<>", "<>"); + + #define WRITE_CHUNK(C,X,S) \ + do { \ + memcpy((void*)(&(*C)[offset]), (const void*)(X), (S)); \ + offset += (S); \ + } while (0) + + /* Calculate size required to store entire file out to memory */ + if (lnomem) { uint32_t version = 1; - fp = util_fopen(lnofile, "wb"); + *sizelno = code_size_debug(code, &code_header); + *lnomem = (uint8_t*)mem_a(*sizelno); + + WRITE_CHUNK(lnomem, "LNOF", 4); + WRITE_CHUNK(lnomem, &version, sizeof(version)); + WRITE_CHUNK(lnomem, &code_header.defs.length, sizeof(code_header.defs.length)); + WRITE_CHUNK(lnomem, &code_header.globals.length, sizeof(code_header.globals.length)); + WRITE_CHUNK(lnomem, &code_header.fields.length, sizeof(code_header.fields.length)); + WRITE_CHUNK(lnomem, &code_header.statements.length, sizeof(code_header.statements.length)); + + /* something went terribly wrong */ + if (offset != *sizelno) { + mem_d(*lnomem); + *sizelno = 0; + return false; + } + offset = 0; + } + + /* Write out the dat */ + *sizedat = code_size_binary(code, &code_header); + *datmem = (uint8_t*)mem_a(*sizedat); + + WRITE_CHUNK(datmem, &code_header, sizeof(prog_header_t)); + WRITE_CHUNK(datmem, code->statements, sizeof(prog_section_statement_t) * vec_size(code->statements)); + WRITE_CHUNK(datmem, code->defs, sizeof(prog_section_def_t) * vec_size(code->defs)); + WRITE_CHUNK(datmem, code->fields, sizeof(prog_section_field_t) * vec_size(code->fields)); + WRITE_CHUNK(datmem, code->functions, sizeof(prog_section_function_t) * vec_size(code->functions)); + WRITE_CHUNK(datmem, code->globals, sizeof(int32_t) * vec_size(code->globals)); + WRITE_CHUNK(datmem, code->chars, 1 * vec_size(code->chars)); + + 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); + mem_d(code); + code_stats("<>", (lnomem) ? "<>" : NULL, code, &code_header); + return true; +} +#undef WRITE_CHUNK + +bool code_write(code_t *code, const char *filename, const char *lnofile) { + prog_header_t code_header; + FILE *fp = NULL; + size_t it = 2; + + code_create_header(code, &code_header, filename, lnofile); + + if (lnofile) { + uint32_t version = 1; + + fp = fs_file_open(lnofile, "wb"); if (!fp) return false; - if (fwrite(&lnotype, sizeof(lnotype), 1, fp) != 1 || - fwrite(&version, sizeof(version), 1, fp) != 1 || - fwrite(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 || - fwrite(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 || - fwrite(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 || - fwrite(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 || - fwrite(code_linenums, sizeof(code_linenums[0]), vec_size(code_linenums), fp) != vec_size(code_linenums)) + 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)) { con_err("failed to write lno file\n"); } - /* - h = SafeOpenWrite (destfile, 2*1024*1024); - SafeWrite (h, &lnotype, sizeof(int)); - SafeWrite (h, &version, sizeof(int)); - SafeWrite (h, &numglobaldefs, sizeof(int)); - SafeWrite (h, &numpr_globals, sizeof(int)); - SafeWrite (h, &numfielddefs, sizeof(int)); - SafeWrite (h, &numstatements, sizeof(int)); - SafeWrite (h, statement_linenums, numstatements*sizeof(int)); - SafeClose (h); - */ - - fclose(fp); + + fs_file_close(fp); fp = NULL; } - /* ensure all data is in LE format */ - util_endianswap(&code_header, 1, sizeof(prog_header)); - 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)); - - fp = util_fopen(filename, "wb"); + fp = fs_file_open(filename, "wb"); if (!fp) return false; - if (1 != fwrite(&code_header, sizeof(prog_header) , 1 , fp) || - vec_size(code_statements) != fwrite(code_statements, sizeof(prog_section_statement), vec_size(code_statements), fp) || - vec_size(code_defs) != fwrite(code_defs, sizeof(prog_section_def) , vec_size(code_defs) , fp) || - vec_size(code_fields) != fwrite(code_fields, sizeof(prog_section_field) , vec_size(code_fields) , fp) || - vec_size(code_functions) != fwrite(code_functions, sizeof(prog_section_function) , vec_size(code_functions) , fp) || - vec_size(code_globals) != fwrite(code_globals, sizeof(int32_t) , vec_size(code_globals) , fp) || - vec_size(code_chars) != fwrite(code_chars, 1 , vec_size(code_chars) , fp)) + if (1 != fs_file_write(&code_header, sizeof(prog_header_t) , 1 , fp) || + vec_size(code->statements) != fs_file_write(code->statements, sizeof(prog_section_statement_t), vec_size(code->statements), fp) || + vec_size(code->defs) != fs_file_write(code->defs, sizeof(prog_section_def_t) , vec_size(code->defs) , fp) || + vec_size(code->fields) != fs_file_write(code->fields, sizeof(prog_section_field_t) , vec_size(code->fields) , fp) || + vec_size(code->functions) != fs_file_write(code->functions, sizeof(prog_section_function_t) , 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)) { - fclose(fp); + fs_file_close(fp); return false; } @@ -241,37 +383,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 != AINSTR_END) + 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 + util_instr_str[code->statements[j].opcode], + code->statements[j].o1.s1, + code->statements[j].o2.s1, + code->statements[j].o3.s1 ); else { util_debug("GEN", " DONE {0x00000,0x00000,0x00000}\n"); @@ -282,12 +424,21 @@ bool code_write(const char *filename, const char *lnofile) { } } - vec_free(code_statements); - vec_free(code_defs); - vec_free(code_fields); - vec_free(code_functions); - vec_free(code_globals); - vec_free(code_chars); - fclose(fp); + fs_file_close(fp); + code_stats(filename, lnofile, code, &code_header); return true; } + +void code_cleanup(code_t *code) { + 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); + + mem_d(code); +}