X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ir.c;h=84832fedf5a5aa7dc3bc4aec35a7dffa2b6a9a8f;hp=d2e1e0f9d612889958fc84385929caec3a63bda6;hb=0bbc8a33509dfce06eae404ce2e008a4f119f675;hpb=5e4b8846d1838c6c0244646b2a3f81c94a647b13 diff --git a/ir.c b/ir.c index d2e1e0f..84832fe 100644 --- a/ir.c +++ b/ir.c @@ -38,13 +38,14 @@ const char *type_name[TYPE_COUNT] = { "field", "function", "pointer", -#if 0 "integer", -#endif - "variant" + "variant", + "struct", + "union", + "array" }; -size_t type_sizeof[TYPE_COUNT] = { +size_t type_sizeof_[TYPE_COUNT] = { 1, /* TYPE_VOID */ 1, /* TYPE_STRING */ 1, /* TYPE_FLOAT */ @@ -53,10 +54,11 @@ size_t type_sizeof[TYPE_COUNT] = { 1, /* TYPE_FIELD */ 1, /* TYPE_FUNCTION */ 1, /* TYPE_POINTER */ -#if 0 1, /* TYPE_INTEGER */ -#endif 3, /* TYPE_VARIANT */ + 0, /* TYPE_STRUCT */ + 0, /* TYPE_UNION */ + 0, /* TYPE_ARRAY */ }; uint16_t type_store_instr[TYPE_COUNT] = { @@ -70,9 +72,37 @@ uint16_t type_store_instr[TYPE_COUNT] = { INSTR_STORE_ENT, /* should use I */ #if 0 INSTR_STORE_I, /* integer type */ +#else + INSTR_STORE_F, #endif INSTR_STORE_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ +}; + +uint16_t field_store_instr[TYPE_COUNT] = { + INSTR_STORE_FLD, + INSTR_STORE_FLD, + INSTR_STORE_FLD, + INSTR_STORE_V, + INSTR_STORE_FLD, + INSTR_STORE_FLD, + INSTR_STORE_FLD, + INSTR_STORE_FLD, +#if 0 + INSTR_STORE_FLD, /* integer type */ +#else + INSTR_STORE_FLD, +#endif + + INSTR_STORE_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ }; uint16_t type_storep_instr[TYPE_COUNT] = { @@ -86,9 +116,15 @@ uint16_t type_storep_instr[TYPE_COUNT] = { INSTR_STOREP_ENT, /* should use I */ #if 0 INSTR_STOREP_ENT, /* integer type */ +#else + INSTR_STOREP_F, #endif INSTR_STOREP_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ }; uint16_t type_eq_instr[TYPE_COUNT] = { @@ -102,9 +138,15 @@ uint16_t type_eq_instr[TYPE_COUNT] = { INSTR_EQ_E, /* should use I */ #if 0 INSTR_EQ_I, +#else + INSTR_EQ_F, #endif INSTR_EQ_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ }; uint16_t type_ne_instr[TYPE_COUNT] = { @@ -118,43 +160,113 @@ uint16_t type_ne_instr[TYPE_COUNT] = { INSTR_NE_E, /* should use I */ #if 0 INSTR_NE_I, +#else + INSTR_NE_F, #endif INSTR_NE_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ }; -MEM_VEC_FUNCTIONS(ir_value_vector, ir_value*, v) +uint16_t type_not_instr[TYPE_COUNT] = { + INSTR_NOT_F, /* should use I when having integer support */ + INSTR_NOT_S, + INSTR_NOT_F, + INSTR_NOT_V, + INSTR_NOT_ENT, + INSTR_NOT_ENT, + INSTR_NOT_FNC, + INSTR_NOT_ENT, /* should use I */ +#if 0 + INSTR_NOT_I, /* integer type */ +#else + INSTR_NOT_F, +#endif + + INSTR_NOT_V, /* variant, should never be accessed */ + + AINSTR_END, /* struct */ + AINSTR_END, /* union */ + AINSTR_END, /* array */ +}; + +/* protos */ +static void ir_gen_extparam(ir_builder *ir); + +/* error functions */ static void irerror(lex_ctx ctx, const char *msg, ...) { va_list ap; va_start(ap, msg); - cvprintmsg(ctx, LVL_ERROR, "internal error", msg, ap); + con_cvprintmsg((void*)&ctx, LVL_ERROR, "internal error", msg, ap); va_end(ap); } static bool irwarning(lex_ctx ctx, int warntype, const char *fmt, ...) { - va_list ap; - int lvl = LVL_WARNING; + bool r; + va_list ap; + va_start(ap, fmt); + r = vcompile_warning(ctx, warntype, fmt, ap); + va_end(ap); + return r; +} - if (warntype && !OPTS_WARN(warntype)) - return false; +/*********************************************************************** + * Vector utility functions + */ - if (opts_werror) - lvl = LVL_ERROR; +bool GMQCC_WARN vec_ir_value_find(ir_value **vec, ir_value *what, size_t *idx) +{ + size_t i; + size_t len = vec_size(vec); + for (i = 0; i < len; ++i) { + if (vec[i] == what) { + if (idx) *idx = i; + return true; + } + } + return false; +} - va_start(ap, fmt); - vprintmsg(lvl, ctx.file, ctx.line, "warning", fmt, ap); - va_end(ap); +bool GMQCC_WARN vec_ir_block_find(ir_block **vec, ir_block *what, size_t *idx) +{ + size_t i; + size_t len = vec_size(vec); + for (i = 0; i < len; ++i) { + if (vec[i] == what) { + if (idx) *idx = i; + return true; + } + } + return false; +} - return opts_werror; +bool GMQCC_WARN vec_ir_instr_find(ir_instr **vec, ir_instr *what, size_t *idx) +{ + size_t i; + size_t len = vec_size(vec); + for (i = 0; i < len; ++i) { + if (vec[i] == what) { + if (idx) *idx = i; + return true; + } + } + return false; } /*********************************************************************** - *IR Builder + * IR Builder */ +static void ir_block_delete_quick(ir_block* self); +static void ir_instr_delete_quick(ir_instr *self); +static void ir_function_delete_quick(ir_function *self); + ir_builder* ir_builder_new(const char *modulename) { ir_builder* self; @@ -163,9 +275,17 @@ ir_builder* ir_builder_new(const char *modulename) if (!self) return NULL; - MEM_VECTOR_INIT(self, functions); - MEM_VECTOR_INIT(self, globals); - MEM_VECTOR_INIT(self, fields); + self->functions = NULL; + self->globals = NULL; + self->fields = NULL; + self->extparams = NULL; + self->filenames = NULL; + self->filestrings = NULL; + self->htglobals = util_htnew(IR_HT_SIZE); + self->htfields = util_htnew(IR_HT_SIZE); + self->htfunctions = util_htnew(IR_HT_SIZE); + + self->str_immediate = 0; self->name = NULL; if (!ir_builder_set_name(self, modulename)) { mem_d(self); @@ -175,26 +295,31 @@ ir_builder* ir_builder_new(const char *modulename) return self; } -MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals) -MEM_VEC_FUNCTIONS(ir_builder, ir_value*, fields) -MEM_VEC_FUNCTIONS(ir_builder, ir_function*, functions) - void ir_builder_delete(ir_builder* self) { size_t i; + util_htdel(self->htglobals); + util_htdel(self->htfields); + util_htdel(self->htfunctions); mem_d((void*)self->name); - for (i = 0; i != self->functions_count; ++i) { - ir_function_delete(self->functions[i]); + for (i = 0; i != vec_size(self->functions); ++i) { + ir_function_delete_quick(self->functions[i]); } - MEM_VECTOR_CLEAR(self, functions); - for (i = 0; i != self->globals_count; ++i) { + vec_free(self->functions); + for (i = 0; i != vec_size(self->extparams); ++i) { + ir_value_delete(self->extparams[i]); + } + vec_free(self->extparams); + for (i = 0; i != vec_size(self->globals); ++i) { ir_value_delete(self->globals[i]); } - MEM_VECTOR_CLEAR(self, globals); - for (i = 0; i != self->fields_count; ++i) { + vec_free(self->globals); + for (i = 0; i != vec_size(self->fields); ++i) { ir_value_delete(self->fields[i]); } - MEM_VECTOR_CLEAR(self, fields); + vec_free(self->fields); + vec_free(self->filenames); + vec_free(self->filestrings); mem_d(self); } @@ -208,12 +333,7 @@ bool ir_builder_set_name(ir_builder *self, const char *name) ir_function* ir_builder_get_function(ir_builder *self, const char *name) { - size_t i; - for (i = 0; i < self->functions_count; ++i) { - if (!strcmp(name, self->functions[i]->name)) - return self->functions[i]; - } - return NULL; + return (ir_function*)util_htget(self->htfunctions, name); } ir_function* ir_builder_create_function(ir_builder *self, const char *name, int outtype) @@ -224,12 +344,13 @@ ir_function* ir_builder_create_function(ir_builder *self, const char *name, int } fn = ir_function_new(self, outtype); - if (!ir_function_set_name(fn, name) || - !ir_builder_functions_add(self, fn) ) + if (!ir_function_set_name(fn, name)) { ir_function_delete(fn); return NULL; } + vec_push(self->functions, fn); + util_htset(self->htfunctions, name, fn); fn->value = ir_builder_create_global(self, fn->name, TYPE_FUNCTION); if (!fn->value) { @@ -237,7 +358,7 @@ ir_function* ir_builder_create_function(ir_builder *self, const char *name, int return NULL; } - fn->value->isconst = true; + fn->value->hasvalue = true; fn->value->outtype = outtype; fn->value->constval.vfunc = fn; fn->value->context = fn->context; @@ -247,12 +368,7 @@ ir_function* ir_builder_create_function(ir_builder *self, const char *name, int ir_value* ir_builder_get_global(ir_builder *self, const char *name) { - size_t i; - for (i = 0; i < self->globals_count; ++i) { - if (!strcmp(self->globals[i]->name, name)) - return self->globals[i]; - } - return NULL; + return (ir_value*)util_htget(self->htglobals, name); } ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype) @@ -268,21 +384,14 @@ ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype } ve = ir_value_var(name, store_global, vtype); - if (!ir_builder_globals_add(self, ve)) { - ir_value_delete(ve); - return NULL; - } + vec_push(self->globals, ve); + util_htset(self->htglobals, name, ve); return ve; } ir_value* ir_builder_get_field(ir_builder *self, const char *name) { - size_t i; - for (i = 0; i < self->fields_count; ++i) { - if (!strcmp(self->fields[i]->name, name)) - return self->fields[i]; - } - return NULL; + return (ir_value*)util_htget(self->htfields, name); } @@ -295,10 +404,8 @@ ir_value* ir_builder_create_field(ir_builder *self, const char *name, int vtype) ve = ir_value_var(name, store_global, TYPE_FIELD); ve->fieldtype = vtype; - if (!ir_builder_fields_add(self, ve)) { - ir_value_delete(ve); - return NULL; - } + vec_push(self->fields, ve); + util_htset(self->htfields, name, ve); return ve; } @@ -332,10 +439,11 @@ ir_function* ir_function_new(ir_builder* owner, int outtype) self->outtype = outtype; self->value = NULL; self->builtin = 0; - MEM_VECTOR_INIT(self, params); - MEM_VECTOR_INIT(self, blocks); - MEM_VECTOR_INIT(self, values); - MEM_VECTOR_INIT(self, locals); + + self->params = NULL; + self->blocks = NULL; + self->values = NULL; + self->locals = NULL; self->code_function_def = -1; self->allocated_locals = 0; @@ -343,10 +451,6 @@ ir_function* ir_function_new(ir_builder* owner, int outtype) self->run_id = 0; return self; } -MEM_VEC_FUNCTIONS(ir_function, ir_value*, values) -MEM_VEC_FUNCTIONS(ir_function, ir_block*, blocks) -MEM_VEC_FUNCTIONS(ir_function, ir_value*, locals) -MEM_VEC_FUNCTIONS(ir_function, int, params) bool ir_function_set_name(ir_function *self, const char *name) { @@ -356,51 +460,290 @@ bool ir_function_set_name(ir_function *self, const char *name) return !!self->name; } +static void ir_function_delete_quick(ir_function *self) +{ + size_t i; + mem_d((void*)self->name); + + for (i = 0; i != vec_size(self->blocks); ++i) + ir_block_delete_quick(self->blocks[i]); + vec_free(self->blocks); + + vec_free(self->params); + + for (i = 0; i != vec_size(self->values); ++i) + ir_value_delete(self->values[i]); + vec_free(self->values); + + for (i = 0; i != vec_size(self->locals); ++i) + ir_value_delete(self->locals[i]); + vec_free(self->locals); + + /* self->value is deleted by the builder */ + + mem_d(self); +} + void ir_function_delete(ir_function *self) { size_t i; mem_d((void*)self->name); - for (i = 0; i != self->blocks_count; ++i) + for (i = 0; i != vec_size(self->blocks); ++i) ir_block_delete(self->blocks[i]); - MEM_VECTOR_CLEAR(self, blocks); + vec_free(self->blocks); - MEM_VECTOR_CLEAR(self, params); + vec_free(self->params); - for (i = 0; i != self->values_count; ++i) + for (i = 0; i != vec_size(self->values); ++i) ir_value_delete(self->values[i]); - MEM_VECTOR_CLEAR(self, values); + vec_free(self->values); - for (i = 0; i != self->locals_count; ++i) + for (i = 0; i != vec_size(self->locals); ++i) ir_value_delete(self->locals[i]); - MEM_VECTOR_CLEAR(self, locals); + vec_free(self->locals); /* self->value is deleted by the builder */ mem_d(self); } -bool GMQCC_WARN ir_function_collect_value(ir_function *self, ir_value *v) +void ir_function_collect_value(ir_function *self, ir_value *v) { - return ir_function_values_add(self, v); + vec_push(self->values, v); } -ir_block* ir_function_create_block(ir_function *self, const char *label) +ir_block* ir_function_create_block(lex_ctx ctx, ir_function *self, const char *label) { ir_block* bn = ir_block_new(self, label); - memcpy(&bn->context, &self->context, sizeof(self->context)); - if (!ir_function_blocks_add(self, bn)) { - ir_block_delete(bn); - return NULL; - } + bn->context = ctx; + vec_push(self->blocks, bn); return bn; } +static bool instr_is_operation(uint16_t op) +{ + return ( (op >= INSTR_MUL_F && op <= INSTR_GT) || + (op >= INSTR_LOAD_F && op <= INSTR_LOAD_FNC) || + (op == INSTR_ADDRESS) || + (op >= INSTR_NOT_F && op <= INSTR_NOT_FNC) || + (op >= INSTR_AND && op <= INSTR_BITOR) ); +} + +bool ir_function_pass_peephole(ir_function *self) +{ + size_t b; + + for (b = 0; b < vec_size(self->blocks); ++b) { + size_t i; + ir_block *block = self->blocks[b]; + + for (i = 0; i < vec_size(block->instr); ++i) { + ir_instr *inst; + inst = block->instr[i]; + + if (i >= 1 && + (inst->opcode >= INSTR_STORE_F && + inst->opcode <= INSTR_STORE_FNC)) + { + ir_instr *store; + ir_instr *oper; + ir_value *value; + + store = inst; + + oper = block->instr[i-1]; + if (!instr_is_operation(oper->opcode)) + continue; + + value = oper->_ops[0]; + + /* only do it for SSA values */ + if (value->store != store_value) + continue; + + /* don't optimize out the temp if it's used later again */ + if (vec_size(value->reads) != 1) + continue; + + /* The very next store must use this value */ + if (value->reads[0] != store) + continue; + + /* And of course the store must _read_ from it, so it's in + * OP 1 */ + if (store->_ops[1] != value) + continue; + + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + (void)!ir_instr_op(oper, 0, store->_ops[0], true); + + vec_remove(block->instr, i, 1); + ir_instr_delete(store); + } + else if (inst->opcode == VINSTR_COND) + { + /* COND on a value resulting from a NOT could + * remove the NOT and swap its operands + */ + while (true) { + ir_block *tmp; + size_t inotid; + ir_instr *inot; + ir_value *value; + value = inst->_ops[0]; + + if (value->store != store_value || + vec_size(value->reads) != 1 || + value->reads[0] != inst) + { + break; + } + + inot = value->writes[0]; + if (inot->_ops[0] != value || + inot->opcode < INSTR_NOT_F || + inot->opcode > INSTR_NOT_FNC || + inot->opcode == INSTR_NOT_V) /* can't do this one */ + { + break; + } + + /* count */ + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + /* change operand */ + (void)!ir_instr_op(inst, 0, inot->_ops[1], false); + /* remove NOT */ + tmp = inot->owner; + for (inotid = 0; inotid < vec_size(tmp->instr); ++inotid) { + if (tmp->instr[inotid] == inot) + break; + } + if (inotid >= vec_size(tmp->instr)) { + compile_error(inst->context, "sanity-check failed: failed to find instruction to optimize out"); + return false; + } + vec_remove(tmp->instr, inotid, 1); + ir_instr_delete(inot); + /* swap ontrue/onfalse */ + tmp = inst->bops[0]; + inst->bops[0] = inst->bops[1]; + inst->bops[1] = tmp; + } + continue; + } + } + } + + return true; +} + +bool ir_function_pass_tailcall(ir_function *self) +{ + size_t b, p; + + for (b = 0; b < vec_size(self->blocks); ++b) { + ir_value *funcval; + ir_instr *ret, *call, *store = NULL; + ir_block *block = self->blocks[b]; + + if (!block->final || vec_size(block->instr) < 2) + continue; + + ret = block->instr[vec_size(block->instr)-1]; + if (ret->opcode != INSTR_DONE && ret->opcode != INSTR_RETURN) + continue; + + call = block->instr[vec_size(block->instr)-2]; + if (call->opcode >= INSTR_STORE_F && call->opcode <= INSTR_STORE_FNC) { + /* account for the unoptimized + * CALL + * STORE %return, %tmp + * RETURN %tmp + * version + */ + if (vec_size(block->instr) < 3) + continue; + + store = call; + call = block->instr[vec_size(block->instr)-3]; + } + + if (call->opcode < INSTR_CALL0 || call->opcode > INSTR_CALL8) + continue; + + if (store) { + /* optimize out the STORE */ + if (ret->_ops[0] && + ret->_ops[0] == store->_ops[0] && + store->_ops[1] == call->_ops[0]) + { + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + call->_ops[0] = store->_ops[0]; + vec_remove(block->instr, vec_size(block->instr) - 2, 1); + ir_instr_delete(store); + } + else + continue; + } + + if (!call->_ops[0]) + continue; + + funcval = call->_ops[1]; + if (!funcval) + continue; + if (funcval->vtype != TYPE_FUNCTION || funcval->constval.vfunc != self) + continue; + + /* now we have a CALL and a RET, check if it's a tailcall */ + if (ret->_ops[0] && call->_ops[0] != ret->_ops[0]) + continue; + + ++opts_optimizationcount[OPTIM_TAIL_RECURSION]; + vec_shrinkby(block->instr, 2); + + block->final = false; /* open it back up */ + + /* emite parameter-stores */ + for (p = 0; p < vec_size(call->params); ++p) { + /* assert(call->params_count <= self->locals_count); */ + if (!ir_block_create_store(block, call->context, self->locals[p], call->params[p])) { + irerror(call->context, "failed to create tailcall store instruction for parameter %i", (int)p); + return false; + } + } + if (!ir_block_create_jump(block, call->context, self->blocks[0])) { + irerror(call->context, "failed to create tailcall jump"); + return false; + } + + ir_instr_delete(call); + ir_instr_delete(ret); + } + + return true; +} + bool ir_function_finalize(ir_function *self) { if (self->builtin) return true; + if (OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) { + if (!ir_function_pass_peephole(self)) { + irerror(self->context, "generic optimization pass broke something in `%s`", self->name); + return false; + } + } + + if (OPTS_OPTIMIZATION(OPTIM_TAIL_RECURSION)) { + if (!ir_function_pass_tailcall(self)) { + irerror(self->context, "tailcall optimization pass broke something in `%s`", self->name); + return false; + } + } + if (!ir_function_naive_phi(self)) return false; @@ -408,43 +751,24 @@ bool ir_function_finalize(ir_function *self) if (!ir_function_calculate_liferanges(self)) return false; - if (!ir_function_allocate_locals(self)) return false; return true; } -ir_value* ir_function_get_local(ir_function *self, const char *name) -{ - size_t i; - for (i = 0; i < self->locals_count; ++i) { - if (!strcmp(self->locals[i]->name, name)) - return self->locals[i]; - } - return NULL; -} - ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype, bool param) { ir_value *ve; - /* - if (ir_function_get_local(self, name)) - return NULL; - */ - if (param && - self->locals_count && - self->locals[self->locals_count-1]->store != store_param) { + vec_size(self->locals) && + self->locals[vec_size(self->locals)-1]->store != store_param) { irerror(self->context, "cannot add parameters after adding locals"); return NULL; } ve = ir_value_var(name, (param ? store_param : store_local), vtype); - if (!ir_function_locals_add(self, ve)) { - ir_value_delete(ve); - return NULL; - } + vec_push(self->locals, ve); return ve; } @@ -462,7 +786,7 @@ ir_block* ir_block_new(ir_function* owner, const char *name) memset(self, 0, sizeof(*self)); self->label = NULL; - if (!ir_block_set_label(self, name)) { + if (name && !ir_block_set_label(self, name)) { mem_d(self); return NULL; } @@ -470,34 +794,45 @@ ir_block* ir_block_new(ir_function* owner, const char *name) self->context.file = "<@no context>"; self->context.line = 0; self->final = false; - MEM_VECTOR_INIT(self, instr); - MEM_VECTOR_INIT(self, entries); - MEM_VECTOR_INIT(self, exits); + + self->instr = NULL; + self->entries = NULL; + self->exits = NULL; self->eid = 0; self->is_return = false; self->run_id = 0; - MEM_VECTOR_INIT(self, living); + + self->living = NULL; self->generated = false; return self; } -MEM_VEC_FUNCTIONS(ir_block, ir_instr*, instr) -MEM_VEC_FUNCTIONS_ALL(ir_block, ir_block*, entries) -MEM_VEC_FUNCTIONS_ALL(ir_block, ir_block*, exits) -MEM_VEC_FUNCTIONS_ALL(ir_block, ir_value*, living) + +static void ir_block_delete_quick(ir_block* self) +{ + size_t i; + if (self->label) mem_d(self->label); + for (i = 0; i != vec_size(self->instr); ++i) + ir_instr_delete_quick(self->instr[i]); + vec_free(self->instr); + vec_free(self->entries); + vec_free(self->exits); + vec_free(self->living); + mem_d(self); +} void ir_block_delete(ir_block* self) { size_t i; - mem_d(self->label); - for (i = 0; i != self->instr_count; ++i) + if (self->label) mem_d(self->label); + for (i = 0; i != vec_size(self->instr); ++i) ir_instr_delete(self->instr[i]); - MEM_VECTOR_CLEAR(self, instr); - MEM_VECTOR_CLEAR(self, entries); - MEM_VECTOR_CLEAR(self, exits); - MEM_VECTOR_CLEAR(self, living); + vec_free(self->instr); + vec_free(self->entries); + vec_free(self->exits); + vec_free(self->living); mem_d(self); } @@ -513,7 +848,7 @@ bool ir_block_set_label(ir_block *self, const char *name) *IR Instructions */ -ir_instr* ir_instr_new(ir_block* owner, int op) +ir_instr* ir_instr_new(lex_ctx ctx, ir_block* owner, int op) { ir_instr *self; self = (ir_instr*)mem_a(sizeof(*self)); @@ -521,22 +856,29 @@ ir_instr* ir_instr_new(ir_block* owner, int op) return NULL; self->owner = owner; - self->context.file = "<@no context>"; - self->context.line = 0; + self->context = ctx; self->opcode = op; self->_ops[0] = NULL; self->_ops[1] = NULL; self->_ops[2] = NULL; self->bops[0] = NULL; self->bops[1] = NULL; - MEM_VECTOR_INIT(self, phi); - MEM_VECTOR_INIT(self, params); + + self->phi = NULL; + self->params = NULL; self->eid = 0; + + self->likely = true; return self; } -MEM_VEC_FUNCTIONS(ir_instr, ir_phi_entry_t, phi) -MEM_VEC_FUNCTIONS(ir_instr, ir_value*, params) + +static void ir_instr_delete_quick(ir_instr *self) +{ + vec_free(self->phi); + vec_free(self->params); + mem_d(self); +} void ir_instr_delete(ir_instr *self) { @@ -547,25 +889,25 @@ void ir_instr_delete(ir_instr *self) * gcc doesn't care about an explicit: (void)foo(); to ignore the result, * I have to improvise here and use if(foo()); */ - for (i = 0; i < self->phi_count; ++i) { + for (i = 0; i < vec_size(self->phi); ++i) { size_t idx; - if (ir_value_writes_find(self->phi[i].value, self, &idx)) - if (ir_value_writes_remove(self->phi[i].value, idx)) GMQCC_SUPPRESS_EMPTY_BODY; - if (ir_value_reads_find(self->phi[i].value, self, &idx)) - if (ir_value_reads_remove (self->phi[i].value, idx)) GMQCC_SUPPRESS_EMPTY_BODY; + if (vec_ir_instr_find(self->phi[i].value->writes, self, &idx)) + vec_remove(self->phi[i].value->writes, idx, 1); + if (vec_ir_instr_find(self->phi[i].value->reads, self, &idx)) + vec_remove(self->phi[i].value->reads, idx, 1); } - MEM_VECTOR_CLEAR(self, phi); - for (i = 0; i < self->params_count; ++i) { + vec_free(self->phi); + for (i = 0; i < vec_size(self->params); ++i) { size_t idx; - if (ir_value_writes_find(self->params[i], self, &idx)) - if (ir_value_writes_remove(self->params[i], idx)) GMQCC_SUPPRESS_EMPTY_BODY; - if (ir_value_reads_find(self->params[i], self, &idx)) - if (ir_value_reads_remove (self->params[i], idx)) GMQCC_SUPPRESS_EMPTY_BODY; - } - MEM_VECTOR_CLEAR(self, params); - if (ir_instr_op(self, 0, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; - if (ir_instr_op(self, 1, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; - if (ir_instr_op(self, 2, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; + if (vec_ir_instr_find(self->params[i]->writes, self, &idx)) + vec_remove(self->params[i]->writes, idx, 1); + if (vec_ir_instr_find(self->params[i]->reads, self, &idx)) + vec_remove(self->params[i]->reads, idx, 1); + } + vec_free(self->params); + (void)!ir_instr_op(self, 0, NULL, false); + (void)!ir_instr_op(self, 1, NULL, false); + (void)!ir_instr_op(self, 2, NULL, false); mem_d(self); } @@ -573,25 +915,16 @@ bool ir_instr_op(ir_instr *self, int op, ir_value *v, bool writing) { if (self->_ops[op]) { size_t idx; - if (writing && ir_value_writes_find(self->_ops[op], self, &idx)) - { - if (!ir_value_writes_remove(self->_ops[op], idx)) - return false; - } - else if (ir_value_reads_find(self->_ops[op], self, &idx)) - { - if (!ir_value_reads_remove(self->_ops[op], idx)) - return false; - } + if (writing && vec_ir_instr_find(self->_ops[op]->writes, self, &idx)) + vec_remove(self->_ops[op]->writes, idx, 1); + else if (vec_ir_instr_find(self->_ops[op]->reads, self, &idx)) + vec_remove(self->_ops[op]->reads, idx, 1); } if (v) { - if (writing) { - if (!ir_value_writes_add(v, self)) - return false; - } else { - if (!ir_value_reads_add(v, self)) - return false; - } + if (writing) + vec_push(v->writes, self); + else + vec_push(v->reads, self); } self->_ops[op] = v; return true; @@ -624,13 +957,20 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype) self->fieldtype = TYPE_VOID; self->outtype = TYPE_VOID; self->store = storetype; - MEM_VECTOR_INIT(self, reads); - MEM_VECTOR_INIT(self, writes); - self->isconst = false; + + self->reads = NULL; + self->writes = NULL; + + self->cvq = CV_NONE; + self->hasvalue = false; self->context.file = "<@no context>"; self->context.line = 0; self->name = NULL; - ir_value_set_name(self, name); + if (name && !ir_value_set_name(self, name)) { + irerror(self->context, "out of memory"); + mem_d(self); + return NULL; + } memset(&self->constval, 0, sizeof(self->constval)); memset(&self->code, 0, sizeof(self->code)); @@ -640,12 +980,16 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype) self->members[2] = NULL; self->memberof = NULL; - MEM_VECTOR_INIT(self, life); + self->unique_life = false; + + self->life = NULL; return self; } ir_value* ir_value_vector_member(ir_value *self, unsigned int member) { + char *name; + size_t len; ir_value *m; if (member >= 3) return NULL; @@ -653,9 +997,16 @@ ir_value* ir_value_vector_member(ir_value *self, unsigned int member) if (self->members[member]) return self->members[member]; + len = strlen(self->name); + name = (char*)mem_a(len + 3); + memcpy(name, self->name, len); + name[len+0] = '_'; + name[len+1] = 'x' + member; + name[len+2] = '\0'; if (self->vtype == TYPE_VECTOR) { - m = ir_value_var(self->name, self->store, TYPE_FLOAT); + m = ir_value_var(name, self->store, TYPE_FLOAT); + mem_d(name); if (!m) return NULL; m->context = self->context; @@ -667,7 +1018,8 @@ ir_value* ir_value_vector_member(ir_value *self, unsigned int member) { if (self->fieldtype != TYPE_VECTOR) return NULL; - m = ir_value_var(self->name, self->store, TYPE_FIELD); + m = ir_value_var(name, self->store, TYPE_FIELD); + mem_d(name); if (!m) return NULL; m->fieldtype = TYPE_FLOAT; @@ -686,20 +1038,19 @@ ir_value* ir_value_vector_member(ir_value *self, unsigned int member) return m; } -MEM_VEC_FUNCTIONS(ir_value, ir_life_entry_t, life) -MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, reads) -MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, writes) +static GMQCC_INLINE size_t ir_value_sizeof(const ir_value *self) +{ + if (self->vtype == TYPE_FIELD && self->fieldtype == TYPE_VECTOR) + return type_sizeof_[TYPE_VECTOR]; + return type_sizeof_[self->vtype]; +} ir_value* ir_value_out(ir_function *owner, const char *name, int storetype, int vtype) { ir_value *v = ir_value_var(name, storetype, vtype); if (!v) return NULL; - if (!ir_function_collect_value(owner, v)) - { - ir_value_delete(v); - return NULL; - } + ir_function_collect_value(owner, v); return v; } @@ -708,7 +1059,7 @@ void ir_value_delete(ir_value* self) size_t i; if (self->name) mem_d((void*)self->name); - if (self->isconst) + if (self->hasvalue) { if (self->vtype == TYPE_STRING) mem_d((void*)self->constval.vstring); @@ -717,17 +1068,18 @@ void ir_value_delete(ir_value* self) if (self->members[i]) ir_value_delete(self->members[i]); } - MEM_VECTOR_CLEAR(self, reads); - MEM_VECTOR_CLEAR(self, writes); - MEM_VECTOR_CLEAR(self, life); + vec_free(self->reads); + vec_free(self->writes); + vec_free(self->life); mem_d(self); } -void ir_value_set_name(ir_value *self, const char *name) +bool ir_value_set_name(ir_value *self, const char *name) { if (self->name) mem_d((void*)self->name); self->name = util_strdup(name); + return !!self->name; } bool ir_value_set_float(ir_value *self, float f) @@ -735,7 +1087,7 @@ bool ir_value_set_float(ir_value *self, float f) if (self->vtype != TYPE_FLOAT) return false; self->constval.vfloat = f; - self->isconst = true; + self->hasvalue = true; return true; } @@ -744,7 +1096,7 @@ bool ir_value_set_func(ir_value *self, int f) if (self->vtype != TYPE_FUNCTION) return false; self->constval.vint = f; - self->isconst = true; + self->hasvalue = true; return true; } @@ -753,7 +1105,7 @@ bool ir_value_set_vector(ir_value *self, vector v) if (self->vtype != TYPE_VECTOR) return false; self->constval.vvec = v; - self->isconst = true; + self->hasvalue = true; return true; } @@ -762,7 +1114,7 @@ bool ir_value_set_field(ir_value *self, ir_value *fld) if (self->vtype != TYPE_FIELD) return false; self->constval.vpointer = fld; - self->isconst = true; + self->hasvalue = true; return true; } @@ -782,7 +1134,7 @@ bool ir_value_set_string(ir_value *self, const char *str) if (self->vtype != TYPE_STRING) return false; self->constval.vstring = ir_strdup(str); - self->isconst = true; + self->hasvalue = true; return true; } @@ -792,7 +1144,7 @@ bool ir_value_set_int(ir_value *self, int i) if (self->vtype != TYPE_INTEGER) return false; self->constval.vint = i; - self->isconst = true; + self->hasvalue = true; return true; } #endif @@ -800,7 +1152,7 @@ bool ir_value_set_int(ir_value *self, int i) bool ir_value_lives(ir_value *self, size_t at) { size_t i; - for (i = 0; i < self->life_count; ++i) + for (i = 0; i < vec_size(self->life); ++i) { ir_life_entry_t *life = &self->life[i]; if (life->start <= at && at <= life->end) @@ -814,9 +1166,8 @@ bool ir_value_lives(ir_value *self, size_t at) bool ir_value_life_insert(ir_value *self, size_t idx, ir_life_entry_t e) { size_t k; - if (!ir_value_life_add(self, e)) /* naive... */ - return false; - for (k = self->life_count-1; k > idx; --k) + vec_push(self->life, e); + for (k = vec_size(self->life)-1; k > idx; --k) self->life[k] = self->life[k-1]; self->life[idx] = e; return true; @@ -830,7 +1181,7 @@ bool ir_value_life_merge(ir_value *self, size_t s) ir_life_entry_t new_entry; /* Find the first range >= s */ - for (i = 0; i < self->life_count; ++i) + for (i = 0; i < vec_size(self->life); ++i) { before = life; life = &self->life[i]; @@ -838,7 +1189,7 @@ bool ir_value_life_merge(ir_value *self, size_t s) break; } /* nothing found? append */ - if (i == self->life_count) { + if (i == vec_size(self->life)) { ir_life_entry_t e; if (life && life->end+1 == s) { @@ -849,8 +1200,7 @@ bool ir_value_life_merge(ir_value *self, size_t s) if (life && life->end >= s) return false; e.start = e.end = s; - if (!ir_value_life_add(self, e)) - return false; /* failing */ + vec_push(self->life, e); return true; } /* found */ @@ -861,8 +1211,7 @@ bool ir_value_life_merge(ir_value *self, size_t s) { /* merge */ before->end = life->end; - if (!ir_value_life_remove(self, i)) - return false; /* failing */ + vec_remove(self->life, i, 1); return true; } if (before->end + 1 == s) @@ -890,19 +1239,18 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other) { size_t i, myi; - if (!other->life_count) + if (!vec_size(other->life)) return true; - if (!self->life_count) { - for (i = 0; i < other->life_count; ++i) { - if (!ir_value_life_add(self, other->life[i])) - return false; - } + if (!vec_size(self->life)) { + size_t count = vec_size(other->life); + ir_life_entry_t *life = vec_add(self->life, count); + memcpy(life, other->life, count * sizeof(*life)); return true; } myi = 0; - for (i = 0; i < other->life_count; ++i) + for (i = 0; i < vec_size(other->life); ++i) { const ir_life_entry_t *life = &other->life[i]; while (true) @@ -925,22 +1273,21 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other) entry->start = life->start; } - if (life->end > entry->end && - life->start-1 <= entry->end) + if (life->end > entry->end && + life->start <= entry->end+1) { /* ends later and overlaps */ entry->end = life->end; } /* see if our change combines it with the next ranges */ - while (myi+1 < self->life_count && + while (myi+1 < vec_size(self->life) && entry->end+1 >= self->life[1+myi].start) { /* overlaps with (myi+1) */ if (entry->end < self->life[1+myi].end) entry->end = self->life[1+myi].end; - if (!ir_value_life_remove(self, myi+1)) - return false; + vec_remove(self->life, myi+1, 1); entry = &self->life[myi]; } @@ -949,9 +1296,8 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other) { ++myi; /* append if we're at the end */ - if (myi >= self->life_count) { - if (!ir_value_life_add(self, *life)) - return false; + if (myi >= vec_size(self->life)) { + vec_push(self->life, *life); break; } /* otherweise check the next range */ @@ -975,13 +1321,13 @@ bool ir_values_overlap(const ir_value *a, const ir_value *b) ir_life_entry_t *la, *lb, *enda, *endb; /* first of all, if either has no life range, they cannot clash */ - if (!a->life_count || !b->life_count) + if (!vec_size(a->life) || !vec_size(b->life)) return false; la = a->life; lb = b->life; - enda = la + a->life_count; - endb = lb + b->life_count; + enda = la + vec_size(a->life); + endb = lb + vec_size(b->life); while (true) { /* check if the entries overlap, for that, @@ -1021,10 +1367,19 @@ bool ir_values_overlap(const ir_value *a, const ir_value *b) *IR main operations */ -bool ir_block_create_store_op(ir_block *self, int op, ir_value *target, ir_value *what) +static bool ir_check_unreachable(ir_block *self) { - ir_instr *in = ir_instr_new(self, op); - if (!in) + /* The IR should never have to deal with unreachable code */ + if (!self->final/* || OPTS_FLAG(ALLOW_UNREACHABLE_CODE)*/) + return true; + irerror(self->context, "unreachable statement (%s)", self->label); + return false; +} + +bool ir_block_create_store_op(ir_block *self, lex_ctx ctx, int op, ir_value *target, ir_value *what) +{ + ir_instr *in; + if (!ir_check_unreachable(self)) return false; if (target->store == store_value && @@ -1036,16 +1391,21 @@ bool ir_block_create_store_op(ir_block *self, int op, ir_value *target, ir_value return false; } + in = ir_instr_new(ctx, self, op); + if (!in) + return false; + if (!ir_instr_op(in, 0, target, true) || - !ir_instr_op(in, 1, what, false) || - !ir_block_instr_add(self, in) ) + !ir_instr_op(in, 1, what, false)) { + ir_instr_delete(in); return false; } + vec_push(self->instr, in); return true; } -bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what) +bool ir_block_create_store(ir_block *self, lex_ctx ctx, ir_value *target, ir_value *what) { int op = 0; int vtype; @@ -1067,10 +1427,10 @@ bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what) op = INSTR_STORE_V; } - return ir_block_create_store_op(self, op, target, what); + return ir_block_create_store_op(self, ctx, op, target, what); } -bool ir_block_create_storep(ir_block *self, ir_value *target, ir_value *what) +bool ir_block_create_storep(ir_block *self, lex_ctx ctx, ir_value *target, ir_value *what) { int op = 0; int vtype; @@ -1089,41 +1449,38 @@ bool ir_block_create_storep(ir_block *self, ir_value *target, ir_value *what) op = INSTR_STOREP_V; } - return ir_block_create_store_op(self, op, target, what); + return ir_block_create_store_op(self, ctx, op, target, what); } -bool ir_block_create_return(ir_block *self, ir_value *v) +bool ir_block_create_return(ir_block *self, lex_ctx ctx, ir_value *v) { ir_instr *in; - if (self->final) { - irerror(self->context, "block already ended (%s)", self->label); + if (!ir_check_unreachable(self)) return false; - } self->final = true; self->is_return = true; - in = ir_instr_new(self, INSTR_RETURN); + in = ir_instr_new(ctx, self, INSTR_RETURN); if (!in) return false; - if (v && !ir_instr_op(in, 0, v, false)) + if (v && !ir_instr_op(in, 0, v, false)) { + ir_instr_delete(in); return false; + } - if (!ir_block_instr_add(self, in)) - return false; + vec_push(self->instr, in); return true; } -bool ir_block_create_if(ir_block *self, ir_value *v, +bool ir_block_create_if(ir_block *self, lex_ctx ctx, ir_value *v, ir_block *ontrue, ir_block *onfalse) { ir_instr *in; - if (self->final) { - irerror(self->context, "block already ended (%s)", self->label); + if (!ir_check_unreachable(self)) return false; - } self->final = true; - /*in = ir_instr_new(self, (v->vtype == TYPE_STRING ? INSTR_IF_S : INSTR_IF_F));*/ - in = ir_instr_new(self, VINSTR_COND); + /*in = ir_instr_new(ctx, self, (v->vtype == TYPE_STRING ? INSTR_IF_S : INSTR_IF_F));*/ + in = ir_instr_new(ctx, self, VINSTR_COND); if (!in) return false; @@ -1135,72 +1492,58 @@ bool ir_block_create_if(ir_block *self, ir_value *v, in->bops[0] = ontrue; in->bops[1] = onfalse; - if (!ir_block_instr_add(self, in)) - return false; + vec_push(self->instr, in); - if (!ir_block_exits_add(self, ontrue) || - !ir_block_exits_add(self, onfalse) || - !ir_block_entries_add(ontrue, self) || - !ir_block_entries_add(onfalse, self) ) - { - return false; - } + vec_push(self->exits, ontrue); + vec_push(self->exits, onfalse); + vec_push(ontrue->entries, self); + vec_push(onfalse->entries, self); return true; } -bool ir_block_create_jump(ir_block *self, ir_block *to) +bool ir_block_create_jump(ir_block *self, lex_ctx ctx, ir_block *to) { ir_instr *in; - if (self->final) { - irerror(self->context, "block already ended (%s)", self->label); + if (!ir_check_unreachable(self)) return false; - } self->final = true; - in = ir_instr_new(self, VINSTR_JUMP); + in = ir_instr_new(ctx, self, VINSTR_JUMP); if (!in) return false; in->bops[0] = to; - if (!ir_block_instr_add(self, in)) - return false; + vec_push(self->instr, in); - if (!ir_block_exits_add(self, to) || - !ir_block_entries_add(to, self) ) - { - return false; - } + vec_push(self->exits, to); + vec_push(to->entries, self); return true; } -bool ir_block_create_goto(ir_block *self, ir_block *to) +bool ir_block_create_goto(ir_block *self, lex_ctx ctx, ir_block *to) { ir_instr *in; - if (self->final) { - irerror(self->context, "block already ended (%s)", self->label); + if (!ir_check_unreachable(self)) return false; - } self->final = true; - in = ir_instr_new(self, INSTR_GOTO); + in = ir_instr_new(ctx, self, INSTR_GOTO); if (!in) return false; in->bops[0] = to; - if (!ir_block_instr_add(self, in)) - return false; + vec_push(self->instr, in); - if (!ir_block_exits_add(self, to) || - !ir_block_entries_add(to, self) ) - { - return false; - } + vec_push(self->exits, to); + vec_push(to->entries, self); return true; } -ir_instr* ir_block_create_phi(ir_block *self, const char *label, int ot) +ir_instr* ir_block_create_phi(ir_block *self, lex_ctx ctx, const char *label, int ot) { ir_value *out; ir_instr *in; - in = ir_instr_new(self, VINSTR_PHI); + if (!ir_check_unreachable(self)) + return false; + in = ir_instr_new(ctx, self, VINSTR_PHI); if (!in) return NULL; out = ir_value_out(self->owner, label, store_value, ot); @@ -1213,11 +1556,7 @@ ir_instr* ir_block_create_phi(ir_block *self, const char *label, int ot) ir_value_delete(out); return NULL; } - if (!ir_block_instr_add(self, in)) { - ir_instr_delete(in); - ir_value_delete(out); - return NULL; - } + vec_push(self->instr, in); return in; } @@ -1226,11 +1565,11 @@ ir_value* ir_phi_value(ir_instr *self) return self->_ops[0]; } -bool ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) +void ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) { ir_phi_entry_t pe; - if (!ir_block_entries_find(self->owner, b, NULL)) { + if (!vec_ir_block_find(self->owner->entries, b, NULL)) { /* Must not be possible to cause this, otherwise the AST * is doing something wrong. */ @@ -1240,32 +1579,46 @@ bool ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) pe.value = v; pe.from = b; - if (!ir_value_reads_add(v, self)) - return false; - return ir_instr_phi_add(self, pe); + vec_push(v->reads, self); + vec_push(self->phi, pe); } /* call related code */ -ir_instr* ir_block_create_call(ir_block *self, const char *label, ir_value *func) +ir_instr* ir_block_create_call(ir_block *self, lex_ctx ctx, const char *label, ir_value *func, bool noreturn) { ir_value *out; ir_instr *in; - in = ir_instr_new(self, INSTR_CALL0); + if (!ir_check_unreachable(self)) + return false; + in = ir_instr_new(ctx, self, (noreturn ? VINSTR_NRCALL : INSTR_CALL0)); if (!in) return NULL; + if (noreturn) { + self->final = true; + self->is_return = true; + } out = ir_value_out(self->owner, label, (func->outtype == TYPE_VOID) ? store_return : store_value, func->outtype); if (!out) { ir_instr_delete(in); return NULL; } if (!ir_instr_op(in, 0, out, true) || - !ir_instr_op(in, 1, func, false) || - !ir_block_instr_add(self, in)) + !ir_instr_op(in, 1, func, false)) { ir_instr_delete(in); ir_value_delete(out); return NULL; } + vec_push(self->instr, in); + /* + if (noreturn) { + if (!ir_block_create_return(self, ctx, NULL)) { + compile_error(ctx, "internal error: failed to generate dummy-return instruction"); + ir_instr_delete(in); + return NULL; + } + } + */ return in; } @@ -1274,21 +1627,15 @@ ir_value* ir_call_value(ir_instr *self) return self->_ops[0]; } -bool ir_call_param(ir_instr* self, ir_value *v) +void ir_call_param(ir_instr* self, ir_value *v) { - if (!ir_instr_params_add(self, v)) - return false; - if (!ir_value_reads_add(v, self)) { - if (!ir_instr_params_remove(self, self->params_count-1)) - GMQCC_SUPPRESS_EMPTY_BODY; - return false; - } - return true; + vec_push(self->params, v); + vec_push(v->reads, self); } /* binary op related code */ -ir_value* ir_block_create_binop(ir_block *self, +ir_value* ir_block_create_binop(ir_block *self, lex_ctx ctx, const char *label, int opcode, ir_value *left, ir_value *right) { @@ -1377,10 +1724,10 @@ ir_value* ir_block_create_binop(ir_block *self, return NULL; } - return ir_block_create_general_instr(self, label, opcode, left, right, ot); + return ir_block_create_general_instr(self, ctx, label, opcode, left, right, ot); } -ir_value* ir_block_create_unary(ir_block *self, +ir_value* ir_block_create_unary(ir_block *self, lex_ctx ctx, const char *label, int opcode, ir_value *operand) { @@ -1410,10 +1757,10 @@ ir_value* ir_block_create_unary(ir_block *self, } /* let's use the general instruction creator and pass NULL for OPB */ - return ir_block_create_general_instr(self, label, opcode, operand, NULL, ot); + return ir_block_create_general_instr(self, ctx, label, opcode, operand, NULL, ot); } -ir_value* ir_block_create_general_instr(ir_block *self, const char *label, +ir_value* ir_block_create_general_instr(ir_block *self, lex_ctx ctx, const char *label, int op, ir_value *a, ir_value *b, int outype) { ir_instr *instr; @@ -1423,7 +1770,7 @@ ir_value* ir_block_create_general_instr(ir_block *self, const char *label, if (!out) return NULL; - instr = ir_instr_new(self, op); + instr = ir_instr_new(ctx, self, op); if (!instr) { ir_value_delete(out); return NULL; @@ -1436,8 +1783,7 @@ ir_value* ir_block_create_general_instr(ir_block *self, const char *label, goto on_error; } - if (!ir_block_instr_add(self, instr)) - goto on_error; + vec_push(self->instr, instr); return out; on_error: @@ -1446,7 +1792,7 @@ on_error: return NULL; } -ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_value *ent, ir_value *field) +ir_value* ir_block_create_fieldaddress(ir_block *self, lex_ctx ctx, const char *label, ir_value *ent, ir_value *field) { ir_value *v; @@ -1457,12 +1803,12 @@ ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_val if (field->vtype != TYPE_FIELD) return NULL; - v = ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER); + v = ir_block_create_general_instr(self, ctx, label, INSTR_ADDRESS, ent, field, TYPE_POINTER); v->fieldtype = field->fieldtype; return v; } -ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_value *ent, ir_value *field, int outype) +ir_value* ir_block_create_load_from_ent(ir_block *self, lex_ctx ctx, const char *label, ir_value *ent, ir_value *field, int outype) { int op; if (ent->vtype != TYPE_ENTITY) @@ -1485,13 +1831,14 @@ ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_va case TYPE_INTEGER: op = INSTR_LOAD_I; break; #endif default: + irerror(self->context, "invalid type for ir_block_create_load_from_ent: %s", type_name[outype]); return NULL; } - return ir_block_create_general_instr(self, label, op, ent, field, outype); + return ir_block_create_general_instr(self, ctx, label, op, ent, field, outype); } -ir_value* ir_block_create_add(ir_block *self, +ir_value* ir_block_create_add(ir_block *self, lex_ctx ctx, const char *label, ir_value *left, ir_value *right) { @@ -1501,6 +1848,7 @@ ir_value* ir_block_create_add(ir_block *self, if (l == r) { switch (l) { default: + irerror(self->context, "invalid type for ir_block_create_add: %s", type_name[l]); return NULL; case TYPE_FLOAT: op = INSTR_ADD_F; @@ -1522,12 +1870,15 @@ ir_value* ir_block_create_add(ir_block *self, op = INSTR_ADD_IF; else #endif + { + irerror(self->context, "invalid type for ir_block_create_add: %s", type_name[l]); return NULL; + } } - return ir_block_create_binop(self, label, op, left, right); + return ir_block_create_binop(self, ctx, label, op, left, right); } -ir_value* ir_block_create_sub(ir_block *self, +ir_value* ir_block_create_sub(ir_block *self, lex_ctx ctx, const char *label, ir_value *left, ir_value *right) { @@ -1538,6 +1889,7 @@ ir_value* ir_block_create_sub(ir_block *self, switch (l) { default: + irerror(self->context, "invalid type for ir_block_create_sub: %s", type_name[l]); return NULL; case TYPE_FLOAT: op = INSTR_SUB_F; @@ -1559,12 +1911,15 @@ ir_value* ir_block_create_sub(ir_block *self, op = INSTR_SUB_IF; else #endif + { + irerror(self->context, "invalid type for ir_block_create_sub: %s", type_name[l]); return NULL; + } } - return ir_block_create_binop(self, label, op, left, right); + return ir_block_create_binop(self, ctx, label, op, left, right); } -ir_value* ir_block_create_mul(ir_block *self, +ir_value* ir_block_create_mul(ir_block *self, lex_ctx ctx, const char *label, ir_value *left, ir_value *right) { @@ -1575,6 +1930,7 @@ ir_value* ir_block_create_mul(ir_block *self, switch (l) { default: + irerror(self->context, "invalid type for ir_block_create_mul: %s", type_name[l]); return NULL; case TYPE_FLOAT: op = INSTR_MUL_F; @@ -1603,13 +1959,15 @@ ir_value* ir_block_create_mul(ir_block *self, else if ( (l == TYPE_INTEGER && r == TYPE_FLOAT) ) op = INSTR_MUL_IF; #endif - else + else { + irerror(self->context, "invalid type for ir_block_create_mul: %s", type_name[l]); return NULL; + } } - return ir_block_create_binop(self, label, op, left, right); + return ir_block_create_binop(self, ctx, label, op, left, right); } -ir_value* ir_block_create_div(ir_block *self, +ir_value* ir_block_create_div(ir_block *self, lex_ctx ctx, const char *label, ir_value *left, ir_value *right) { @@ -1620,6 +1978,7 @@ ir_value* ir_block_create_div(ir_block *self, switch (l) { default: + irerror(self->context, "invalid type for ir_block_create_div: %s", type_name[l]); return NULL; case TYPE_FLOAT: op = INSTR_DIV_F; @@ -1640,9 +1999,12 @@ ir_value* ir_block_create_div(ir_block *self, op = INSTR_DIV_IF; else #endif + { + irerror(self->context, "invalid type for ir_block_create_div: %s", type_name[l]); return NULL; + } } - return ir_block_create_binop(self, label, op, left, right); + return ir_block_create_binop(self, ctx, label, op, left, right); } /* PHI resolving breaks the SSA, and must thus be the last @@ -1654,7 +2016,7 @@ bool ir_function_naive_phi(ir_function *self) { size_t i; - for (i = 0; i < self->blocks_count; ++i) + for (i = 0; i < vec_size(self->blocks); ++i) { if (!ir_block_naive_phi(self->blocks[i])) return false; @@ -1662,6 +2024,7 @@ bool ir_function_naive_phi(ir_function *self) return true; } +#if 0 static bool ir_naive_phi_emit_store(ir_block *block, size_t iid, ir_value *old, ir_value *what) { ir_instr *instr; @@ -1672,35 +2035,61 @@ static bool ir_naive_phi_emit_store(ir_block *block, size_t iid, ir_value *old, return false; /* we now move it up */ - instr = block->instr[block->instr_count-1]; - for (i = block->instr_count; i > iid; --i) + instr = vec_last(block->instr); + for (i = vec_size(block->instr)-1; i > iid; --i) block->instr[i] = block->instr[i-1]; block->instr[i] = instr; return true; } +#endif static bool ir_block_naive_phi(ir_block *self) { - size_t i, p, w; + size_t i, p; /*, w;*/ /* FIXME: optionally, create_phi can add the phis * to a list so we don't need to loop through blocks * - anyway: "don't optimize YET" */ - for (i = 0; i < self->instr_count; ++i) + for (i = 0; i < vec_size(self->instr); ++i) { ir_instr *instr = self->instr[i]; if (instr->opcode != VINSTR_PHI) continue; - if (!ir_block_instr_remove(self, i)) - return false; + vec_remove(self->instr, i, 1); --i; /* NOTE: i+1 below */ - for (p = 0; p < instr->phi_count; ++p) + for (p = 0; p < vec_size(instr->phi); ++p) { ir_value *v = instr->phi[p].value; - for (w = 0; w < v->writes_count; ++w) { + ir_block *b = instr->phi[p].from; + + if (v->store == store_value && + vec_size(v->reads) == 1 && + vec_size(v->writes) == 1) + { + /* replace the value */ + if (!ir_instr_op(v->writes[0], 0, instr->_ops[0], true)) + return false; + } + else + { + /* force a move instruction */ + ir_instr *prevjump = vec_last(b->instr); + vec_pop(b->instr); + b->final = false; + instr->_ops[0]->store = store_global; + if (!ir_block_create_store(b, instr->context, instr->_ops[0], v)) + return false; + instr->_ops[0]->store = store_value; + vec_push(b->instr, prevjump); + b->final = true; + } + +#if 0 + ir_value *v = instr->phi[p].value; + for (w = 0; w < vec_size(v->writes); ++w) { ir_value *old; if (!v->writes[w]->_ops[0]) @@ -1720,7 +2109,7 @@ static bool ir_block_naive_phi(ir_block *self) */ if (!ir_naive_phi_emit_store(self, i+1, old, v)) return false; - if (i+1 < self->instr_count) + if (i+1 < vec_size(self->instr)) instr = self->instr[i+1]; else instr = NULL; @@ -1733,11 +2122,11 @@ static bool ir_block_naive_phi(ir_block *self) { /* If it didn't, we can replace all reads by the phi target now. */ size_t r; - for (r = 0; r < old->reads_count; ++r) + for (r = 0; r < vec_size(old->reads); ++r) { size_t op; ir_instr *ri = old->reads[r]; - for (op = 0; op < ri->phi_count; ++op) { + for (op = 0; op < vec_size(ri->phi); ++op) { if (ri->phi[op].value == old) ri->phi[op].value = v; } @@ -1748,6 +2137,7 @@ static bool ir_block_naive_phi(ir_block *self) } } } +#endif } ir_instr_delete(instr); } @@ -1763,21 +2153,13 @@ static bool ir_block_naive_phi(ir_block *self) * Though this implementation might run an additional time for if nests. */ -typedef struct -{ - ir_value* *v; - size_t v_count; - size_t v_alloc; -} new_reads_t; -MEM_VEC_FUNCTIONS_ALL(new_reads_t, ir_value*, v) - /* Enumerate instructions used by value's life-ranges */ static void ir_block_enumerate(ir_block *self, size_t *_eid) { size_t i; size_t eid = *_eid; - for (i = 0; i < self->instr_count; ++i) + for (i = 0; i < vec_size(self->instr); ++i) { self->instr[i]->eid = eid++; } @@ -1793,7 +2175,7 @@ void ir_function_enumerate(ir_function *self) { size_t i; size_t instruction_id = 0; - for (i = 0; i < self->blocks_count; ++i) + for (i = 0; i < vec_size(self->blocks); ++i) { self->blocks[i]->eid = i; self->blocks[i]->run_id = 0; @@ -1810,22 +2192,38 @@ bool ir_function_calculate_liferanges(ir_function *self) do { self->run_id++; changed = false; - for (i = 0; i != self->blocks_count; ++i) + for (i = 0; i != vec_size(self->blocks); ++i) { if (self->blocks[i]->is_return) { - self->blocks[i]->living_count = 0; + vec_free(self->blocks[i]->living); if (!ir_block_life_propagate(self->blocks[i], NULL, &changed)) return false; } } } while (changed); - if (self->blocks_count) { + if (vec_size(self->blocks)) { ir_block *block = self->blocks[0]; - for (i = 0; i < block->living_count; ++i) { + for (i = 0; i < vec_size(block->living); ++i) { ir_value *v = block->living[i]; - if (v->memberof || v->store != store_local) + if (v->store != store_local) continue; + if ((v->members[0] && v->members[1] && v->members[2])) { + /* all vector members have been accessed - only treat this as uninitialized + * if any of them is also uninitialized. + */ + if (!vec_ir_value_find(block->living, v->members[0], NULL) && + !vec_ir_value_find(block->living, v->members[1], NULL) && + !vec_ir_value_find(block->living, v->members[2], NULL)) + { + continue; + } + } + if (v->memberof) { + /* A member is only uninitialized if the whole vector is also uninitialized */ + if (!vec_ir_value_find(block->living, v->memberof, NULL)) + continue; + } if (irwarning(v->context, WARN_USED_UNINITIALIZED, "variable `%s` may be used uninitialized in this function", v->name)) { @@ -1842,18 +2240,16 @@ bool ir_function_calculate_liferanges(ir_function *self) * This is the counterpart to register-allocation in register machines. */ typedef struct { - MEM_VECTOR_MAKE(ir_value*, locals); - MEM_VECTOR_MAKE(size_t, sizes); - MEM_VECTOR_MAKE(size_t, positions); + ir_value **locals; + size_t *sizes; + size_t *positions; + bool *unique; } function_allocator; -MEM_VEC_FUNCTIONS(function_allocator, ir_value*, locals) -MEM_VEC_FUNCTIONS(function_allocator, size_t, sizes) -MEM_VEC_FUNCTIONS(function_allocator, size_t, positions) static bool function_allocator_alloc(function_allocator *alloc, const ir_value *var) { ir_value *slot; - size_t vsize = type_sizeof[var->vtype]; + size_t vsize = ir_value_sizeof(var); slot = ir_value_var("reg", store_global, var->vtype); if (!slot) @@ -1862,11 +2258,9 @@ static bool function_allocator_alloc(function_allocator *alloc, const ir_value * if (!ir_value_life_merge_into(slot, var)) goto localerror; - if (!function_allocator_locals_add(alloc, slot)) - goto localerror; - - if (!function_allocator_sizes_add(alloc, vsize)) - goto localerror; + vec_push(alloc->locals, slot); + vec_push(alloc->sizes, vsize); + vec_push(alloc->unique, var->unique_life); return true; @@ -1886,31 +2280,49 @@ bool ir_function_allocate_locals(ir_function *self) function_allocator alloc; - if (!self->locals_count && !self->values_count) + if (!vec_size(self->locals) && !vec_size(self->values)) return true; - MEM_VECTOR_INIT(&alloc, locals); - MEM_VECTOR_INIT(&alloc, sizes); - MEM_VECTOR_INIT(&alloc, positions); + alloc.locals = NULL; + alloc.sizes = NULL; + alloc.positions = NULL; + alloc.unique = NULL; - for (i = 0; i < self->locals_count; ++i) + for (i = 0; i < vec_size(self->locals); ++i) { +#if 0 + if (!OPTS_OPTIMIZATION(OPTIM_LOCALTEMPS)) +#endif + self->locals[i]->unique_life = true; if (!function_allocator_alloc(&alloc, self->locals[i])) goto error; } /* Allocate a slot for any value that still exists */ - for (i = 0; i < self->values_count; ++i) + for (i = 0; i < vec_size(self->values); ++i) { v = self->values[i]; - if (!v->life_count) + if (!vec_size(v->life)) continue; - for (a = 0; a < alloc.locals_count; ++a) + for (a = 0; a < vec_size(alloc.locals); ++a) { + /* if it's reserved for a unique liferange: skip */ + if (alloc.unique[a]) + continue; + slot = alloc.locals[a]; + /* never resize parameters + * will be required later when overlapping temps + locals + */ + if (a < vec_size(self->params) && + alloc.sizes[a] < ir_value_sizeof(v)) + { + continue; + } + if (ir_values_overlap(v, slot)) continue; @@ -1918,14 +2330,14 @@ bool ir_function_allocate_locals(ir_function *self) goto error; /* adjust size for this slot */ - if (alloc.sizes[a] < type_sizeof[v->vtype]) - alloc.sizes[a] = type_sizeof[v->vtype]; + if (alloc.sizes[a] < ir_value_sizeof(v)) + alloc.sizes[a] = ir_value_sizeof(v); self->values[i]->code.local = a; break; } - if (a >= alloc.locals_count) { - self->values[i]->code.local = alloc.locals_count; + if (a >= vec_size(alloc.locals)) { + self->values[i]->code.local = vec_size(alloc.locals); if (!function_allocator_alloc(&alloc, v)) goto error; } @@ -1936,24 +2348,26 @@ bool ir_function_allocate_locals(ir_function *self) } /* Adjust slot positions based on sizes */ - if (!function_allocator_positions_add(&alloc, 0)) - goto error; + vec_push(alloc.positions, 0); - if (alloc.sizes_count) + if (vec_size(alloc.sizes)) pos = alloc.positions[0] + alloc.sizes[0]; else pos = 0; - for (i = 1; i < alloc.sizes_count; ++i) + for (i = 1; i < vec_size(alloc.sizes); ++i) { pos = alloc.positions[i-1] + alloc.sizes[i-1]; - if (!function_allocator_positions_add(&alloc, pos)) - goto error; + vec_push(alloc.positions, pos); } - self->allocated_locals = pos + alloc.sizes[alloc.sizes_count-1]; + self->allocated_locals = pos + vec_last(alloc.sizes); - /* Take over the actual slot positions */ - for (i = 0; i < self->values_count; ++i) { + /* Locals need to know their new position */ + for (i = 0; i < vec_size(self->locals); ++i) { + self->locals[i]->code.local = alloc.positions[i]; + } + /* Take over the actual slot positions on values */ + for (i = 0; i < vec_size(self->values); ++i) { self->values[i]->code.local = alloc.positions[self->values[i]->code.local]; } @@ -1962,11 +2376,12 @@ bool ir_function_allocate_locals(ir_function *self) error: retval = false; cleanup: - for (i = 0; i < alloc.locals_count; ++i) + for (i = 0; i < vec_size(alloc.locals); ++i) ir_value_delete(alloc.locals[i]); - MEM_VECTOR_CLEAR(&alloc, locals); - MEM_VECTOR_CLEAR(&alloc, sizes); - MEM_VECTOR_CLEAR(&alloc, positions); + vec_free(alloc.unique); + vec_free(alloc.locals); + vec_free(alloc.sizes); + vec_free(alloc.positions); return retval; } @@ -2014,7 +2429,7 @@ static bool ir_block_living_add_instr(ir_block *self, size_t eid) size_t i; bool changed = false; bool tempbool; - for (i = 0; i != self->living_count; ++i) + for (i = 0; i != vec_size(self->living); ++i) { tempbool = ir_value_life_merge(self->living[i], eid); /* debug @@ -2029,30 +2444,31 @@ static bool ir_block_living_add_instr(ir_block *self, size_t eid) static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *changed) { size_t i; + + (void)changed; + /* values which have been read in a previous iteration are now * in the "living" array even if the previous block doesn't use them. * So we have to remove whatever does not exist in the previous block. * They will be re-added on-read, but the liferange merge won't cause * a change. - */ - for (i = 0; i < self->living_count; ++i) + for (i = 0; i < vec_size(self->living); ++i) { - if (!ir_block_living_find(prev, self->living[i], NULL)) { - if (!ir_block_living_remove(self, i)) - return false; + if (!vec_ir_value_find(prev->living, self->living[i], NULL)) { + vec_remove(self->living, i, 1); --i; } } + */ /* Whatever the previous block still has in its living set * must now be added to ours as well. */ - for (i = 0; i < prev->living_count; ++i) + for (i = 0; i < vec_size(prev->living); ++i) { - if (ir_block_living_find(self, prev->living[i], NULL)) + if (vec_ir_value_find(self->living, prev->living[i], NULL)) continue; - if (!ir_block_living_add(self, prev->living[i])) - return false; + vec_push(self->living, prev->living[i]); /* irerror(self->contextt from prev: %s", self->label, prev->living[i]->_name); */ @@ -2077,35 +2493,25 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change return false; } - i = self->instr_count; + i = vec_size(self->instr); while (i) { --i; instr = self->instr[i]; /* PHI operands are always read operands */ - for (p = 0; p < instr->phi_count; ++p) + for (p = 0; p < vec_size(instr->phi); ++p) { value = instr->phi[p].value; - if (value->memberof) - value = value->memberof; - if (!ir_block_living_find(self, value, NULL) && - !ir_block_living_add(self, value)) - { - return false; - } + if (!vec_ir_value_find(self->living, value, NULL)) + vec_push(self->living, value); } /* call params are read operands too */ - for (p = 0; p < instr->params_count; ++p) + for (p = 0; p < vec_size(instr->params); ++p) { value = instr->params[p]; - if (value->memberof) - value = value->memberof; - if (!ir_block_living_find(self, value, NULL) && - !ir_block_living_add(self, value)) - { - return false; - } + if (!vec_ir_value_find(self->living, value, NULL)) + vec_push(self->living, value); } /* See which operands are read and write operands */ @@ -2131,8 +2537,6 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change continue; value = instr->_ops[o]; - if (value->memberof) - value = value->memberof; /* We only care about locals */ /* we also calculate parameter liferanges so that locals @@ -2145,11 +2549,8 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change /* read operands */ if (read & (1<living, value, NULL)) + vec_push(self->living, value); } /* write operands */ @@ -2160,7 +2561,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change if (write & (1<living, value, &idx); if (!in_living) { /* If the value isn't alive it hasn't been read before... */ @@ -2171,7 +2572,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change * since this function is run multiple times. */ /* For now: debug info: */ - /* fprintf(stderr, "Value only written %s\n", value->name); */ + /* con_err( "Value only written %s\n", value->name); */ tempbool = ir_value_life_merge(value, instr->eid); *changed = *changed || tempbool; /* @@ -2186,18 +2587,17 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change tempbool = ir_value_life_merge(value, instr->eid); /* if (tempbool) - fprintf(stderr, "value added id %s %i\n", value->name, (int)instr->eid); + con_err( "value added id %s %i\n", value->name, (int)instr->eid); */ *changed = *changed || tempbool; /* Then remove */ - if (!ir_block_living_remove(self, idx)) - return false; + vec_remove(self->living, idx, 1); } } } /* (A) */ tempbool = ir_block_living_add_instr(self, instr->eid); - /*fprintf(stderr, "living added values\n");*/ + /*con_err( "living added values\n");*/ *changed = *changed || tempbool; } @@ -2207,7 +2607,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change self->run_id = self->owner->run_id; - for (i = 0; i < self->entries_count; ++i) + for (i = 0; i < vec_size(self->entries); ++i) { ir_block *entry = self->entries[i]; ir_block_life_propagate(entry, self, changed); @@ -2235,7 +2635,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc static bool gen_global_field(ir_value *global) { - if (global->isconst) + if (global->hasvalue) { ir_value *fld = global->constval.vpointer; if (!fld) { @@ -2243,32 +2643,21 @@ static bool gen_global_field(ir_value *global) return false; } - /* Now, in this case, a relocation would be impossible to code - * since it looks like this: - * .vector v = origin; <- parse error, wtf is 'origin'? - * .vector origin; - * - * But we will need a general relocation support later anyway - * for functions... might as well support that here. - */ - if (!fld->code.globaladdr) { - irerror(global->context, "FIXME: Relocation support"); - return false; - } - /* copy the field's value */ - ir_value_code_setaddr(global, code_globals_add(code_globals_data[fld->code.globaladdr])); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, fld->code.fieldaddr); if (global->fieldtype == TYPE_VECTOR) { - code_globals_add(code_globals_data[fld->code.globaladdr]+1); - code_globals_add(code_globals_data[fld->code.globaladdr]+2); + vec_push(code_globals, fld->code.fieldaddr+1); + vec_push(code_globals, fld->code.fieldaddr+2); } } else { - ir_value_code_setaddr(global, code_globals_add(0)); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, 0); if (global->fieldtype == TYPE_VECTOR) { - code_globals_add(0); - code_globals_add(0); + vec_push(code_globals, 0); + vec_push(code_globals, 0); } } if (global->code.globaladdr < 0) @@ -2278,7 +2667,7 @@ static bool gen_global_field(ir_value *global) static bool gen_global_pointer(ir_value *global) { - if (global->isconst) + if (global->hasvalue) { ir_value *target = global->constval.vpointer; if (!target) { @@ -2302,11 +2691,13 @@ static bool gen_global_pointer(ir_value *global) return false; } - ir_value_code_setaddr(global, code_globals_add(target->code.globaladdr)); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, target->code.globaladdr); } else { - ir_value_code_setaddr(global, code_globals_add(0)); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, 0); } if (global->code.globaladdr < 0) return false; @@ -2325,8 +2716,8 @@ static bool gen_blocks_recursive(ir_function *func, ir_block *block) tailcall: block->generated = true; - block->code_start = code_statements_elements; - for (i = 0; i < block->instr_count; ++i) + block->code_start = vec_size(code_statements); + for (i = 0; i < vec_size(block->instr); ++i) { instr = block->instr[i]; @@ -2347,11 +2738,11 @@ tailcall: /* otherwise we generate a jump instruction */ stmt.opcode = INSTR_GOTO; - stmt.o1.s1 = (target->code_start) - code_statements_elements; + stmt.o1.s1 = (target->code_start) - vec_size(code_statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; - if (code_statements_add(stmt) < 0) - return false; + if (stmt.o1.s1 != 1) + code_push_statement(&stmt, instr->context.line); /* no further instructions can be in this block */ return true; @@ -2370,15 +2761,15 @@ tailcall: if (ontrue->generated) { stmt.opcode = INSTR_IF; - stmt.o2.s1 = (ontrue->code_start) - code_statements_elements; - if (code_statements_add(stmt) < 0) - return false; + stmt.o2.s1 = (ontrue->code_start) - vec_size(code_statements); + if (stmt.o2.s1 != 1) + code_push_statement(&stmt, instr->context.line); } if (onfalse->generated) { stmt.opcode = INSTR_IFNOT; - stmt.o2.s1 = (onfalse->code_start) - code_statements_elements; - if (code_statements_add(stmt) < 0) - return false; + stmt.o2.s1 = (onfalse->code_start) - vec_size(code_statements); + if (stmt.o2.s1 != 1) + code_push_statement(&stmt, instr->context.line); } if (!ontrue->generated) { if (onfalse->generated) { @@ -2394,31 +2785,63 @@ tailcall: } /* neither ontrue nor onfalse exist */ stmt.opcode = INSTR_IFNOT; - stidx = code_statements_elements; - if (code_statements_add(stmt) < 0) - return false; + if (!instr->likely) { + /* Honor the likelyhood hint */ + ir_block *tmp = onfalse; + stmt.opcode = INSTR_IF; + onfalse = ontrue; + ontrue = tmp; + } + stidx = vec_size(code_statements); + code_push_statement(&stmt, instr->context.line); /* on false we jump, so add ontrue-path */ if (!gen_blocks_recursive(func, ontrue)) return false; /* fixup the jump address */ - code_statements_data[stidx].o2.s1 = code_statements_elements - stidx; + code_statements[stidx].o2.s1 = vec_size(code_statements) - stidx; /* generate onfalse path */ if (onfalse->generated) { /* fixup the jump address */ - code_statements_data[stidx].o2.s1 = (onfalse->code_start) - (stidx); + code_statements[stidx].o2.s1 = (onfalse->code_start) - (stidx); + if (code_statements[stidx].o2.s1 == 1) { + code_statements[stidx] = code_statements[stidx+1]; + if (code_statements[stidx].o1.s1 < 0) + code_statements[stidx].o1.s1++; + code_pop_statement(); + } + stmt.opcode = vec_last(code_statements).opcode; + if (stmt.opcode == INSTR_GOTO || + stmt.opcode == INSTR_IF || + stmt.opcode == INSTR_IFNOT || + stmt.opcode == INSTR_RETURN || + stmt.opcode == INSTR_DONE) + { + /* no use jumping from here */ + return true; + } /* may have been generated in the previous recursive call */ stmt.opcode = INSTR_GOTO; - stmt.o1.s1 = (onfalse->code_start) - code_statements_elements; + stmt.o1.s1 = (onfalse->code_start) - vec_size(code_statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; - return (code_statements_add(stmt) >= 0); + if (stmt.o1.s1 != 1) + code_push_statement(&stmt, instr->context.line); + return true; + } + else if (code_statements[stidx].o2.s1 == 1) { + code_statements[stidx] = code_statements[stidx+1]; + if (code_statements[stidx].o1.s1 < 0) + code_statements[stidx].o1.s1++; + code_pop_statement(); } /* if not, generate now */ block = onfalse; goto tailcall; } - if (instr->opcode >= INSTR_CALL0 && instr->opcode <= INSTR_CALL8) { + if ( (instr->opcode >= INSTR_CALL0 && instr->opcode <= INSTR_CALL8) + || instr->opcode == VINSTR_NRCALL) + { /* Trivial call translation: * copy all params to OFS_PARM* * if the output's storetype is not store_return, @@ -2432,41 +2855,72 @@ tailcall: * generation already. This would even include later * reuse.... probably... :) */ - size_t p; + size_t p, first; ir_value *retvalue; - for (p = 0; p < instr->params_count; ++p) + first = vec_size(instr->params); + if (first > 8) + first = 8; + for (p = 0; p < first; ++p) { ir_value *param = instr->params[p]; stmt.opcode = INSTR_STORE_F; stmt.o3.u1 = 0; - stmt.opcode = type_store_instr[param->vtype]; + if (param->vtype == TYPE_FIELD) + stmt.opcode = field_store_instr[param->fieldtype]; + else + stmt.opcode = type_store_instr[param->vtype]; stmt.o1.u1 = ir_value_code_addr(param); stmt.o2.u1 = OFS_PARM0 + 3 * p; - if (code_statements_add(stmt) < 0) - return false; + code_push_statement(&stmt, instr->context.line); + } + /* Now handle extparams */ + first = vec_size(instr->params); + for (; p < first; ++p) + { + ir_builder *ir = func->owner; + ir_value *param = instr->params[p]; + ir_value *targetparam; + + if (p-8 >= vec_size(ir->extparams)) + ir_gen_extparam(ir); + + targetparam = ir->extparams[p-8]; + + stmt.opcode = INSTR_STORE_F; + stmt.o3.u1 = 0; + + if (param->vtype == TYPE_FIELD) + stmt.opcode = field_store_instr[param->fieldtype]; + else + stmt.opcode = type_store_instr[param->vtype]; + stmt.o1.u1 = ir_value_code_addr(param); + stmt.o2.u1 = ir_value_code_addr(targetparam); + code_push_statement(&stmt, instr->context.line); } - stmt.opcode = INSTR_CALL0 + instr->params_count; + + stmt.opcode = INSTR_CALL0 + vec_size(instr->params); if (stmt.opcode > INSTR_CALL8) stmt.opcode = INSTR_CALL8; stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]); stmt.o2.u1 = 0; stmt.o3.u1 = 0; - if (code_statements_add(stmt) < 0) - return false; + code_push_statement(&stmt, instr->context.line); retvalue = instr->_ops[0]; - if (retvalue && retvalue->store != store_return && retvalue->life_count) + if (retvalue && retvalue->store != store_return && vec_size(retvalue->life)) { /* not to be kept in OFS_RETURN */ - stmt.opcode = type_store_instr[retvalue->vtype]; + if (retvalue->vtype == TYPE_FIELD) + stmt.opcode = field_store_instr[retvalue->vtype]; + else + stmt.opcode = type_store_instr[retvalue->vtype]; stmt.o1.u1 = OFS_RETURN; stmt.o2.u1 = ir_value_code_addr(retvalue); stmt.o3.u1 = 0; - if (code_statements_add(stmt) < 0) - return false; + code_push_statement(&stmt, instr->context.line); } continue; } @@ -2504,10 +2958,19 @@ tailcall: /* 2-operand instructions with A -> B */ stmt.o2.u1 = stmt.o3.u1; stmt.o3.u1 = 0; + + /* tiny optimization, don't output + * STORE a, a + */ + if (stmt.o2.u1 == stmt.o1.u1 && + OPTS_OPTIMIZATION(OPTIM_PEEPHOLE)) + { + ++opts_optimizationcount[OPTIM_PEEPHOLE]; + continue; + } } - if (code_statements_add(stmt) < 0) - return false; + code_push_statement(&stmt, instr->context.line); } return true; } @@ -2520,7 +2983,7 @@ static bool gen_function_code(ir_function *self) /* Starting from entry point, we generate blocks "as they come" * for now. Dead blocks will not be translated obviously. */ - if (!self->blocks_count) { + if (!vec_size(self->blocks)) { irerror(self->context, "Function '%s' declared without body.", self->name); return false; } @@ -2534,25 +2997,42 @@ static bool gen_function_code(ir_function *self) return false; } - /* otherwise code_write crashes since it debug-prints functions until AINSTR_END */ - stmt.opcode = AINSTR_END; + /* code_write and qcvm -disasm need to know that the function ends here */ + stmt.opcode = INSTR_DONE; stmt.o1.u1 = 0; stmt.o2.u1 = 0; stmt.o3.u1 = 0; - if (code_statements_add(stmt) < 0) - return false; + code_push_statement(&stmt, vec_last(code_linenums)); return true; } +static qcint ir_builder_filestring(ir_builder *ir, const char *filename) +{ + /* NOTE: filename pointers are copied, we never strdup them, + * thus we can use pointer-comparison to find the string. + */ + size_t i; + qcint str; + + for (i = 0; i < vec_size(ir->filenames); ++i) { + if (ir->filenames[i] == filename) + return ir->filestrings[i]; + } + + str = code_genstring(filename); + vec_push(ir->filenames, filename); + vec_push(ir->filestrings, str); + return str; +} + static bool gen_global_function(ir_builder *ir, ir_value *global) { prog_section_function fun; ir_function *irfun; size_t i; - size_t local_var_end; - if (!global->isconst || (!global->constval.vfunc)) + if (!global->hasvalue || (!global->constval.vfunc)) { irerror(global->context, "Invalid state of function-global: not constant: %s", global->name); return false; @@ -2561,52 +3041,104 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) irfun = global->constval.vfunc; fun.name = global->code.name; - fun.file = code_cachedstring(global->context.file); + fun.file = ir_builder_filestring(ir, global->context.file); fun.profile = 0; /* always 0 */ - fun.nargs = irfun->params_count; + fun.nargs = vec_size(irfun->params); + if (fun.nargs > 8) + fun.nargs = 8; for (i = 0;i < 8; ++i) { - if (i >= fun.nargs) + if ((int32_t)i >= fun.nargs) fun.argsize[i] = 0; else - fun.argsize[i] = type_sizeof[irfun->params[i]]; + fun.argsize[i] = type_sizeof_[irfun->params[i]]; } - fun.firstlocal = code_globals_elements; + fun.firstlocal = vec_size(code_globals); - local_var_end = fun.firstlocal; - for (i = 0; i < irfun->locals_count; ++i) { + fun.locals = irfun->allocated_locals; + for (i = 0; i < vec_size(irfun->locals); ++i) { if (!ir_builder_gen_global(ir, irfun->locals[i], true)) { irerror(irfun->locals[i]->context, "Failed to generate local %s", irfun->locals[i]->name); return false; } + ir_value_code_setaddr(irfun->locals[i], fun.firstlocal + irfun->locals[i]->code.local); } - if (irfun->locals_count) { - ir_value *last = irfun->locals[irfun->locals_count-1]; - local_var_end = last->code.globaladdr; - local_var_end += type_sizeof[last->vtype]; - } - for (i = 0; i < irfun->values_count; ++i) + for (i = 0; i < vec_size(irfun->values); ++i) { /* generate code.globaladdr for ssa values */ ir_value *v = irfun->values[i]; - ir_value_code_setaddr(v, local_var_end + v->code.local); - } - for (i = 0; i < irfun->allocated_locals; ++i) { - /* fill the locals with zeros */ - code_globals_add(0); + ir_value_code_setaddr(v, fun.firstlocal + v->code.local); } - - fun.locals = code_globals_elements - fun.firstlocal; + for (i = vec_size(code_globals); i < fun.firstlocal + irfun->allocated_locals; ++i) + vec_push(code_globals, 0); if (irfun->builtin) - fun.entry = irfun->builtin; + fun.entry = irfun->builtin+1; else { - irfun->code_function_def = code_functions_elements; - fun.entry = code_statements_elements; + irfun->code_function_def = vec_size(code_functions); + fun.entry = vec_size(code_statements); + } + + vec_push(code_functions, fun); + return true; +} + +static void ir_gen_extparam(ir_builder *ir) +{ + prog_section_def def; + ir_value *global; + char name[128]; + + snprintf(name, sizeof(name), "EXTPARM#%i", (int)(vec_size(ir->extparams)+8)); + global = ir_value_var(name, store_global, TYPE_VECTOR); + + def.name = code_genstring(name); + def.type = TYPE_VECTOR; + def.offset = vec_size(code_globals); + + vec_push(code_defs, def); + ir_value_code_setaddr(global, def.offset); + vec_push(code_globals, 0); + vec_push(code_globals, 0); + vec_push(code_globals, 0); + + vec_push(ir->extparams, global); +} + +static bool gen_function_extparam_copy(ir_function *self) +{ + size_t i, ext, numparams; + + ir_builder *ir = self->owner; + ir_value *ep; + prog_section_statement stmt; + + numparams = vec_size(self->params); + if (!numparams) + return true; + + stmt.opcode = INSTR_STORE_F; + stmt.o3.s1 = 0; + for (i = 8; i < numparams; ++i) { + ext = i - 8; + if (ext >= vec_size(ir->extparams)) + ir_gen_extparam(ir); + + ep = ir->extparams[ext]; + + stmt.opcode = type_store_instr[self->locals[i]->vtype]; + if (self->locals[i]->vtype == TYPE_FIELD && + self->locals[i]->fieldtype == TYPE_VECTOR) + { + stmt.opcode = INSTR_STORE_V; + } + stmt.o1.u1 = ir_value_code_addr(ep); + stmt.o2.u1 = ir_value_code_addr(self->locals[i]); + code_push_statement(&stmt, self->context.line); } - return (code_functions_add(fun) >= 0); + return true; } static bool gen_global_function_code(ir_builder *ir, ir_value *global) @@ -2614,10 +3146,14 @@ static bool gen_global_function_code(ir_builder *ir, ir_value *global) prog_section_function *fundef; ir_function *irfun; + (void)ir; + irfun = global->constval.vfunc; if (!irfun) { - irwarning(global->context, WARN_IMPLICIT_FUNCTION_POINTER, - "function `%s` has no body and in QC implicitly becomes a function-pointer", global->name); + if (global->cvq == CV_NONE) { + irwarning(global->context, WARN_IMPLICIT_FUNCTION_POINTER, + "function `%s` has no body and in QC implicitly becomes a function-pointer", global->name); + } /* this was a function pointer, don't generate code for those */ return true; } @@ -2629,9 +3165,13 @@ static bool gen_global_function_code(ir_builder *ir, ir_value *global) irerror(irfun->context, "`%s`: IR global wasn't generated, failed to access function-def", irfun->name); return false; } - fundef = &code_functions_data[irfun->code_function_def]; + fundef = &code_functions[irfun->code_function_def]; - fundef->entry = code_statements_elements; + fundef->entry = vec_size(code_statements); + if (!gen_function_extparam_copy(irfun)) { + irerror(irfun->context, "Failed to generate extparam-copy code for function %s", irfun->name); + return false; + } if (!gen_function_code(irfun)) { irerror(irfun->context, "Failed to generate code for function %s", irfun->name); return false; @@ -2639,6 +3179,62 @@ static bool gen_global_function_code(ir_builder *ir, ir_value *global) return true; } +static void gen_vector_defs(prog_section_def def, const char *name) +{ + char *component; + size_t len, i; + + if (!name || OPTS_FLAG(SINGLE_VECTOR_DEFS)) + return; + + def.type = TYPE_FLOAT; + + len = strlen(name); + + component = (char*)mem_a(len+3); + memcpy(component, name, len); + len += 2; + component[len-0] = 0; + component[len-2] = '_'; + + component[len-1] = 'x'; + + for (i = 0; i < 3; ++i) { + def.name = code_genstring(component); + vec_push(code_defs, def); + def.offset++; + component[len-1]++; + } +} + +static void gen_vector_fields(prog_section_field fld, const char *name) +{ + char *component; + size_t len, i; + + if (!name || OPTS_FLAG(SINGLE_VECTOR_DEFS)) + return; + + fld.type = TYPE_FLOAT; + + len = strlen(name); + + component = (char*)mem_a(len+3); + memcpy(component, name, len); + len += 2; + component[len-0] = 0; + component[len-2] = '_'; + + component[len-1] = 'x'; + + for (i = 0; i < 3; ++i) { + fld.name = code_genstring(component); + vec_push(code_fields, fld); + fld.offset++; + component[len-1]++; + } +} + static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal) { size_t i; @@ -2646,8 +3242,19 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc prog_section_def def; def.type = global->vtype; - def.offset = code_globals_elements; - def.name = global->code.name = code_genstring(global->name); + def.offset = vec_size(code_globals); + + if (global->name) { + if (global->name[0] == '#') { + if (!self->str_immediate) + self->str_immediate = code_genstring("IMMEDIATE"); + def.name = global->code.name = self->str_immediate; + } + else + def.name = global->code.name = code_genstring(global->name); + } + else + def.name = 0; switch (global->vtype) { @@ -2669,100 +3276,97 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc * Maybe this could be an -foption * fteqcc creates data for end_sys_* - of size 1, so let's do the same */ - ir_value_code_setaddr(global, code_globals_add(0)); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, 0); /* Add the def */ - if (code_defs_add(def) < 0) - return false; + vec_push(code_defs, def); return true; case TYPE_POINTER: - if (code_defs_add(def) < 0) - return false; + vec_push(code_defs, def); return gen_global_pointer(global); case TYPE_FIELD: - if (code_defs_add(def) < 0) - return false; + vec_push(code_defs, def); + gen_vector_defs(def, global->name); return gen_global_field(global); case TYPE_ENTITY: /* fall through */ case TYPE_FLOAT: { - if (global->isconst) { - iptr = (int32_t*)&global->constval.vfloat; - ir_value_code_setaddr(global, code_globals_add(*iptr)); + ir_value_code_setaddr(global, vec_size(code_globals)); + if (global->hasvalue) { + iptr = (int32_t*)&global->constval.ivec[0]; + vec_push(code_globals, *iptr); } else { - ir_value_code_setaddr(global, code_globals_add(0)); - if (!islocal) - def.type |= DEF_SAVEGLOBAL; + vec_push(code_globals, 0); } - if (code_defs_add(def) < 0) - return false; + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; + vec_push(code_defs, def); return global->code.globaladdr >= 0; } case TYPE_STRING: { - if (global->isconst) - ir_value_code_setaddr(global, code_globals_add(code_cachedstring(global->constval.vstring))); - else { - ir_value_code_setaddr(global, code_globals_add(0)); - if (!islocal) - def.type |= DEF_SAVEGLOBAL; + ir_value_code_setaddr(global, vec_size(code_globals)); + if (global->hasvalue) { + vec_push(code_globals, code_genstring(global->constval.vstring)); + } else { + vec_push(code_globals, 0); } - if (code_defs_add(def) < 0) - return false; + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; + vec_push(code_defs, def); return global->code.globaladdr >= 0; } case TYPE_VECTOR: { size_t d; - if (global->isconst) { - iptr = (int32_t*)&global->constval.vvec; - ir_value_code_setaddr(global, code_globals_add(iptr[0])); + ir_value_code_setaddr(global, vec_size(code_globals)); + if (global->hasvalue) { + iptr = (int32_t*)&global->constval.ivec[0]; + vec_push(code_globals, iptr[0]); if (global->code.globaladdr < 0) return false; - for (d = 1; d < type_sizeof[global->vtype]; ++d) - { - if (code_globals_add(iptr[d]) < 0) - return false; + for (d = 1; d < type_sizeof_[global->vtype]; ++d) { + vec_push(code_globals, iptr[d]); } } else { - ir_value_code_setaddr(global, code_globals_add(0)); + vec_push(code_globals, 0); if (global->code.globaladdr < 0) return false; - for (d = 1; d < type_sizeof[global->vtype]; ++d) - { - if (code_globals_add(0) < 0) - return false; + for (d = 1; d < type_sizeof_[global->vtype]; ++d) { + vec_push(code_globals, 0); } - if (!islocal) - def.type |= DEF_SAVEGLOBAL; } + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; - if (code_defs_add(def) < 0) - return false; + vec_push(code_defs, def); + def.type &= ~DEF_SAVEGLOBAL; + gen_vector_defs(def, global->name); return global->code.globaladdr >= 0; } case TYPE_FUNCTION: - if (!global->isconst) { - ir_value_code_setaddr(global, code_globals_add(0)); + ir_value_code_setaddr(global, vec_size(code_globals)); + if (!global->hasvalue) { + vec_push(code_globals, 0); if (global->code.globaladdr < 0) return false; } else { - ir_value_code_setaddr(global, code_globals_elements); - code_globals_add(code_functions_elements); + vec_push(code_globals, vec_size(code_functions)); if (!gen_global_function(self, global)) return false; - if (!islocal) - def.type |= DEF_SAVEGLOBAL; } - if (code_defs_add(def) < 0) - return false; + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; + vec_push(code_defs, def); return true; case TYPE_VARIANT: /* assume biggest type */ - ir_value_code_setaddr(global, code_globals_add(0)); - for (i = 1; i < type_sizeof[TYPE_VARIANT]; ++i) - code_globals_add(0); + ir_value_code_setaddr(global, vec_size(code_globals)); + vec_push(code_globals, 0); + for (i = 1; i < type_sizeof_[TYPE_VARIANT]; ++i) + vec_push(code_globals, 0); return true; default: /* refuse to create 'void' type or any other fancy business. */ @@ -2772,16 +3376,23 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc } } +static void ir_builder_prepare_field(ir_value *field) +{ + field->code.fieldaddr = code_alloc_field(type_sizeof_[field->fieldtype]); +} + static bool ir_builder_gen_field(ir_builder *self, ir_value *field) { prog_section_def def; prog_section_field fld; - def.type = field->vtype; - def.offset = code_globals_elements; + (void)self; + + def.type = (uint16_t)field->vtype; + def.offset = (uint16_t)vec_size(code_globals); /* create a global named the same as the field */ - if (opts_standard == COMPILER_GMQCC) { + if (opts.standard == COMPILER_GMQCC) { /* in our standard, the global gets a dot prefix */ size_t len = strlen(field->name); char name[1024]; @@ -2812,8 +3423,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) field->code.name = def.name; - if (code_defs_add(def) < 0) - return false; + vec_push(code_defs, def); fld.type = field->fieldtype; @@ -2822,19 +3432,20 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) return false; } - fld.offset = code_alloc_field(type_sizeof[field->fieldtype]); + fld.offset = field->code.fieldaddr; - if (code_fields_add(fld) < 0) - return false; + vec_push(code_fields, fld); - ir_value_code_setaddr(field, code_globals_elements); - if (!code_globals_add(fld.offset)) - return false; + ir_value_code_setaddr(field, vec_size(code_globals)); + vec_push(code_globals, fld.offset); if (fld.type == TYPE_VECTOR) { - if (!code_globals_add(fld.offset+1)) - return false; - if (!code_globals_add(fld.offset+2)) - return false; + vec_push(code_globals, fld.offset+1); + vec_push(code_globals, fld.offset+2); + } + + if (field->fieldtype == TYPE_VECTOR) { + gen_vector_defs(def, field->name); + gen_vector_fields(fld, field->name); } return field->code.globaladdr >= 0; @@ -2844,17 +3455,23 @@ bool ir_builder_generate(ir_builder *self, const char *filename) { prog_section_statement stmt; size_t i; + char *lnofile = NULL; code_init(); - for (i = 0; i < self->globals_count; ++i) + for (i = 0; i < vec_size(self->fields); ++i) + { + ir_builder_prepare_field(self->fields[i]); + } + + for (i = 0; i < vec_size(self->globals); ++i) { if (!ir_builder_gen_global(self, self->globals[i], false)) { return false; } } - for (i = 0; i < self->fields_count; ++i) + for (i = 0; i < vec_size(self->fields); ++i) { if (!ir_builder_gen_field(self, self->fields[i])) { return false; @@ -2862,7 +3479,7 @@ bool ir_builder_generate(ir_builder *self, const char *filename) } /* generate function code */ - for (i = 0; i < self->globals_count; ++i) + for (i = 0; i < vec_size(self->globals); ++i) { if (self->globals[i]->vtype == TYPE_FUNCTION) { if (!gen_global_function_code(self, self->globals[i])) { @@ -2871,19 +3488,52 @@ bool ir_builder_generate(ir_builder *self, const char *filename) } } - /* DP errors if the last instruction is not an INSTR_DONE - * and for debugging purposes we add an additional AINSTR_END - * to the end of functions, so here it goes: - */ - stmt.opcode = INSTR_DONE; - stmt.o1.u1 = 0; - stmt.o2.u1 = 0; - stmt.o3.u1 = 0; - if (code_statements_add(stmt) < 0) + if (vec_size(code_globals) >= 65536) { + irerror(vec_last(self->globals)->context, "This progs file would require more globals than the metadata can handle. Bailing out."); return false; + } + + /* DP errors if the last instruction is not an INSTR_DONE. */ + if (vec_last(code_statements).opcode != INSTR_DONE) + { + stmt.opcode = INSTR_DONE; + stmt.o1.u1 = 0; + stmt.o2.u1 = 0; + stmt.o3.u1 = 0; + code_push_statement(&stmt, vec_last(code_linenums)); + } + + if (opts.pp_only) + return true; + + if (vec_size(code_statements) != vec_size(code_linenums)) { + con_err("Linecounter wrong: %lu != %lu\n", + (unsigned long)vec_size(code_statements), + (unsigned long)vec_size(code_linenums)); + } else if (OPTS_FLAG(LNO)) { + char *dot; + size_t filelen = strlen(filename); + + memcpy(vec_add(lnofile, filelen+1), filename, filelen+1); + dot = strrchr(lnofile, '.'); + if (!dot) { + vec_pop(lnofile); + } else { + vec_shrinkto(lnofile, dot - lnofile); + } + memcpy(vec_add(lnofile, 5), ".lno", 5); + } - printf("writing '%s'...\n", filename); - return code_write(filename); + if (lnofile) + con_out("writing '%s' and '%s'...\n", filename, lnofile); + else + con_out("writing '%s'\n", filename); + if (!code_write(filename, lnofile)) { + vec_free(lnofile); + return false; + } + vec_free(lnofile); + return true; } /*********************************************************************** @@ -2892,16 +3542,14 @@ bool ir_builder_generate(ir_builder *self, const char *filename) #define IND_BUFSZ 1024 -#ifdef WIN32 -# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE) -#else -# define strncat strncat +#ifdef _MSC_VER +# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE) #endif const char *qc_opname(int op) { if (op < 0) return ""; - if (op < ( sizeof(asm_instr) / sizeof(asm_instr[0]) )) + if (op < (int)( sizeof(asm_instr) / sizeof(asm_instr[0]) )) return asm_instr[op].m; switch (op) { case VINSTR_PHI: return "PHI"; @@ -2919,15 +3567,15 @@ void ir_builder_dump(ir_builder *b, int (*oprintf)(const char*, ...)) indent[1] = 0; oprintf("module %s\n", b->name); - for (i = 0; i < b->globals_count; ++i) + for (i = 0; i < vec_size(b->globals); ++i) { oprintf("global "); - if (b->globals[i]->isconst) + if (b->globals[i]->hasvalue) oprintf("%s = ", b->globals[i]->name); ir_value_dump(b->globals[i], oprintf); oprintf("\n"); } - for (i = 0; i < b->functions_count; ++i) + for (i = 0; i < vec_size(b->functions); ++i) ir_function_dump(b->functions[i], indent, oprintf); oprintf("endmodule %s\n", b->name); } @@ -2942,38 +3590,38 @@ void ir_function_dump(ir_function *f, char *ind, } oprintf("%sfunction %s\n", ind, f->name); strncat(ind, "\t", IND_BUFSZ); - if (f->locals_count) + if (vec_size(f->locals)) { - oprintf("%s%i locals:\n", ind, (int)f->locals_count); - for (i = 0; i < f->locals_count; ++i) { + oprintf("%s%i locals:\n", ind, (int)vec_size(f->locals)); + for (i = 0; i < vec_size(f->locals); ++i) { oprintf("%s\t", ind); ir_value_dump(f->locals[i], oprintf); oprintf("\n"); } } oprintf("%sliferanges:\n", ind); - for (i = 0; i < f->locals_count; ++i) { + for (i = 0; i < vec_size(f->locals); ++i) { size_t l; ir_value *v = f->locals[i]; - oprintf("%s\t%s: unique ", ind, v->name); - for (l = 0; l < v->life_count; ++l) { + oprintf("%s\t%s: %s@%i ", ind, v->name, (v->unique_life ? "unique " : ""), (int)v->code.local); + for (l = 0; l < vec_size(v->life); ++l) { oprintf("[%i,%i] ", v->life[l].start, v->life[l].end); } oprintf("\n"); } - for (i = 0; i < f->values_count; ++i) { + for (i = 0; i < vec_size(f->values); ++i) { size_t l; ir_value *v = f->values[i]; oprintf("%s\t%s: @%i ", ind, v->name, (int)v->code.local); - for (l = 0; l < v->life_count; ++l) { + for (l = 0; l < vec_size(v->life); ++l) { oprintf("[%i,%i] ", v->life[l].start, v->life[l].end); } oprintf("\n"); } - if (f->blocks_count) + if (vec_size(f->blocks)) { oprintf("%slife passes (check): %i\n", ind, (int)f->run_id); - for (i = 0; i < f->blocks_count; ++i) { + for (i = 0; i < vec_size(f->blocks); ++i) { if (f->blocks[i]->run_id != f->run_id) { oprintf("%slife pass check fail! %i != %i\n", ind, (int)f->blocks[i]->run_id, (int)f->run_id); } @@ -2992,17 +3640,16 @@ void ir_block_dump(ir_block* b, char *ind, oprintf("%s:%s\n", ind, b->label); strncat(ind, "\t", IND_BUFSZ); - for (i = 0; i < b->instr_count; ++i) + for (i = 0; i < vec_size(b->instr); ++i) ir_instr_dump(b->instr[i], ind, oprintf); ind[strlen(ind)-1] = 0; } -void dump_phi(ir_instr *in, char *ind, - int (*oprintf)(const char*, ...)) +void dump_phi(ir_instr *in, int (*oprintf)(const char*, ...)) { size_t i; oprintf("%s <- phi ", in->_ops[0]->name); - for (i = 0; i < in->phi_count; ++i) + for (i = 0; i < vec_size(in->phi); ++i) { oprintf("([%s] : %s) ", in->phi[i].from->label, in->phi[i].value->name); @@ -3019,7 +3666,7 @@ void ir_instr_dump(ir_instr *in, char *ind, oprintf("%s (%i) ", ind, (int)in->eid); if (in->opcode == VINSTR_PHI) { - dump_phi(in, ind, oprintf); + dump_phi(in, oprintf); return; } @@ -3030,8 +3677,8 @@ void ir_instr_dump(ir_instr *in, char *ind, if (in->_ops[1] || in->_ops[2]) oprintf(" <- "); } - if (in->opcode == INSTR_CALL0) { - oprintf("CALL%i\t", in->params_count); + if (in->opcode == INSTR_CALL0 || in->opcode == VINSTR_NRCALL) { + oprintf("CALL%i\t", vec_size(in->params)); } else oprintf("%s\t", qc_opname(in->opcode)); @@ -3058,9 +3705,9 @@ void ir_instr_dump(ir_instr *in, char *ind, } if (in->bops[1]) oprintf("%s[%s]", comma, in->bops[1]->label); - if (in->params_count) { + if (vec_size(in->params)) { oprintf("\tparams: "); - for (i = 0; i != in->params_count; ++i) { + for (i = 0; i != vec_size(in->params); ++i) { oprintf("%s, ", in->params[i]->name); } } @@ -3068,9 +3715,29 @@ void ir_instr_dump(ir_instr *in, char *ind, ind[strlen(ind)-1] = 0; } +void ir_value_dump_string(const char *str, int (*oprintf)(const char*, ...)) +{ + oprintf("\""); + for (; *str; ++str) { + switch (*str) { + case '\n': oprintf("\\n"); break; + case '\r': oprintf("\\r"); break; + case '\t': oprintf("\\t"); break; + case '\v': oprintf("\\v"); break; + case '\f': oprintf("\\f"); break; + case '\b': oprintf("\\b"); break; + case '\a': oprintf("\\a"); break; + case '\\': oprintf("\\\\"); break; + case '"': oprintf("\\\""); break; + default: oprintf("%c", *str); break; + } + } + oprintf("\""); +} + void ir_value_dump(ir_value* v, int (*oprintf)(const char*, ...)) { - if (v->isconst) { + if (v->hasvalue) { switch (v->vtype) { default: case TYPE_VOID: @@ -3092,7 +3759,7 @@ void ir_value_dump(ir_value* v, int (*oprintf)(const char*, ...)) oprintf("(entity)"); break; case TYPE_STRING: - oprintf("\"%s\"", v->constval.vstring); + ir_value_dump_string(v->constval.vstring, oprintf); break; #if 0 case TYPE_INTEGER: @@ -3113,7 +3780,7 @@ void ir_value_dump_life(const ir_value *self, int (*oprintf)(const char*,...)) { size_t i; oprintf("Life of %12s:", self->name); - for (i = 0; i < self->life_count; ++i) + for (i = 0; i < vec_size(self->life); ++i) { oprintf(" + [%i, %i]\n", self->life[i].start, self->life[i].end); }