X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=code.c;h=f3d60fffc40555de1c7f2f1abcd2306a53b8f7d9;hb=4937fa51c0a8a403c0d95753b40e8f7be1bce05f;hp=a763ee6681b14940eb7e66be793c2e298fc36332;hpb=d6ca5673dc7f2760faca1200477808d919a290ca;p=xonotic%2Fgmqcc.git diff --git a/code.c b/code.c index a763ee6..f3d60ff 100644 --- a/code.c +++ b/code.c @@ -44,19 +44,93 @@ typedef union { #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) +void code_push_statement(code_t *code, prog_section_statement_t *stmt_in, lex_ctx_t ctx) { - vec_push(code->statements, *stmt); - vec_push(code->linenums, linenum); + prog_section_statement_t stmt = *stmt_in; + + if (OPTS_FLAG(TYPELESS_STORES)) { + switch (stmt.opcode) { + case INSTR_LOAD_S: + case INSTR_LOAD_ENT: + case INSTR_LOAD_FLD: + case INSTR_LOAD_FNC: + stmt.opcode = INSTR_LOAD_F; + break; + case INSTR_STORE_S: + case INSTR_STORE_ENT: + case INSTR_STORE_FLD: + case INSTR_STORE_FNC: + stmt.opcode = INSTR_STORE_F; + break; + case INSTR_STOREP_S: + case INSTR_STOREP_ENT: + case INSTR_STOREP_FLD: + case INSTR_STOREP_FNC: + stmt.opcode = INSTR_STOREP_F; + break; + } + } + + + if (OPTS_FLAG(SORT_OPERANDS)) { + uint16_t pair; + + switch (stmt.opcode) { + case INSTR_MUL_F: + case INSTR_MUL_V: + case INSTR_ADD_F: + case INSTR_EQ_F: + case INSTR_EQ_S: + case INSTR_EQ_E: + case INSTR_EQ_FNC: + case INSTR_NE_F: + case INSTR_NE_V: + case INSTR_NE_S: + case INSTR_NE_E: + case INSTR_NE_FNC: + case INSTR_AND: + case INSTR_OR: + case INSTR_BITAND: + case INSTR_BITOR: + if (stmt.o1.u1 < stmt.o2.u1) { + uint16_t a = stmt.o2.u1; + stmt.o1.u1 = stmt.o2.u1; + stmt.o2.u1 = a; + } + break; + + case INSTR_MUL_VF: pair = INSTR_MUL_FV; goto case_pair_gen; + case INSTR_MUL_FV: pair = INSTR_MUL_VF; goto case_pair_gen; + case INSTR_LT: pair = INSTR_GT; goto case_pair_gen; + case INSTR_GT: pair = INSTR_LT; goto case_pair_gen; + case INSTR_LE: pair = INSTR_GT; goto case_pair_gen; + case INSTR_GE: pair = INSTR_LE; + + case_pair_gen: + if (stmt.o1.u1 < stmt.o2.u1) { + uint16_t x = stmt.o1.u1; + stmt.o1.u1 = stmt.o2.u1; + stmt.o2.u1 = x; + stmt.opcode = pair; + } + break; + } + } + + vec_push(code->statements, stmt); + vec_push(code->linenums, (int)ctx.line); + vec_push(code->columnnums, (int)ctx.column); } void code_pop_statement(code_t *code) { vec_pop(code->statements); vec_pop(code->linenums); + vec_pop(code->columnnums); } code_t *code_init() { + static lex_ctx_t empty_ctx = {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}; @@ -78,7 +152,7 @@ code_t *code_init() { vec_push(code->chars, '\0'); vec_push(code->functions, empty_function); - code_push_statement(code, &empty_statement, 0); + code_push_statement(code, &empty_statement, empty_ctx); vec_push(code->defs, empty_def); vec_push(code->fields, empty_def); @@ -115,7 +189,7 @@ uint32_t code_genstring(code_t *code, const char *str) { return CODE_HASH_LEAVE(existing); CODE_HASH_LEAVE(existing) = vec_size(code->chars); - vec_upload(code->chars, str, strlen(str)+1); + vec_append(code->chars, strlen(str)+1, str); util_htseth(code->string_cache, str, hash, CODE_HASH_ENTER(existing)); return CODE_HASH_LEAVE(existing); @@ -128,7 +202,35 @@ qcint_t code_alloc_field (code_t *code, size_t qcsize) return pos; } -static void code_create_header(code_t *code, prog_header_t *code_header) { +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); + size += sizeof(code->columnnums[0]) * vec_size(code->columnnums); + } 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)); @@ -179,6 +281,51 @@ static void code_create_header(code_t *code, prog_header_t *code_header) { 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) { + con_out(" lno:\n"); + con_out(" name: %s\n", lnofile); + con_out(" size: %u (bytes)\n", code_size_debug(code, code_header)); + } + + con_out("\n"); } /* @@ -186,14 +333,15 @@ static void code_create_header(code_t *code, prog_header_t *code_header) { * 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) { +#if 0 +static bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t **lnomem, size_t *sizelno) GMQCC_UNUSED { prog_header_t code_header; uint32_t offset = 0; if (!datmem) return false; - code_create_header(code, &code_header); + code_create_header(code, &code_header, "<>", "<>"); #define WRITE_CHUNK(C,X,S) \ do { \ @@ -205,15 +353,8 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t if (lnomem) { uint32_t version = 1; - *sizelno += 4; /* LNOF */ - *sizelno += sizeof(version); - *sizelno += sizeof(code_header.defs.length); - *sizelno += sizeof(code_header.globals.length); - *sizelno += sizeof(code_header.fields.length); - *sizelno += sizeof(code_header.statements.length); - *sizelno += sizeof(code->linenums[0]) * vec_size(code->linenums); - - *lnomem = (uint8_t*)mem_a(*sizelno); + *sizelno = code_size_debug(code, &code_header); + *lnomem = (uint8_t*)mem_a(*sizelno); WRITE_CHUNK(lnomem, "LNOF", 4); WRITE_CHUNK(lnomem, &version, sizeof(version)); @@ -232,15 +373,8 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t } /* Write out the dat */ - *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); + *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)); @@ -250,10 +384,9 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t 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 - vec_free(code->statements); vec_free(code->linenums); + vec_free(code->columnnums); vec_free(code->defs); vec_free(code->fields); vec_free(code->functions); @@ -262,16 +395,18 @@ bool code_write_memory(code_t *code, uint8_t **datmem, size_t *sizedat, uint8_t util_htdel(code->string_cache); mem_d(code); - + code_stats("<>", (lnomem) ? "<>" : NULL, code, &code_header); return true; } +#endif /*!#if 0 reenable when ready to be used */ +#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); + code_create_header(code, &code_header, filename, lnofile); if (lnofile) { uint32_t version = 1; @@ -280,17 +415,18 @@ bool code_write(code_t *code, const char *filename, const char *lnofile) { 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)) + util_endianswap(&version, 1, sizeof(version)); + util_endianswap(code->linenums, vec_size(code->linenums), sizeof(code->linenums[0])); + util_endianswap(code->columnnums, vec_size(code->columnnums), sizeof(code->columnnums[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) || + fs_file_write(code->columnnums, sizeof(code->columnnums[0]), vec_size(code->columnnums), fp) != vec_size(code->columnnums)) { con_err("failed to write lno file\n"); } @@ -370,12 +506,14 @@ bool code_write(code_t *code, const char *filename, const char *lnofile) { } 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->columnnums); vec_free(code->defs); vec_free(code->fields); vec_free(code->functions);