X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=372e7eb63c68bb797216a159f9a897d9d7541106;hp=e828ccc81b5da0c3d6964fa820162600f71922d1;hb=091173341eace2d290f6c0ebc4159c3afca7fbaa;hpb=354dd94b95b764124598d399dbbab140d8e545f6 diff --git a/code.c b/code.c index e828ccc..372e7eb 100644 --- a/code.c +++ b/code.c @@ -22,46 +22,12 @@ */ #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; +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; @@ -83,23 +49,23 @@ void code_init() { * 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); - code_defs_add (empty_def); - code_fields_add (empty_def); + vec_push(code_chars, '\0'); + vec_push(code_functions, empty_function); + vec_push(code_statements, empty_statement); + vec_push(code_defs, empty_def); + vec_push(code_fields, empty_def); } uint32_t code_genstring(const char *str) { - uint32_t off = code_chars_elements; + uint32_t off = vec_size(code_chars); while (*str) { - code_chars_add(*str); + vec_push(code_chars, *str); ++str; } - code_chars_add(0); + vec_push(code_chars, 0); return off; } @@ -110,10 +76,10 @@ uint32_t code_cachedstring(const char *str) * 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)) + while (s < vec_size(code_chars)) { + if (!strcmp(str, code_chars + s)) return s; - while (code_chars_data[s]) ++s; + while (code_chars[s]) ++s; ++s; } return code_genstring(str); @@ -133,31 +99,31 @@ void code_test() { 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); + 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"); - code_globals_add(1); /* m_init */ - code_globals_add(2); /* print */ - code_globals_add(14); /* hello world in string table */ + 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 */ - 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); + 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); } qcint code_alloc_field (size_t qcsize) @@ -175,17 +141,17 @@ bool code_write(const char *filename) { /* see proposal.txt */ if (OPTS_FLAG(OMIT_NULL_BYTES)) {} 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; if (opts_forcecrc) code_header.crc16 = opts_forced_crc; @@ -197,30 +163,30 @@ bool code_write(const char *filename) { 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)); + 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"); 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)) + 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)) { fclose(fp); return false; @@ -239,37 +205,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) + if (code_statements[j].opcode != AINSTR_END) util_debug("GEN", " %-12s {% 5i,% 5i,% 5i}\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 + 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"); @@ -280,12 +246,12 @@ 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); + 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); return true; }