X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ir.c;h=2ac7ff1bdc7500a5090785b45206dc8edf13af71;hb=5bc815c63f4b0ba0fd500f359a7b2e379c6b7fbb;hp=b1835c875b586e3eae3bcc49cb0b80d1519e19b5;hpb=5e23e8296d1d82df528481e04262a9e3afb38908;p=xonotic%2Fgmqcc.git diff --git a/ir.c b/ir.c index b1835c8..2ac7ff1 100644 --- a/ir.c +++ b/ir.c @@ -45,7 +45,7 @@ const char *type_name[TYPE_COUNT] = { "array" }; -size_t type_sizeof[TYPE_COUNT] = { +size_t type_sizeof_[TYPE_COUNT] = { 1, /* TYPE_VOID */ 1, /* TYPE_STRING */ 1, /* TYPE_FLOAT */ @@ -193,6 +193,11 @@ uint16_t type_not_instr[TYPE_COUNT] = { 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; @@ -203,20 +208,12 @@ static void irerror(lex_ctx ctx, const char *msg, ...) static bool irwarning(lex_ctx ctx, int warntype, const char *fmt, ...) { - va_list ap; - int lvl = LVL_WARNING; - - if (warntype && !OPTS_WARN(warntype)) - return false; - - if (opts_werror) - lvl = LVL_ERROR; - - va_start(ap, fmt); - con_vprintmsg(lvl, ctx.file, ctx.line, "warning", fmt, ap); - va_end(ap); - - return opts_werror; + bool r; + va_list ap; + va_start(ap, fmt); + r = vcompile_warning(ctx, warntype, fmt, ap); + va_end(ap); + return r; } /*********************************************************************** @@ -524,7 +521,125 @@ ir_block* ir_function_create_block(lex_ctx ctx, ir_function *self, const char *l return bn; } -bool ir_function_pass_tailcall(ir_function *self) +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) || + (op >= INSTR_CALL0 && op <= INSTR_CALL8) ); +} + +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_tailrecursion(ir_function *self) { size_t b, p; @@ -564,7 +679,7 @@ bool ir_function_pass_tailcall(ir_function *self) ret->_ops[0] == store->_ops[0] && store->_ops[1] == call->_ops[0]) { - ++optimization_count[OPTIM_MINOR]; + ++opts_optimizationcount[OPTIM_PEEPHOLE]; call->_ops[0] = store->_ops[0]; vec_remove(block->instr, vec_size(block->instr) - 2, 1); ir_instr_delete(store); @@ -586,7 +701,7 @@ bool ir_function_pass_tailcall(ir_function *self) if (ret->_ops[0] && call->_ops[0] != ret->_ops[0]) continue; - ++optimization_count[OPTIM_TAIL_RECURSION]; + ++opts_optimizationcount[OPTIM_TAIL_RECURSION]; vec_shrinkby(block->instr, 2); block->final = false; /* open it back up */ @@ -594,12 +709,12 @@ bool ir_function_pass_tailcall(ir_function *self) /* 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, self->locals[p], call->params[p])) { + 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, self->blocks[0])) { + if (!ir_block_create_jump(block, call->context, self->blocks[0])) { irerror(call->context, "failed to create tailcall jump"); return false; } @@ -616,9 +731,16 @@ 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); + if (!ir_function_pass_tailrecursion(self)) { + irerror(self->context, "tail-recursion optimization pass broke something in `%s`", self->name); return false; } } @@ -727,7 +849,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)); @@ -735,8 +857,7 @@ 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; @@ -860,12 +981,16 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype) self->members[2] = NULL; self->memberof = NULL; + 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; @@ -873,9 +998,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; @@ -887,7 +1019,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; @@ -906,6 +1039,13 @@ ir_value* ir_value_vector_member(ir_value *self, unsigned int member) return m; } +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); @@ -983,7 +1123,7 @@ static char *ir_strdup(const char *str) { if (str && !*str) { /* actually dup empty strings */ - char *out = mem_a(1); + char *out = (char*)mem_a(1); *out = 0; return out; } @@ -1228,15 +1368,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) +{ + /* 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 (self->final) { - irerror(self->context, "unreachable statement (%s)", self->label); - return false; - } - in = ir_instr_new(self, op); - if (!in) + if (!ir_check_unreachable(self)) return false; if (target->store == store_value && @@ -1248,16 +1392,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_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; @@ -1279,10 +1428,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; @@ -1301,40 +1450,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, "unreachable statement (%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; + } 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, "unreachable statement (%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; @@ -1355,15 +1502,13 @@ bool ir_block_create_if(ir_block *self, ir_value *v, 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, "unreachable statement (%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; @@ -1375,15 +1520,13 @@ bool ir_block_create_jump(ir_block *self, ir_block *to) 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, "unreachable statement (%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; @@ -1395,11 +1538,13 @@ bool ir_block_create_goto(ir_block *self, ir_block *to) 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 NULL; + in = ir_instr_new(ctx, self, VINSTR_PHI); if (!in) return NULL; out = ir_value_out(self->owner, label, store_value, ot); @@ -1440,13 +1585,19 @@ void ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) } /* 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 NULL; + 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); @@ -1460,6 +1611,15 @@ ir_instr* ir_block_create_call(ir_block *self, const char *label, ir_value *func 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; } @@ -1476,7 +1636,7 @@ void ir_call_param(ir_instr* self, ir_value *v) /* 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) { @@ -1565,10 +1725,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) { @@ -1598,10 +1758,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; @@ -1611,7 +1771,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; @@ -1633,7 +1793,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; @@ -1644,12 +1804,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) @@ -1676,10 +1836,10 @@ ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_va 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) { @@ -1716,10 +1876,10 @@ ir_value* ir_block_create_add(ir_block *self, 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) { @@ -1757,10 +1917,10 @@ ir_value* ir_block_create_sub(ir_block *self, 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) { @@ -1805,10 +1965,10 @@ ir_value* ir_block_create_mul(ir_block *self, 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) { @@ -1845,7 +2005,7 @@ ir_value* ir_block_create_div(ir_block *self, 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 @@ -1921,7 +2081,7 @@ static bool ir_block_naive_phi(ir_block *self) vec_pop(b->instr); b->final = false; instr->_ops[0]->store = store_global; - if (!ir_block_create_store(b, instr->_ops[0], v)) + 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); @@ -2047,8 +2207,24 @@ bool ir_function_calculate_liferanges(ir_function *self) ir_block *block = self->blocks[0]; 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)) { @@ -2068,12 +2244,13 @@ typedef struct { ir_value **locals; size_t *sizes; size_t *positions; + bool *unique; } function_allocator; 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) @@ -2084,6 +2261,7 @@ static bool function_allocator_alloc(function_allocator *alloc, const ir_value * vec_push(alloc->locals, slot); vec_push(alloc->sizes, vsize); + vec_push(alloc->unique, var->unique_life); return true; @@ -2109,9 +2287,14 @@ bool ir_function_allocate_locals(ir_function *self) alloc.locals = NULL; alloc.sizes = NULL; alloc.positions = NULL; + alloc.unique = NULL; 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; } @@ -2126,8 +2309,21 @@ bool ir_function_allocate_locals(ir_function *self) 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; @@ -2135,8 +2331,8 @@ 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; @@ -2167,7 +2363,11 @@ bool ir_function_allocate_locals(ir_function *self) self->allocated_locals = pos + vec_last(alloc.sizes); - /* Take over the actual slot positions */ + /* 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]; } @@ -2179,6 +2379,7 @@ error: cleanup: for (i = 0; i < vec_size(alloc.locals); ++i) ir_value_delete(alloc.locals[i]); + vec_free(alloc.unique); vec_free(alloc.locals); vec_free(alloc.sizes); vec_free(alloc.positions); @@ -2252,7 +2453,6 @@ static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *ch * 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 < vec_size(self->living); ++i) { if (!vec_ir_value_find(prev->living, self->living[i], NULL)) { @@ -2260,6 +2460,7 @@ static bool ir_block_life_prop_previous(ir_block* self, ir_block *prev, bool *ch --i; } } + */ /* Whatever the previous block still has in its living set * must now be added to ours as well. @@ -2302,8 +2503,6 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change for (p = 0; p < vec_size(instr->phi); ++p) { value = instr->phi[p].value; - if (value->memberof) - value = value->memberof; if (!vec_ir_value_find(self->living, value, NULL)) vec_push(self->living, value); } @@ -2312,8 +2511,6 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change for (p = 0; p < vec_size(instr->params); ++p) { value = instr->params[p]; - if (value->memberof) - value = value->memberof; if (!vec_ir_value_find(self->living, value, NULL)) vec_push(self->living, value); } @@ -2341,8 +2538,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 @@ -2449,25 +2644,12 @@ 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, vec_size(code_globals)); - vec_push(code_globals, code_globals[fld->code.globaladdr]); + vec_push(code_globals, fld->code.fieldaddr); if (global->fieldtype == TYPE_VECTOR) { - vec_push(code_globals, code_globals[fld->code.globaladdr]+1); - vec_push(code_globals, code_globals[fld->code.globaladdr]+2); + vec_push(code_globals, fld->code.fieldaddr+1); + vec_push(code_globals, fld->code.fieldaddr+2); } } else @@ -2560,7 +2742,8 @@ tailcall: stmt.o1.s1 = (target->code_start) - vec_size(code_statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; - vec_push(code_statements, stmt); + if (stmt.o1.s1 != 1) + code_push_statement(&stmt, instr->context.line); /* no further instructions can be in this block */ return true; @@ -2580,12 +2763,14 @@ tailcall: if (ontrue->generated) { stmt.opcode = INSTR_IF; stmt.o2.s1 = (ontrue->code_start) - vec_size(code_statements); - vec_push(code_statements, stmt); + 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) - vec_size(code_statements); - vec_push(code_statements, stmt); + if (stmt.o2.s1 != 1) + code_push_statement(&stmt, instr->context.line); } if (!ontrue->generated) { if (onfalse->generated) { @@ -2609,7 +2794,7 @@ tailcall: ontrue = tmp; } stidx = vec_size(code_statements); - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); /* on false we jump, so add ontrue-path */ if (!gen_blocks_recursive(func, ontrue)) return false; @@ -2619,6 +2804,12 @@ tailcall: if (onfalse->generated) { /* fixup the jump address */ 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 || @@ -2634,15 +2825,24 @@ tailcall: stmt.o1.s1 = (onfalse->code_start) - vec_size(code_statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; - vec_push(code_statements, stmt); + 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, @@ -2675,7 +2875,7 @@ tailcall: stmt.opcode = type_store_instr[param->vtype]; stmt.o1.u1 = ir_value_code_addr(param); stmt.o2.u1 = OFS_PARM0 + 3 * p; - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); } /* Now handle extparams */ first = vec_size(instr->params); @@ -2685,10 +2885,8 @@ tailcall: ir_value *param = instr->params[p]; ir_value *targetparam; - if (p-8 >= vec_size(ir->extparams)) { - irerror(instr->context, "Not enough extparam-globals have been created"); - return false; - } + if (p-8 >= vec_size(ir->extparams)) + ir_gen_extparam(ir); targetparam = ir->extparams[p-8]; @@ -2701,7 +2899,7 @@ tailcall: stmt.opcode = type_store_instr[param->vtype]; stmt.o1.u1 = ir_value_code_addr(param); stmt.o2.u1 = ir_value_code_addr(targetparam); - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); } stmt.opcode = INSTR_CALL0 + vec_size(instr->params); @@ -2710,20 +2908,20 @@ tailcall: stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]); stmt.o2.u1 = 0; stmt.o3.u1 = 0; - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); retvalue = instr->_ops[0]; - if (retvalue && retvalue->store != store_return && vec_size(retvalue->life)) + if (retvalue && retvalue->store != store_return && (vec_size(retvalue->life) || retvalue->store == store_global)) { /* not to be kept in OFS_RETURN */ - if (retvalue->vtype == TYPE_FIELD) - stmt.opcode = field_store_instr[retvalue->vtype]; + if (retvalue->vtype == TYPE_FIELD && OPTS_FLAG(ADJUST_VECTOR_FIELDS)) + stmt.opcode = field_store_instr[retvalue->fieldtype]; 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; - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); } continue; } @@ -2761,9 +2959,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; + } } - vec_push(code_statements, stmt); + code_push_statement(&stmt, instr->context.line); } return true; } @@ -2790,12 +2998,12 @@ 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; - vec_push(code_statements, stmt); + code_push_statement(&stmt, vec_last(code_linenums)); return true; } @@ -2824,7 +3032,6 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) ir_function *irfun; size_t i; - size_t local_var_end; if (!global->hasvalue || (!global->constval.vfunc)) { @@ -2842,41 +3049,33 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) 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 = vec_size(code_globals); - local_var_end = fun.firstlocal; + 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; } - } - if (vec_size(irfun->locals)) { - ir_value *last = vec_last(irfun->locals); - local_var_end = last->code.globaladdr; - local_var_end += type_sizeof[last->vtype]; + ir_value_code_setaddr(irfun->locals[i], fun.firstlocal + irfun->locals[i]->code.local); } 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); + ir_value_code_setaddr(v, fun.firstlocal + v->code.local); } - for (i = 0; i < irfun->allocated_locals; ++i) { - /* fill the locals with zeros */ + for (i = vec_size(code_globals); i < fun.firstlocal + irfun->allocated_locals; ++i) vec_push(code_globals, 0); - } - - fun.locals = vec_size(code_globals) - fun.firstlocal; if (irfun->builtin) - fun.entry = irfun->builtin; + fun.entry = irfun->builtin+1; else { irfun->code_function_def = vec_size(code_functions); fun.entry = vec_size(code_statements); @@ -2937,7 +3136,7 @@ static bool gen_function_extparam_copy(ir_function *self) } stmt.o1.u1 = ir_value_code_addr(ep); stmt.o2.u1 = ir_value_code_addr(self->locals[i]); - vec_push(code_statements, stmt); + code_push_statement(&stmt, self->context.line); } return true; @@ -2952,8 +3151,10 @@ static bool gen_global_function_code(ir_builder *ir, ir_value *global) 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; } @@ -2979,6 +3180,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; @@ -3030,6 +3287,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc return gen_global_pointer(global); case TYPE_FIELD: vec_push(code_defs, def); + gen_vector_defs(def, global->name); return gen_global_field(global); case TYPE_ENTITY: /* fall through */ @@ -3041,9 +3299,9 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc vec_push(code_globals, *iptr); } else { vec_push(code_globals, 0); - if (!islocal) - def.type |= DEF_SAVEGLOBAL; } + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; vec_push(code_defs, def); return global->code.globaladdr >= 0; @@ -3055,9 +3313,9 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc vec_push(code_globals, code_genstring(global->constval.vstring)); } else { vec_push(code_globals, 0); - if (!islocal) - def.type |= DEF_SAVEGLOBAL; } + if (!islocal && global->cvq != CV_CONST) + def.type |= DEF_SAVEGLOBAL; vec_push(code_defs, def); return global->code.globaladdr >= 0; } @@ -3070,23 +3328,23 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc vec_push(code_globals, iptr[0]); if (global->code.globaladdr < 0) return false; - for (d = 1; d < type_sizeof[global->vtype]; ++d) - { + for (d = 1; d < type_sizeof_[global->vtype]; ++d) { vec_push(code_globals, iptr[d]); } } else { vec_push(code_globals, 0); if (global->code.globaladdr < 0) return false; - for (d = 1; d < type_sizeof[global->vtype]; ++d) - { + 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; vec_push(code_defs, def); + def.type &= ~DEF_SAVEGLOBAL; + gen_vector_defs(def, global->name); return global->code.globaladdr >= 0; } case TYPE_FUNCTION: @@ -3099,16 +3357,16 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc vec_push(code_globals, vec_size(code_functions)); if (!gen_global_function(self, global)) return false; - if (!islocal) - def.type |= DEF_SAVEGLOBAL; } + 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, vec_size(code_globals)); vec_push(code_globals, 0); - for (i = 1; i < type_sizeof[TYPE_VARIANT]; ++i) + for (i = 1; i < type_sizeof_[TYPE_VARIANT]; ++i) vec_push(code_globals, 0); return true; default: @@ -3119,6 +3377,11 @@ 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; @@ -3130,7 +3393,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) 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]; @@ -3170,7 +3433,7 @@ 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; vec_push(code_fields, fld); @@ -3181,6 +3444,11 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) 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; } @@ -3188,9 +3456,15 @@ 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 < 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)) { @@ -3220,19 +3494,47 @@ bool ir_builder_generate(ir_builder *self, const char *filename) return false; } - /* 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; - vec_push(code_statements, stmt); + /* 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 (!opts_pp_only) - con_out("writing '%s'...\n", filename); - return code_write(filename); + 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); + } + + 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; } /*********************************************************************** @@ -3241,8 +3543,8 @@ 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) +#ifdef _MSC_VER +# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE) #endif const char *qc_opname(int op) @@ -3302,7 +3604,7 @@ void ir_function_dump(ir_function *f, char *ind, 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); + 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); } @@ -3376,7 +3678,7 @@ void ir_instr_dump(ir_instr *in, char *ind, if (in->_ops[1] || in->_ops[2]) oprintf(" <- "); } - if (in->opcode == INSTR_CALL0) { + 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));