X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=b0ce2baa04aa138b24a81004257414b7ad81a3cc;hp=80d6c3b33fb41616d188f35b1bf2eda990e57d45;hb=69b55ccc03b56af1f6c05eb45866ab198307487f;hpb=1fd2666fba4d44c1f8d14e2fcb50dd4fcad0a808 diff --git a/code.c b/code.c index 80d6c3b..b0ce2ba 100644 --- a/code.c +++ b/code.c @@ -1,6 +1,7 @@ /* - * Copyright (C) 2012 + * 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,162 +23,189 @@ */ #include "gmqcc.h" -typedef struct { - uint32_t offset; /* Offset in file of where data begins */ - uint32_t length; /* Length of section (how many of) */ -} prog_section; - -typedef struct { - uint16_t version; /* Program version (6) */ - uint16_t flags; /* see propsal.txt */ - uint16_t crc16; /* What is this? */ - uint16_t skip; /* see propsal.txt */ - - prog_section statements; /* prog_section_statement */ - prog_section defs; /* prog_section_def */ - prog_section fields; /* prog_section_field */ - prog_section functions; /* prog_section_function */ - prog_section strings; /* What is this? */ - prog_section globals; /* What is this? */ - uint32_t entfield; /* Number of entity fields */ -} prog_header; +/* 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)) + +void code_push_statement(code_t *code, prog_section_statement *stmt, int linenum) +{ + vec_push(code->statements, *stmt); + vec_push(code->linenums, linenum); +} + +void code_pop_statement(code_t *code) +{ + vec_pop(code->statements); + vec_pop(code->linenums); +} + +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_t *code = (code_t*)mem_a(sizeof(code_t)); + int i = 0; + + memset(code, 0, sizeof(code_t)); + code->entfields = 0; + code->string_cache = util_htnew(OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS) ? 0x100 : 1024); -/* - * 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 ); - -void code_init() { - /* omit creation of null code */ - if (opts_omit_nullcode) - return; - /* * The way progs.dat is suppose to work is odd, there needs to be * some null (empty) statements, functions, and 28 globals */ - prog_section_function empty_function = {0,0,0,0,0,0,0,{0}}; - prog_section_statement empty_statement = {0,{0},{0},{0}}; - int i; - for(i = 0; i < 28; i++) - code_globals_add(0); - - code_chars_add ('\0'); - code_functions_add (empty_function); - code_statements_add(empty_statement); -} + for(; i < 28; i++) + vec_push(code->globals, 0); + + vec_push(code->chars, '\0'); + vec_push(code->functions, empty_function); -void code_test() { - 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((prog_section_def){.type=TYPE_VOID, .offset=28/*globals[28]*/, .name=1 }); /* m_init */ - code_defs_add((prog_section_def){.type=TYPE_FUNCTION,.offset=29/*globals[29]*/, .name=8 }); /* print */ - code_defs_add((prog_section_def){.type=TYPE_STRING, .offset=30/*globals[30]*/, .name=14}); /*hello_world*/ - - code_functions_add((prog_section_function){1, 0, 0, 0, .name=1, 0, 0, {0}}); /* m_init */ - code_functions_add((prog_section_function){-4, 0, 0, 0, .name=8, 0, 0, {0}}); /* print */ - code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13, 0,0, {0}}); /* m_keydown */ - code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10, 0,0, {0}}); - code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10+7, 0,0, {0}}); - code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10+7+9, 0,0, {0}}); - - code_statements_add((prog_section_statement){INSTR_STORE_F, {30}/*30 is hello_world */, {OFS_PARM0}, {0}}); - code_statements_add((prog_section_statement){INSTR_CALL1, {29}/*29 is print */, {0}, {0}}); - code_statements_add((prog_section_statement){INSTR_RETURN, {0}, {0}, {0}}); + code_push_statement(code, &empty_statement, 0); + + vec_push(code->defs, empty_def); + vec_push(code->fields, empty_def); + + return code; } -void code_write() { - prog_header code_header={0}; +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; + + 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; + } - /* see proposal.txt */ - if (opts_omit_nullcode) { - code_header.skip = 28; - code_header.flags = 1; + 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); } - - code_header.version = 6; - code_header.crc16 = 0; /* TODO: */ - code_header.statements = (prog_section){sizeof(prog_header), code_statements_elements }; - code_header.defs = (prog_section){code_header.statements.offset + sizeof(prog_section_statement)*code_statements_elements, code_defs_elements }; - code_header.fields = (prog_section){code_header.defs.offset + sizeof(prog_section_def) *code_defs_elements, code_fields_elements }; - code_header.functions = (prog_section){code_header.fields.offset + sizeof(prog_section_field) *code_fields_elements, code_functions_elements }; - code_header.globals = (prog_section){code_header.functions.offset + sizeof(prog_section_function) *code_functions_elements, code_globals_elements }; - code_header.strings = (prog_section){code_header.globals.offset + sizeof(int) *code_globals_elements, code_chars_elements }; - code_header.entfield = 0; /* TODO: */ - - if (opts_darkplaces_stringtablebug) { + + 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 (code_t *code, size_t qcsize) +{ + qcint pos = (qcint)code->entfields; + code->entfields += qcsize; + return pos; +} + +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.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; + + 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(int)); - - FILE *fp = fopen("program.dat", "wb"); - fwrite(&code_header, 1, sizeof(prog_header), fp); - fwrite(code_statements_data, 1, sizeof(prog_section_statement)*code_statements_elements, fp); - fwrite(code_defs_data, 1, sizeof(prog_section_def) *code_defs_elements, fp); - fwrite(code_fields_data, 1, sizeof(prog_section_field) *code_fields_elements, fp); - fwrite(code_functions_data, 1, sizeof(prog_section_function) *code_functions_elements, fp); - fwrite(code_globals_data, 1, sizeof(int) *code_globals_elements, fp); - fwrite(code_chars_data, 1, 1 *code_chars_elements, fp); - + 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 = fs_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 (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"); + } + + fs_file_close(fp); + fp = NULL; + } + + fp = fs_file_open(filename, "wb"); + 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)) + { + fs_file_close(fp); + return false; + } + util_debug("GEN","HEADER:\n"); util_debug("GEN"," version: = %d\n", code_header.version ); util_debug("GEN"," crc16: = %d\n", code_header.crc16 ); @@ -188,43 +216,61 @@ void code_write() { util_debug("GEN"," functions = {.offset = % 8d, .length = % 8d}\n", code_header.functions .offset, code_header.functions .length); util_debug("GEN"," globals = {.offset = % 8d, .length = % 8d}\n", code_header.globals .offset, code_header.globals .length); util_debug("GEN"," strings = {.offset = % 8d, .length = % 8d}\n", code_header.strings .offset, code_header.strings .length); - + /* FUNCTIONS */ util_debug("GEN", "FUNCTIONS:\n"); - size_t i = 1; - for (; i < code_functions_elements; i++) { - size_t j = code_functions_data[i].entry; - util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize =%0X }\n", - code_functions_data[i].entry, - code_functions_data[i].firstlocal, - code_functions_data[i].locals, - code_functions_data[i].profile, - code_functions_data[i].name, - code_functions_data[i].file, - code_functions_data[i].nargs, - *((int32_t*)&code_functions_data[i].argsize) + 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] + ); - util_debug("GEN", " NAME: %s\n", &code_chars_data[code_functions_data[i].name]); - util_debug("GEN", " CODE:\n"); - for (;;) { - if (code_statements_data[j].opcode != INSTR_DONE && - code_statements_data[j].opcode != INSTR_RETURN) - util_debug("GEN", " %s {0x%05d,0x%05d,0x%05d}\n", - asm_instr[code_statements_data[j].opcode].m, - code_statements_data[j].s1, - code_statements_data[j].s2, - code_statements_data[j].s3 - ); - else break; - j++; + util_debug("GEN", " NAME: %s\n", &code->chars[code->functions[it].name]); + /* Internal functions have no code */ + if (code->functions[it].entry >= 0) { + util_debug("GEN", " CODE:\n"); + for (;;) { + 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"); + break; + } + j++; + } } } - - 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); + + fs_file_close(fp); + mem_d(code); + return true; }