X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=code.c;h=a763ee6681b14940eb7e66be793c2e298fc36332;hb=db69d14995fef917871f606692f172588571940a;hp=80154d0b03ae9be28ed57d71146d08f30d0f1532;hpb=c5225b2fa1e314447392febdd1dee2a2a1744016;p=xonotic%2Fgmqcc.git diff --git a/code.c b/code.c index 80154d0..a763ee6 100644 --- a/code.c +++ b/code.c @@ -21,14 +21,30 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include #include "gmqcc.h" -/* 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)) +/* + * 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; + +/* 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 *stmt, int linenum) +void code_push_statement(code_t *code, prog_section_statement_t *stmt, int linenum) { vec_push(code->statements, *stmt); vec_push(code->linenums, linenum); @@ -41,9 +57,9 @@ void code_pop_statement(code_t *code) } 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}; + 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; @@ -72,11 +88,9 @@ code_t *code_init() { 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) -{ - uint32_t off; - size_t hash; - QCINT_ENTRY existing; +uint32_t code_genstring(code_t *code, const char *str) { + size_t hash; + code_hash_entry_t existing; if (!str) return 0; @@ -90,44 +104,45 @@ uint32_t code_genstring(code_t *code, const char *str) } 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]; + CODE_HASH_ENTER(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); + CODE_HASH_ENTER(existing) = util_htgeth(code->string_cache, str, hash); } - if (existing) - return HASH_ENTRY_TO_QCINT(existing); + if (CODE_HASH_ENTER(existing)) + return CODE_HASH_LEAVE(existing); - off = vec_size(code->chars); + CODE_HASH_LEAVE(existing) = 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; + util_htseth(code->string_cache, str, hash, CODE_HASH_ENTER(existing)); + return CODE_HASH_LEAVE(existing); } -qcint code_alloc_field (code_t *code, size_t qcsize) +qcint_t code_alloc_field (code_t *code, size_t qcsize) { - qcint pos = (qcint)code->entfields; + qcint_t pos = (qcint_t)code->entfields; code->entfields += qcsize; return pos; } -static void code_create_header(code_t *code, prog_header *code_header) { - code_header->statements.offset = sizeof(prog_header); +static void code_create_header(code_t *code, prog_header_t *code_header) { + 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) * 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) * 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) * 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) * 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.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); @@ -158,11 +173,11 @@ static void code_create_header(code_t *code, prog_header *code_header) { /* * 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)); - 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->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)); } @@ -170,10 +185,10 @@ static void code_create_header(code_t *code, prog_header *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 code_header; - uint32_t offset = 0; + prog_header_t code_header; + uint32_t offset = 0; if (!datmem) return false; @@ -217,23 +232,23 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t } /* Write out the dat */ - *sizedat += sizeof(prog_header); - *sizedat += sizeof(prog_section_statement) * vec_size(code->statements); - *sizedat += sizeof(prog_section_def) * vec_size(code->defs); - *sizedat += sizeof(prog_section_field) * vec_size(code->fields); - *sizedat += sizeof(prog_section_function) * vec_size(code->functions); - *sizedat += sizeof(int32_t) * vec_size(code->globals); - *sizedat += 1 * vec_size(code->chars); + *sizedat += sizeof(prog_header_t); + *sizedat += sizeof(prog_section_statement_t) * vec_size(code->statements); + *sizedat += sizeof(prog_section_def_t) * vec_size(code->defs); + *sizedat += sizeof(prog_section_field_t) * vec_size(code->fields); + *sizedat += sizeof(prog_section_function_t) * vec_size(code->functions); + *sizedat += sizeof(int32_t) * vec_size(code->globals); + *sizedat += 1 * vec_size(code->chars); *datmem = (uint8_t*)mem_a(*sizedat); - WRITE_CHUNK(datmem, &code_header, sizeof(prog_header)); - WRITE_CHUNK(datmem, code->statements, sizeof(prog_section_statement) * vec_size(code->statements)); - WRITE_CHUNK(datmem, code->defs, sizeof(prog_section_def) * vec_size(code->defs)); - WRITE_CHUNK(datmem, code->fields, sizeof(prog_section_field) * vec_size(code->fields)); - WRITE_CHUNK(datmem, code->functions, sizeof(prog_section_function) * 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)); + 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)); #undef WRITE_CHUNK @@ -252,9 +267,9 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t } bool code_write(code_t *code, const char *filename, const char *lnofile) { - prog_header code_header; - FILE *fp = NULL; - size_t it = 2; + prog_header_t code_header; + FILE *fp = NULL; + size_t it = 2; code_create_header(code, &code_header); @@ -288,13 +303,13 @@ bool code_write(code_t *code, 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_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)) { fs_file_close(fp); return false; @@ -340,7 +355,7 @@ bool code_write(code_t *code, const char *filename, const char *lnofile) { for (;;) { if (code->statements[j].opcode != INSTR_DONE) util_debug("GEN", " %-12s {% 5i,% 5i,% 5i}\n", - asm_instr[code->statements[j].opcode].m, + util_instr_str[code->statements[j].opcode], code->statements[j].o1.s1, code->statements[j].o2.s1, code->statements[j].o3.s1