X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=43a34c9de78aec26749824fc03d436b502538c5c;hp=d11db046ed6b19fb112ec6fab86e03375220dd91;hb=36c5722273f1ea87603621c6ee20b7178a7a641b;hpb=f8b3081c44fa51860bb56f7d13b3b730717e9e3b diff --git a/code.c b/code.c index d11db04..43a34c9 100644 --- a/code.c +++ b/code.c @@ -1,6 +1,7 @@ /* - * Copyright (C) 2012 - * Dale Weiler, Wolfgang Bumiller + * Copyright (C) 2012, 2013 + * Dale Weiler + * Wolfgang Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -22,189 +23,190 @@ */ #include "gmqcc.h" -/* - * The macros below expand to a typesafe vector implementation, which - * can be viewed in gmqcc.h - * - * code_statements_data -- raw prog_section_statement array - * code_statements_elements -- number of elements - * code_statements_allocated -- size of the array allocated - * code_statements_add(T) -- add element (returns -1 on error) - * - * code_vars_data -- raw prog_section_var array - * code_vars_elements -- number of elements - * code_vars_allocated -- size of the array allocated - * code_vars_add(T) -- add element (returns -1 on error) - * - * code_fields_data -- raw prog_section_field array - * code_fields_elements -- number of elements - * code_fields_allocated -- size of the array allocated - * code_fields_add(T) -- add element (returns -1 on error) - * - * code_functions_data -- raw prog_section_function array - * code_functions_elements -- number of elements - * code_functions_allocated -- size of the array allocated - * code_functions_add(T) -- add element (returns -1 on error) - * - * code_globals_data -- raw prog_section_def array - * code_globals_elements -- number of elements - * code_globals_allocated -- size of the array allocated - * code_globals_add(T) -- add element (returns -1 on error) - * - * code_chars_data -- raw char* array - * code_chars_elements -- number of elements - * code_chars_allocated -- size of the array allocated - * code_chars_add(T) -- add element (returns -1 on error) - */ -VECTOR_MAKE(prog_section_statement, code_statements); -VECTOR_MAKE(prog_section_def, code_defs ); -VECTOR_MAKE(prog_section_field, code_fields ); -VECTOR_MAKE(prog_section_function, code_functions ); -VECTOR_MAKE(int, code_globals ); -VECTOR_MAKE(char, code_chars ); +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) +{ + vec_push(code_statements, *stmt); + vec_push(code_linenums, linenum); +} + +void code_pop_statement() +{ + 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_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; - /* omit creation of null code */ - if (opts_omit_nullcode) - return; + 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++) - code_globals_add(0); + vec_push(code_globals, 0); - code_chars_add ('\0'); - code_functions_add (empty_function); - code_statements_add(empty_statement); + 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); } +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 = code_chars_elements; - while (*str) { - code_chars_add(*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; } - 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; + 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; } -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}}; - - code_chars_put("m_init", 0x6); - code_chars_put("print", 0x5); - code_chars_put("hello world\n", 0xC); - code_chars_put("m_keydown", 0x9); - code_chars_put("m_draw", 0x6); - code_chars_put("m_toggle", 0x8); - code_chars_put("m_shutdown", 0xA); - - code_globals_add(1); /* m_init */ - code_globals_add(2); /* print */ - code_globals_add(14); /* hello world in string table */ - - /* now the defs */ - code_defs_add (d1); /* m_init */ - code_defs_add (d2); /* print */ - code_defs_add (d3); /*hello_world*/ - code_functions_add (f1); /* m_init */ - code_functions_add (f2); /* print */ - code_functions_add (f3); /* m_keydown */ - code_functions_add (f4); - code_functions_add (f5); - code_functions_add (f6); - code_statements_add(s1); - code_statements_add(s2); - code_statements_add(s3); +qcint code_alloc_field (size_t qcsize) +{ + qcint pos = (qcint)code_entfields; + code_entfields += qcsize; + return pos; } -bool code_write(const char *filename) { +bool code_write(const char *filename, const char *lnofile) { prog_header code_header; FILE *fp = NULL; size_t it = 2; - /* see proposal.txt */ - if (opts_omit_nullcode) {} code_header.statements.offset = sizeof(prog_header); - code_header.statements.length = code_statements_elements; - code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * code_statements_elements); - code_header.defs.length = code_defs_elements; - code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * code_defs_elements); - code_header.fields.length = code_fields_elements; - code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * code_fields_elements); - code_header.functions.length = code_functions_elements; - code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * code_functions_elements); - code_header.globals.length = code_globals_elements; - code_header.strings.offset = code_header.globals.offset + (sizeof(int32_t) * code_globals_elements); - code_header.strings.length = code_chars_elements; + 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; - code_header.crc16 = 0; /* TODO: */ - code_header.entfield = 0; /* TODO: */ + 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; - if (opts_darkplaces_stringtablebug) { + if (OPTS_FLAG(DARKPLACES_STRING_TABLE_BUG)) { util_debug("GEN", "Patching stringtable for -fdarkplaces-stringtablebug\n"); /* >= + P */ - code_chars_add('\0'); /* > */ - code_chars_add('\0'); /* = */ - code_chars_add('\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, 1, sizeof(prog_header)); - util_endianswap(code_statements_data, code_statements_elements, sizeof(prog_section_statement)); - util_endianswap(code_defs_data, code_defs_elements, sizeof(prog_section_def)); - util_endianswap(code_fields_data, code_fields_elements, sizeof(prog_section_field)); - util_endianswap(code_functions_data, code_functions_elements, sizeof(prog_section_function)); - util_endianswap(code_globals_data, code_globals_elements, sizeof(int32_t)); - - fp = fopen(filename, "wb"); + 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)); + 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; + + fp = file_open(lnofile, "wb"); + if (!fp) + return false; + + util_endianswap(&version, 1, sizeof(version)); + util_endianswap(code_linenums, vec_size(code_linenums), sizeof(code_linenums[0])); + + + if (file_write("LNOF", 4, 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)) + { + con_err("failed to write lno file\n"); + } + + file_close(fp); + fp = NULL; + } + + fp = file_open(filename, "wb"); if (!fp) return false; - if (1 != fwrite(&code_header, sizeof(prog_header), 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)) + 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)) { - fclose(fp); + file_close(fp); return false; } @@ -221,37 +223,37 @@ bool code_write(const char *filename) { /* FUNCTIONS */ util_debug("GEN", "FUNCTIONS:\n"); - for (; it < code_functions_elements; it++) { - size_t j = code_functions_data[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_data[it].entry, - code_functions_data[it].firstlocal, - code_functions_data[it].locals, - code_functions_data[it].profile, - code_functions_data[it].name, - code_functions_data[it].file, - code_functions_data[it].nargs, - code_functions_data[it].argsize[0], - code_functions_data[it].argsize[1], - code_functions_data[it].argsize[2], - code_functions_data[it].argsize[3], - code_functions_data[it].argsize[4], - code_functions_data[it].argsize[5], - code_functions_data[it].argsize[6], - code_functions_data[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_data[code_functions_data[it].name]); + util_debug("GEN", " NAME: %s\n", &code_chars[code_functions[it].name]); /* Internal functions have no code */ - if (code_functions_data[it].entry >= 0) { + if (code_functions[it].entry >= 0) { util_debug("GEN", " CODE:\n"); for (;;) { - if (code_statements_data[j].opcode != AINSTR_END) - util_debug("GEN", " %s {0x%05x,0x%05x,0x%05x}\n", - asm_instr[code_statements_data[j].opcode].m, - code_statements_data[j].o1.s1, - code_statements_data[j].o2.s1, - code_statements_data[j].o3.s1 + 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 ); else { util_debug("GEN", " DONE {0x00000,0x00000,0x00000}\n"); @@ -262,12 +264,15 @@ bool code_write(const char *filename) { } } - mem_d(code_statements_data); - mem_d(code_defs_data); - mem_d(code_fields_data); - mem_d(code_functions_data); - mem_d(code_globals_data); - mem_d(code_chars_data); - fclose(fp); + 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); + + file_close(fp); return true; }