X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ir.c;h=82dcb9befaf578f2c6d671a41ef88ac7fe6c3644;hp=8aef17ff6258743b328c0f1f92e615cbcf4489ca;hb=69b55ccc03b56af1f6c05eb45866ab198307487f;hpb=ae97ff7a80cd7b048fd6203789a468c2f7bccd01 diff --git a/ir.c b/ir.c index 8aef17f..82dcb9b 100644 --- a/ir.c +++ b/ir.c @@ -48,7 +48,7 @@ const char *type_name[TYPE_COUNT] = { "" }; -size_t type_sizeof_[TYPE_COUNT] = { +static size_t type_sizeof_[TYPE_COUNT] = { 1, /* TYPE_VOID */ 1, /* TYPE_STRING */ 1, /* TYPE_FLOAT */ @@ -66,7 +66,7 @@ size_t type_sizeof_[TYPE_COUNT] = { 0, /* TYPE_NOESPR */ }; -uint16_t type_store_instr[TYPE_COUNT] = { +const uint16_t type_store_instr[TYPE_COUNT] = { INSTR_STORE_F, /* should use I when having integer support */ INSTR_STORE_S, INSTR_STORE_F, @@ -83,14 +83,14 @@ uint16_t type_store_instr[TYPE_COUNT] = { INSTR_STORE_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; -uint16_t field_store_instr[TYPE_COUNT] = { +const uint16_t field_store_instr[TYPE_COUNT] = { INSTR_STORE_FLD, INSTR_STORE_FLD, INSTR_STORE_FLD, @@ -107,14 +107,14 @@ uint16_t field_store_instr[TYPE_COUNT] = { INSTR_STORE_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; -uint16_t type_storep_instr[TYPE_COUNT] = { +const uint16_t type_storep_instr[TYPE_COUNT] = { INSTR_STOREP_F, /* should use I when having integer support */ INSTR_STOREP_S, INSTR_STOREP_F, @@ -131,14 +131,14 @@ uint16_t type_storep_instr[TYPE_COUNT] = { INSTR_STOREP_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; -uint16_t type_eq_instr[TYPE_COUNT] = { +const uint16_t type_eq_instr[TYPE_COUNT] = { INSTR_EQ_F, /* should use I when having integer support */ INSTR_EQ_S, INSTR_EQ_F, @@ -155,14 +155,14 @@ uint16_t type_eq_instr[TYPE_COUNT] = { INSTR_EQ_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; -uint16_t type_ne_instr[TYPE_COUNT] = { +const uint16_t type_ne_instr[TYPE_COUNT] = { INSTR_NE_F, /* should use I when having integer support */ INSTR_NE_S, INSTR_NE_F, @@ -179,16 +179,16 @@ uint16_t type_ne_instr[TYPE_COUNT] = { INSTR_NE_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; -uint16_t type_not_instr[TYPE_COUNT] = { +const uint16_t type_not_instr[TYPE_COUNT] = { INSTR_NOT_F, /* should use I when having integer support */ - INSTR_NOT_S, + VINSTR_END, /* not to be used, depends on string related -f flags */ INSTR_NOT_F, INSTR_NOT_V, INSTR_NOT_ENT, @@ -203,16 +203,16 @@ uint16_t type_not_instr[TYPE_COUNT] = { INSTR_NOT_V, /* variant, should never be accessed */ - AINSTR_END, /* struct */ - AINSTR_END, /* union */ - AINSTR_END, /* array */ - AINSTR_END, /* nil */ - AINSTR_END, /* noexpr */ + VINSTR_END, /* struct */ + VINSTR_END, /* union */ + VINSTR_END, /* array */ + VINSTR_END, /* nil */ + VINSTR_END, /* noexpr */ }; /* protos */ static ir_value* ir_gen_extparam_proto(ir_builder *ir); -static void ir_gen_extparam (ir_builder *ir); +static void ir_gen_extparam (code_t *, ir_builder *ir); /* error functions */ @@ -320,6 +320,8 @@ ir_builder* ir_builder_new(const char *modulename) self->nil = ir_value_var("nil", store_value, TYPE_NIL); self->nil->cvq = CV_CONST; + self->reserved_va_count = NULL; + return self; } @@ -418,6 +420,13 @@ ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype return ve; } +ir_value* ir_builder_get_va_count(ir_builder *self) +{ + if (self->reserved_va_count) + return self->reserved_va_count; + return (self->reserved_va_count = ir_builder_create_global(self, "reserved:va_count", TYPE_FLOAT)); +} + ir_value* ir_builder_get_field(ir_builder *self, const char *name) { return (ir_value*)util_htget(self->htfields, name); @@ -476,6 +485,8 @@ ir_function* ir_function_new(ir_builder* owner, int outtype) self->values = NULL; self->locals = NULL; + self->max_varargs = 0; + self->code_function_def = -1; self->allocated_locals = 0; self->globaltemps = 0; @@ -589,6 +600,13 @@ bool ir_function_pass_peephole(ir_function *self) if (!instr_is_operation(oper->opcode)) continue; + if (OPTS_FLAG(LEGACY_VECTOR_MATHS)) { + if (oper->opcode == INSTR_MUL_VF && oper->_ops[2]->memberof == oper->_ops[1]) + continue; + if (oper->opcode == INSTR_MUL_FV && oper->_ops[1]->memberof == oper->_ops[2]) + continue; + } + value = oper->_ops[0]; /* only do it for SSA values */ @@ -862,7 +880,6 @@ ir_block* ir_block_new(ir_function* owner, const char *name) self->eid = 0; self->is_return = false; - self->run_id = 0; self->living = NULL; @@ -1018,6 +1035,7 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype) self->fieldtype = TYPE_VOID; self->outtype = TYPE_VOID; self->store = storetype; + self->flags = 0; self->reads = NULL; self->writes = NULL; @@ -1188,22 +1206,11 @@ bool ir_value_set_field(ir_value *self, ir_value *fld) return true; } -static char *ir_strdup(const char *str) -{ - if (str && !*str) { - /* actually dup empty strings */ - char *out = (char*)mem_a(1); - *out = 0; - return out; - } - return util_strdup(str); -} - 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->constval.vstring = util_strdupe(str); self->hasvalue = true; return true; } @@ -1246,12 +1253,13 @@ bool ir_value_life_insert(ir_value *self, size_t idx, ir_life_entry_t e) bool ir_value_life_merge(ir_value *self, size_t s) { size_t i; + const size_t vs = vec_size(self->life); ir_life_entry_t *life = NULL; ir_life_entry_t *before = NULL; ir_life_entry_t new_entry; /* Find the first range >= s */ - for (i = 0; i < vec_size(self->life); ++i) + for (i = 0; i < vs; ++i) { before = life; life = &self->life[i]; @@ -1259,7 +1267,7 @@ bool ir_value_life_merge(ir_value *self, size_t s) break; } /* nothing found? append */ - if (i == vec_size(self->life)) { + if (i == vs) { ir_life_entry_t e; if (life && life->end+1 == s) { @@ -1632,7 +1640,7 @@ void ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) * is doing something wrong. */ irerror(self->context, "Invalid entry block for PHI"); - abort(); + exit(EXIT_FAILURE); } pe.value = v; @@ -1991,93 +1999,20 @@ static void ir_block_enumerate(ir_block *self, size_t *_eid) void ir_function_enumerate(ir_function *self) { size_t i; - size_t instruction_id = 1; + size_t instruction_id = 0; for (i = 0; i < vec_size(self->blocks); ++i) { + /* each block now gets an additional "entry" instruction id + * we can use to avoid point-life issues + */ + self->blocks[i]->entry_id = instruction_id; + ++instruction_id; + self->blocks[i]->eid = i; - self->blocks[i]->run_id = 0; ir_block_enumerate(self->blocks[i], &instruction_id); } } -static bool ir_block_life_propagate(ir_block *b, ir_block *prev, bool *changed); -bool ir_function_calculate_liferanges(ir_function *self) -{ - size_t i, s; - bool changed; - - /* parameters live at 0 */ - for (i = 0; i < vec_size(self->params); ++i) - ir_value_life_merge(self->locals[i], 0); - - do { - self->run_id++; - changed = false; - for (i = 0; i != vec_size(self->blocks); ++i) - { - if (self->blocks[i]->is_return) - { - vec_free(self->blocks[i]->living); - if (!ir_block_life_propagate(self->blocks[i], NULL, &changed)) - return false; - } - } - } while (changed); - if (vec_size(self->blocks)) { - ir_block *block = self->blocks[0]; - for (i = 0; i < vec_size(block->living); ++i) { - ir_value *v = block->living[i]; - if (v->store != store_local) - continue; - if (v->vtype == TYPE_VECTOR) - continue; - self->flags |= IR_FLAG_HAS_UNINITIALIZED; - /* find the instruction reading from it */ - for (s = 0; s < vec_size(v->reads); ++s) { - if (v->reads[s]->eid == v->life[0].end) - break; - } - if (s < vec_size(v->reads)) { - if (irwarning(v->context, WARN_USED_UNINITIALIZED, - "variable `%s` may be used uninitialized in this function\n" - " -> %s:%i", - v->name, - v->reads[s]->context.file, v->reads[s]->context.line) - ) - { - return false; - } - continue; - } - if (v->memberof) { - ir_value *vec = v->memberof; - for (s = 0; s < vec_size(vec->reads); ++s) { - if (vec->reads[s]->eid == v->life[0].end) - break; - } - if (s < vec_size(vec->reads)) { - if (irwarning(v->context, WARN_USED_UNINITIALIZED, - "variable `%s` may be used uninitialized in this function\n" - " -> %s:%i", - v->name, - vec->reads[s]->context.file, vec->reads[s]->context.line) - ) - { - return false; - } - continue; - } - } - if (irwarning(v->context, WARN_USED_UNINITIALIZED, - "variable `%s` may be used uninitialized in this function", v->name)) - { - return false; - } - } - } - return true; -} - /* Local-value allocator * After finishing creating the liferange of all values used in a function * we can allocate their global-positions. @@ -2160,16 +2095,6 @@ static bool ir_function_allocator_assign(ir_function *self, function_allocator * return true; } -static bool ir_value_has_point_life(const ir_value *v) -{ - size_t i, vs = vec_size(v->life); - for (i = 0; i < vs; ++i) { - if (v->life[i].start == v->life[i].end) - return true; - } - return false; -} - bool ir_function_allocate_locals(ir_function *self) { size_t i; @@ -2196,9 +2121,7 @@ bool ir_function_allocate_locals(ir_function *self) for (i = 0; i < vec_size(self->locals); ++i) { v = self->locals[i]; - if (ir_value_has_point_life(v)) - v->unique_life = true; - if (!OPTS_OPTIMIZATION(OPTIM_LOCAL_TEMPS)) { + if ((self->flags & IR_FLAG_MASK_NO_LOCAL_TEMPS) || !OPTS_OPTIMIZATION(OPTIM_LOCAL_TEMPS)) { v->locked = true; v->unique_life = true; } @@ -2214,8 +2137,6 @@ bool ir_function_allocate_locals(ir_function *self) v = self->locals[i]; if (!vec_size(v->life)) continue; - if (ir_value_has_point_life(v)) - v->unique_life = true; if (!ir_function_allocator_assign(self, (v->locked || !opt_gt ? &lockalloc : &globalloc), v)) goto error; } @@ -2227,15 +2148,6 @@ bool ir_function_allocate_locals(ir_function *self) if (!vec_size(v->life)) continue; - if (ir_value_has_point_life(v)) { - /* happens on free ternarys like: - if (x) { - cond ? a : b; - } - irerror(v->context, "internal error: point life SSA value leaked: %s", v->name); - */ - v->unique_life = true; - } /* CALL optimization: * If the value is a parameter-temp: 1 write, 1 read from a CALL @@ -2254,18 +2166,22 @@ bool ir_function_allocate_locals(ir_function *self) irerror(call->context, "internal error: unlocked parameter %s not found", v->name); goto error; } - ++opts_optimizationcount[OPTIM_CALL_STORES]; v->callparam = true; if (param < 8) ir_value_code_setaddr(v, OFS_PARM0 + 3*param); else { + size_t nprotos = vec_size(self->owner->extparam_protos); ir_value *ep; param -= 8; - if (vec_size(self->owner->extparam_protos) <= param) - ep = ir_gen_extparam_proto(self->owner); - else + if (nprotos > param) ep = self->owner->extparam_protos[param]; + else + { + ep = ir_gen_extparam_proto(self->owner); + while (++nprotos <= param) + ep = ir_gen_extparam_proto(self->owner); + } ir_instr_op(v->writes[0], 0, ep, true); call->params[param+8] = ep; } @@ -2315,8 +2231,6 @@ bool ir_function_allocate_locals(ir_function *self) /* Locals need to know their new position */ for (i = 0; i < vec_size(self->locals); ++i) { v = self->locals[i]; - if (i >= vec_size(self->params) && !vec_size(v->life)) - continue; if (v->locked || !opt_gt) v->code.local = lockalloc.positions[v->code.local]; else @@ -2325,8 +2239,6 @@ bool ir_function_allocate_locals(ir_function *self) /* Take over the actual slot positions on values */ for (i = 0; i < vec_size(self->values); ++i) { v = self->values[i]; - if (!vec_size(v->life)) - continue; if (v->locked || !opt_gt) v->code.local = lockalloc.positions[v->code.local]; else @@ -2394,13 +2306,13 @@ static void ir_op_read_write(int op, size_t *read, size_t *write) 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 != vec_size(self->living); ++i) + size_t i; + const size_t vs = vec_size(self->living); + bool changed = false; + for (i = 0; i != vs; ++i) { - tempbool = ir_value_life_merge(self->living[i], eid); - changed = changed || tempbool; + if (ir_value_life_merge(self->living[i], eid)) + changed = true; } return changed; } @@ -2419,47 +2331,11 @@ static bool ir_block_living_lock(ir_block *self) return changed; } -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 < vec_size(self->living); ++i) - { - 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 < vec_size(prev->living); ++i) - { - if (vec_ir_value_find(self->living, prev->living[i], NULL)) - continue; - vec_push(self->living, prev->living[i]); - /* - irerror(self->contextt from prev: %s", self->label, prev->living[i]->_name); - */ - } - return true; -} - -static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *changed) +static bool ir_block_life_propagate(ir_block *self, bool *changed) { ir_instr *instr; ir_value *value; - bool tempbool; - size_t i, o, p, mem; + size_t i, o, p, mem, cnt; /* bitmasks which operands are read from or written to */ size_t read, write; char dbg_ind[16]; @@ -2467,10 +2343,16 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change dbg_ind[1] = '0'; (void)dbg_ind; - if (prev) - { - if (!ir_block_life_prop_previous(self, prev, changed)) - return false; + vec_free(self->living); + + p = vec_size(self->exits); + for (i = 0; i < p; ++i) { + ir_block *prev = self->exits[i]; + cnt = vec_size(prev->living); + for (o = 0; o < cnt; ++o) { + if (!vec_ir_value_find(self->living, prev->living[o], NULL)) + vec_push(self->living, prev->living[o]); + } } i = vec_size(self->instr); @@ -2481,19 +2363,6 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change /* See which operands are read and write operands */ ir_op_read_write(instr->opcode, &read, &write); - if (instr->opcode == INSTR_MUL_VF) - { - /* the float source will get an additional lifetime */ - tempbool = ir_value_life_merge(instr->_ops[2], instr->eid+1); - *changed = *changed || tempbool; - } - else if (instr->opcode == INSTR_MUL_FV) - { - /* the float source will get an additional lifetime */ - tempbool = ir_value_life_merge(instr->_ops[1], instr->eid+1); - *changed = *changed || tempbool; - } - /* Go through the 3 main operands * writes first, then reads */ @@ -2531,23 +2400,23 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change * since this function is run multiple times. */ /* con_err( "Value only written %s\n", value->name); */ - tempbool = ir_value_life_merge(value, instr->eid); - *changed = *changed || tempbool; + if (ir_value_life_merge(value, instr->eid)) + *changed = true; } else { /* since 'living' won't contain it * anymore, merge the value, since * (A) doesn't. */ - tempbool = ir_value_life_merge(value, instr->eid); - *changed = *changed || tempbool; + if (ir_value_life_merge(value, instr->eid)) + *changed = true; /* Then remove */ vec_remove(self->living, idx, 1); } /* Removing a vector removes all members */ for (mem = 0; mem < 3; ++mem) { if (value->members[mem] && vec_ir_value_find(self->living, value->members[mem], &idx)) { - tempbool = ir_value_life_merge(value->members[mem], instr->eid); - *changed = *changed || tempbool; + if (ir_value_life_merge(value->members[mem], instr->eid)) + *changed = true; vec_remove(self->living, idx, 1); } } @@ -2559,14 +2428,33 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change break; } if (mem == 3 && vec_ir_value_find(self->living, value, &idx)) { - tempbool = ir_value_life_merge(value, instr->eid); - *changed = *changed || tempbool; + if (ir_value_life_merge(value, instr->eid)) + *changed = true; vec_remove(self->living, idx, 1); } } } } + if (instr->opcode == INSTR_MUL_VF) + { + value = instr->_ops[2]; + /* the float source will get an additional lifetime */ + if (ir_value_life_merge(value, instr->eid+1)) + *changed = true; + if (value->memberof && ir_value_life_merge(value->memberof, instr->eid+1)) + *changed = true; + } + else if (instr->opcode == INSTR_MUL_FV || instr->opcode == INSTR_LOAD_V) + { + value = instr->_ops[1]; + /* the float source will get an additional lifetime */ + if (ir_value_life_merge(value, instr->eid+1)) + *changed = true; + if (value->memberof && ir_value_life_merge(value->memberof, instr->eid+1)) + *changed = true; + } + for (o = 0; o < 3; ++o) { if (!instr->_ops[o]) /* no such operand */ @@ -2632,23 +2520,86 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change } /* (A) */ - tempbool = ir_block_living_add_instr(self, instr->eid); - /*con_err( "living added values\n");*/ - *changed = *changed || tempbool; - + if (ir_block_living_add_instr(self, instr->eid)) + *changed = true; } + /* the "entry" instruction ID */ + if (ir_block_living_add_instr(self, self->entry_id)) + *changed = true; - if (self->run_id == self->owner->run_id) - return true; + return true; +} - self->run_id = self->owner->run_id; +bool ir_function_calculate_liferanges(ir_function *self) +{ + size_t i, s; + bool changed; - for (i = 0; i < vec_size(self->entries); ++i) - { - ir_block *entry = self->entries[i]; - ir_block_life_propagate(entry, self, changed); - } + /* parameters live at 0 */ + for (i = 0; i < vec_size(self->params); ++i) + ir_value_life_merge(self->locals[i], 0); + + do { + self->run_id++; + changed = false; + i = vec_size(self->blocks); + while (i--) { + ir_block_life_propagate(self->blocks[i], &changed); + } + } while (changed); + if (vec_size(self->blocks)) { + ir_block *block = self->blocks[0]; + for (i = 0; i < vec_size(block->living); ++i) { + ir_value *v = block->living[i]; + if (v->store != store_local) + continue; + if (v->vtype == TYPE_VECTOR) + continue; + self->flags |= IR_FLAG_HAS_UNINITIALIZED; + /* find the instruction reading from it */ + for (s = 0; s < vec_size(v->reads); ++s) { + if (v->reads[s]->eid == v->life[0].end) + break; + } + if (s < vec_size(v->reads)) { + if (irwarning(v->context, WARN_USED_UNINITIALIZED, + "variable `%s` may be used uninitialized in this function\n" + " -> %s:%i", + v->name, + v->reads[s]->context.file, v->reads[s]->context.line) + ) + { + return false; + } + continue; + } + if (v->memberof) { + ir_value *vec = v->memberof; + for (s = 0; s < vec_size(vec->reads); ++s) { + if (vec->reads[s]->eid == v->life[0].end) + break; + } + if (s < vec_size(vec->reads)) { + if (irwarning(v->context, WARN_USED_UNINITIALIZED, + "variable `%s` may be used uninitialized in this function\n" + " -> %s:%i", + v->name, + vec->reads[s]->context.file, vec->reads[s]->context.line) + ) + { + return false; + } + continue; + } + } + if (irwarning(v->context, WARN_USED_UNINITIALIZED, + "variable `%s` may be used uninitialized in this function", v->name)) + { + return false; + } + } + } return true; } @@ -2667,9 +2618,9 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change * * Breaking conventions is annoying... */ -static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal); +static bool ir_builder_gen_global(code_t *, ir_builder *self, ir_value *global, bool islocal); -static bool gen_global_field(ir_value *global) +static bool gen_global_field(code_t *code, ir_value *global) { if (global->hasvalue) { @@ -2680,20 +2631,20 @@ static bool gen_global_field(ir_value *global) } /* copy the field's value */ - ir_value_code_setaddr(global, vec_size(code_globals)); - vec_push(code_globals, fld->code.fieldaddr); + ir_value_code_setaddr(global, vec_size(code->globals)); + vec_push(code->globals, fld->code.fieldaddr); if (global->fieldtype == TYPE_VECTOR) { - vec_push(code_globals, fld->code.fieldaddr+1); - vec_push(code_globals, fld->code.fieldaddr+2); + vec_push(code->globals, fld->code.fieldaddr+1); + vec_push(code->globals, fld->code.fieldaddr+2); } } else { - ir_value_code_setaddr(global, vec_size(code_globals)); - vec_push(code_globals, 0); + ir_value_code_setaddr(global, vec_size(code->globals)); + vec_push(code->globals, 0); if (global->fieldtype == TYPE_VECTOR) { - vec_push(code_globals, 0); - vec_push(code_globals, 0); + vec_push(code->globals, 0); + vec_push(code->globals, 0); } } if (global->code.globaladdr < 0) @@ -2701,7 +2652,7 @@ static bool gen_global_field(ir_value *global) return true; } -static bool gen_global_pointer(ir_value *global) +static bool gen_global_pointer(code_t *code, ir_value *global) { if (global->hasvalue) { @@ -2727,20 +2678,20 @@ static bool gen_global_pointer(ir_value *global) return false; } - ir_value_code_setaddr(global, vec_size(code_globals)); - vec_push(code_globals, 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, vec_size(code_globals)); - vec_push(code_globals, 0); + ir_value_code_setaddr(global, vec_size(code->globals)); + vec_push(code->globals, 0); } if (global->code.globaladdr < 0) return false; return true; } -static bool gen_blocks_recursive(ir_function *func, ir_block *block) +static bool gen_blocks_recursive(code_t *code, ir_function *func, ir_block *block) { prog_section_statement stmt; ir_instr *instr; @@ -2750,9 +2701,8 @@ static bool gen_blocks_recursive(ir_function *func, ir_block *block) size_t stidx; size_t i; -tailcall: block->generated = true; - block->code_start = vec_size(code_statements); + block->code_start = vec_size(code->statements); for (i = 0; i < vec_size(block->instr); ++i) { instr = block->instr[i]; @@ -2767,18 +2717,16 @@ tailcall: /* for uncoditional jumps, if the target hasn't been generated * yet, we generate them right here. */ - if (!target->generated) { - block = target; - goto tailcall; - } + if (!target->generated) + return gen_blocks_recursive(code, func, target); /* otherwise we generate a jump instruction */ stmt.opcode = INSTR_GOTO; - stmt.o1.s1 = (target->code_start) - vec_size(code_statements); + stmt.o1.s1 = (target->code_start) - vec_size(code->statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; if (stmt.o1.s1 != 1) - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); /* no further instructions can be in this block */ return true; @@ -2797,27 +2745,23 @@ tailcall: if (ontrue->generated) { stmt.opcode = INSTR_IF; - stmt.o2.s1 = (ontrue->code_start) - vec_size(code_statements); + stmt.o2.s1 = (ontrue->code_start) - vec_size(code->statements); if (stmt.o2.s1 != 1) - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } if (onfalse->generated) { stmt.opcode = INSTR_IFNOT; - stmt.o2.s1 = (onfalse->code_start) - vec_size(code_statements); + stmt.o2.s1 = (onfalse->code_start) - vec_size(code->statements); if (stmt.o2.s1 != 1) - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } if (!ontrue->generated) { - if (onfalse->generated) { - block = ontrue; - goto tailcall; - } + if (onfalse->generated) + return gen_blocks_recursive(code, func, ontrue); } if (!onfalse->generated) { - if (ontrue->generated) { - block = onfalse; - goto tailcall; - } + if (ontrue->generated) + return gen_blocks_recursive(code, func, onfalse); } /* neither ontrue nor onfalse exist */ stmt.opcode = INSTR_IFNOT; @@ -2828,24 +2772,24 @@ tailcall: onfalse = ontrue; ontrue = tmp; } - stidx = vec_size(code_statements); - code_push_statement(&stmt, instr->context.line); + stidx = vec_size(code->statements); + code_push_statement(code, &stmt, instr->context.line); /* on false we jump, so add ontrue-path */ - if (!gen_blocks_recursive(func, ontrue)) + if (!gen_blocks_recursive(code, func, ontrue)) return false; /* fixup the jump address */ - code_statements[stidx].o2.s1 = vec_size(code_statements) - stidx; + code->statements[stidx].o2.s1 = vec_size(code->statements) - stidx; /* generate onfalse path */ if (onfalse->generated) { /* fixup the jump address */ - code_statements[stidx].o2.s1 = (onfalse->code_start) - (stidx); - if (stidx+2 == vec_size(code_statements) && 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(); + code->statements[stidx].o2.s1 = (onfalse->code_start) - (stidx); + if (stidx+2 == vec_size(code->statements) && 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(code); } - stmt.opcode = vec_last(code_statements).opcode; + stmt.opcode = vec_last(code->statements).opcode; if (stmt.opcode == INSTR_GOTO || stmt.opcode == INSTR_IF || stmt.opcode == INSTR_IFNOT || @@ -2857,22 +2801,21 @@ tailcall: } /* may have been generated in the previous recursive call */ stmt.opcode = INSTR_GOTO; - stmt.o1.s1 = (onfalse->code_start) - vec_size(code_statements); + stmt.o1.s1 = (onfalse->code_start) - vec_size(code->statements); stmt.o2.s1 = 0; stmt.o3.s1 = 0; if (stmt.o1.s1 != 1) - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); return true; } - else if (stidx+2 == vec_size(code_statements) && 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(); + else if (stidx+2 == vec_size(code->statements) && 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(code); } /* if not, generate now */ - block = onfalse; - goto tailcall; + return gen_blocks_recursive(code, func, onfalse); } if ( (instr->opcode >= INSTR_CALL0 && instr->opcode <= INSTR_CALL8) @@ -2901,7 +2844,7 @@ tailcall: stmt.opcode = type_store_instr[param->vtype]; stmt.o1.u1 = ir_value_code_addr(param); stmt.o2.u1 = OFS_PARM0 + 3 * p; - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } /* Now handle extparams */ first = vec_size(instr->params); @@ -2915,7 +2858,7 @@ tailcall: continue; if (p-8 >= vec_size(ir->extparams)) - ir_gen_extparam(ir); + ir_gen_extparam(code, ir); targetparam = ir->extparams[p-8]; @@ -2930,7 +2873,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); - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } stmt.opcode = INSTR_CALL0 + vec_size(instr->params); @@ -2939,7 +2882,7 @@ tailcall: stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]); stmt.o2.u1 = 0; stmt.o3.u1 = 0; - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); retvalue = instr->_ops[0]; if (retvalue && retvalue->store != store_return && @@ -2953,7 +2896,7 @@ tailcall: stmt.o1.u1 = OFS_RETURN; stmt.o2.u1 = ir_value_code_addr(retvalue); stmt.o3.u1 = 0; - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } continue; } @@ -3003,12 +2946,12 @@ tailcall: } } - code_push_statement(&stmt, instr->context.line); + code_push_statement(code, &stmt, instr->context.line); } return true; } -static bool gen_function_code(ir_function *self) +static bool gen_function_code(code_t *code, ir_function *self) { ir_block *block; prog_section_statement stmt, *retst; @@ -3025,13 +2968,13 @@ static bool gen_function_code(ir_function *self) if (block->generated) return true; - if (!gen_blocks_recursive(self, block)) { + if (!gen_blocks_recursive(code, self, block)) { irerror(self->context, "failed to generate blocks for '%s'", self->name); return false; } /* code_write and qcvm -disasm need to know that the function ends here */ - retst = &vec_last(code_statements); + retst = &vec_last(code->statements); if (OPTS_OPTIMIZATION(OPTIM_VOID_RETURN) && self->outtype == TYPE_VOID && retst->opcode == INSTR_RETURN && @@ -3044,12 +2987,12 @@ static bool gen_function_code(ir_function *self) stmt.o1.u1 = 0; stmt.o2.u1 = 0; stmt.o3.u1 = 0; - code_push_statement(&stmt, vec_last(code_linenums)); + code_push_statement(code, &stmt, vec_last(code->linenums)); } return true; } -static qcint ir_builder_filestring(ir_builder *ir, const char *filename) +static qcint ir_builder_filestring(code_t *code, 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. @@ -3062,13 +3005,13 @@ static qcint ir_builder_filestring(ir_builder *ir, const char *filename) return ir->filestrings[i]; } - str = code_genstring(filename); + str = code_genstring(code, filename); vec_push(ir->filenames, filename); vec_push(ir->filestrings, str); return str; } -static bool gen_global_function(ir_builder *ir, ir_value *global) +static bool gen_global_function(code_t *code, ir_builder *ir, ir_value *global) { prog_section_function fun; ir_function *irfun; @@ -3084,7 +3027,7 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) irfun = global->constval.vfunc; fun.name = global->code.name; - fun.file = ir_builder_filestring(ir, global->context.file); + fun.file = ir_builder_filestring(code, ir, global->context.file); fun.profile = 0; /* always 0 */ fun.nargs = vec_size(irfun->params); if (fun.nargs > 8) @@ -3103,11 +3046,11 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) if (irfun->builtin) fun.entry = irfun->builtin+1; else { - irfun->code_function_def = vec_size(code_functions); - fun.entry = vec_size(code_statements); + irfun->code_function_def = vec_size(code->functions); + fun.entry = vec_size(code->statements); } - vec_push(code_functions, fun); + vec_push(code->functions, fun); return true; } @@ -3116,14 +3059,14 @@ static ir_value* ir_gen_extparam_proto(ir_builder *ir) ir_value *global; char name[128]; - snprintf(name, sizeof(name), "EXTPARM#%i", (int)(vec_size(ir->extparam_protos)+8)); + util_snprintf(name, sizeof(name), "EXTPARM#%i", (int)(vec_size(ir->extparam_protos))); global = ir_value_var(name, store_global, TYPE_VECTOR); vec_push(ir->extparam_protos, global); return global; } -static void ir_gen_extparam(ir_builder *ir) +static void ir_gen_extparam(code_t *code, ir_builder *ir) { prog_section_def def; ir_value *global; @@ -3133,20 +3076,22 @@ static void ir_gen_extparam(ir_builder *ir) else global = ir->extparam_protos[vec_size(ir->extparams)]; - def.name = code_genstring(global->name); - def.type = TYPE_VECTOR; - def.offset = vec_size(code_globals); + def.name = code_genstring(code, global->name); + def.type = TYPE_VECTOR; + def.offset = vec_size(code->globals); + + vec_push(code->defs, def); - 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(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) +static bool gen_function_extparam_copy(code_t *code, ir_function *self) { size_t i, ext, numparams; @@ -3163,7 +3108,7 @@ static bool gen_function_extparam_copy(ir_function *self) for (i = 8; i < numparams; ++i) { ext = i - 8; if (ext >= vec_size(ir->extparams)) - ir_gen_extparam(ir); + ir_gen_extparam(code, ir); ep = ir->extparams[ext]; @@ -3175,13 +3120,49 @@ 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]); - code_push_statement(&stmt, self->context.line); + code_push_statement(code, &stmt, self->context.line); } return true; } -static bool gen_function_locals(ir_builder *ir, ir_value *global) +static bool gen_function_varargs_copy(code_t *code, ir_function *self) +{ + size_t i, ext, numparams, maxparams; + + 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_V; + stmt.o3.s1 = 0; + maxparams = numparams + self->max_varargs; + for (i = numparams; i < maxparams; ++i) { + if (i < 8) { + stmt.o1.u1 = OFS_PARM0 + 3*i; + stmt.o2.u1 = ir_value_code_addr(self->locals[i]); + code_push_statement(code, &stmt, self->context.line); + continue; + } + ext = i - 8; + while (ext >= vec_size(ir->extparams)) + ir_gen_extparam(code, ir); + + ep = ir->extparams[ext]; + + stmt.o1.u1 = ir_value_code_addr(ep); + stmt.o2.u1 = ir_value_code_addr(self->locals[i]); + code_push_statement(code, &stmt, self->context.line); + } + + return true; +} + +static bool gen_function_locals(code_t *code, ir_builder *ir, ir_value *global) { prog_section_function *def; ir_function *irfun; @@ -3189,24 +3170,27 @@ static bool gen_function_locals(ir_builder *ir, ir_value *global) uint32_t firstlocal, firstglobal; irfun = global->constval.vfunc; - def = code_functions + irfun->code_function_def; + def = code->functions + irfun->code_function_def; - if (opts.g || !OPTS_OPTIMIZATION(OPTIM_OVERLAP_LOCALS) || (irfun->flags & IR_FLAG_MASK_NO_OVERLAP)) - firstlocal = def->firstlocal = vec_size(code_globals); - else { + if (OPTS_OPTION_BOOL(OPTION_G) || + !OPTS_OPTIMIZATION(OPTIM_OVERLAP_LOCALS) || + (irfun->flags & IR_FLAG_MASK_NO_OVERLAP)) + { + firstlocal = def->firstlocal = vec_size(code->globals); + } else { firstlocal = def->firstlocal = ir->first_common_local; ++opts_optimizationcount[OPTIM_OVERLAP_LOCALS]; } firstglobal = (OPTS_OPTIMIZATION(OPTIM_GLOBAL_TEMPS) ? ir->first_common_globaltemp : firstlocal); - for (i = vec_size(code_globals); i < firstlocal + irfun->allocated_locals; ++i) - vec_push(code_globals, 0); + for (i = vec_size(code->globals); i < firstlocal + irfun->allocated_locals; ++i) + vec_push(code->globals, 0); for (i = 0; i < vec_size(irfun->locals); ++i) { ir_value *v = irfun->locals[i]; if (v->locked || !OPTS_OPTIMIZATION(OPTIM_GLOBAL_TEMPS)) { ir_value_code_setaddr(v, firstlocal + v->code.local); - if (!ir_builder_gen_global(ir, irfun->locals[i], true)) { + if (!ir_builder_gen_global(code, ir, irfun->locals[i], true)) { irerror(irfun->locals[i]->context, "failed to generate local %s", irfun->locals[i]->name); return false; } @@ -3227,7 +3211,7 @@ static bool gen_function_locals(ir_builder *ir, ir_value *global) return true; } -static bool gen_global_function_code(ir_builder *ir, ir_value *global) +static bool gen_global_function_code(code_t *code, ir_builder *ir, ir_value *global) { prog_section_function *fundef; ir_function *irfun; @@ -3251,25 +3235,29 @@ 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[irfun->code_function_def]; + fundef = &code->functions[irfun->code_function_def]; - fundef->entry = vec_size(code_statements); - if (!gen_function_locals(ir, global)) { + fundef->entry = vec_size(code->statements); + if (!gen_function_locals(code, ir, global)) { irerror(irfun->context, "Failed to generate locals for function %s", irfun->name); return false; } - if (!gen_function_extparam_copy(irfun)) { + if (!gen_function_extparam_copy(code, irfun)) { irerror(irfun->context, "Failed to generate extparam-copy code for function %s", irfun->name); return false; } - if (!gen_function_code(irfun)) { + if (irfun->max_varargs && !gen_function_varargs_copy(code, irfun)) { + irerror(irfun->context, "Failed to generate vararg-copy code for function %s", irfun->name); + return false; + } + if (!gen_function_code(code, irfun)) { irerror(irfun->context, "Failed to generate code for function %s", irfun->name); return false; } return true; } -static void gen_vector_defs(prog_section_def def, const char *name) +static void gen_vector_defs(code_t *code, prog_section_def def, const char *name) { char *component; size_t len, i; @@ -3290,14 +3278,16 @@ static void gen_vector_defs(prog_section_def def, const char *name) component[len-1] = 'x'; for (i = 0; i < 3; ++i) { - def.name = code_genstring(component); - vec_push(code_defs, def); + def.name = code_genstring(code, component); + vec_push(code->defs, def); def.offset++; component[len-1]++; } + + mem_d(component); } -static void gen_vector_fields(prog_section_field fld, const char *name) +static void gen_vector_fields(code_t *code, prog_section_field fld, const char *name) { char *component; size_t len, i; @@ -3318,28 +3308,31 @@ static void gen_vector_fields(prog_section_field fld, const char *name) component[len-1] = 'x'; for (i = 0; i < 3; ++i) { - fld.name = code_genstring(component); - vec_push(code_fields, fld); + fld.name = code_genstring(code, component); + vec_push(code->fields, fld); fld.offset++; component[len-1]++; } + + mem_d(component); } -static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal) +static bool ir_builder_gen_global(code_t *code, ir_builder *self, ir_value *global, bool islocal) { size_t i; int32_t *iptr; prog_section_def def; - bool pushdef = false; + bool pushdef = opts.optimizeoff; def.type = global->vtype; - def.offset = vec_size(code_globals); + def.offset = vec_size(code->globals); def.name = 0; - if (opts.g || !islocal) + if (OPTS_OPTION_BOOL(OPTION_G) || !islocal) { pushdef = true; if (OPTS_OPTIMIZATION(OPTIM_STRIP_CONSTANT_NAMES) && + !(global->flags & IR_FLAG_INCLUDE_DEF) && (global->name[0] == '#' || global->cvq == CV_CONST)) { pushdef = false; @@ -3348,21 +3341,21 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc if (pushdef && global->name) { if (global->name[0] == '#') { if (!self->str_immediate) - self->str_immediate = code_genstring("IMMEDIATE"); + self->str_immediate = code_genstring(code, "IMMEDIATE"); def.name = global->code.name = self->str_immediate; } else - def.name = global->code.name = code_genstring(global->name); + def.name = global->code.name = code_genstring(code, global->name); } else def.name = 0; if (islocal) { def.offset = ir_value_code_addr(global); - vec_push(code_defs, def); + vec_push(code->defs, def); if (global->vtype == TYPE_VECTOR) - gen_vector_defs(def, global->name); + gen_vector_defs(code, def, global->name); else if (global->vtype == TYPE_FIELD && global->fieldtype == TYPE_VECTOR) - gen_vector_defs(def, global->name); + gen_vector_defs(code, def, global->name); return true; } } @@ -3389,102 +3382,102 @@ 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, vec_size(code_globals)); - vec_push(code_globals, 0); + ir_value_code_setaddr(global, vec_size(code->globals)); + vec_push(code->globals, 0); /* Add the def */ - if (pushdef) vec_push(code_defs, def); + if (pushdef) vec_push(code->defs, def); return true; case TYPE_POINTER: - if (pushdef) vec_push(code_defs, def); - return gen_global_pointer(global); + if (pushdef) vec_push(code->defs, def); + return gen_global_pointer(code, global); case TYPE_FIELD: if (pushdef) { - vec_push(code_defs, def); + vec_push(code->defs, def); if (global->fieldtype == TYPE_VECTOR) - gen_vector_defs(def, global->name); + gen_vector_defs(code, def, global->name); } - return gen_global_field(global); + return gen_global_field(code, global); case TYPE_ENTITY: /* fall through */ case TYPE_FLOAT: { - ir_value_code_setaddr(global, vec_size(code_globals)); + ir_value_code_setaddr(global, vec_size(code->globals)); if (global->hasvalue) { iptr = (int32_t*)&global->constval.ivec[0]; - vec_push(code_globals, *iptr); + vec_push(code->globals, *iptr); } else { - vec_push(code_globals, 0); + vec_push(code->globals, 0); } if (!islocal && global->cvq != CV_CONST) def.type |= DEF_SAVEGLOBAL; - if (pushdef) vec_push(code_defs, def); + if (pushdef) vec_push(code->defs, def); return global->code.globaladdr >= 0; } case TYPE_STRING: { - ir_value_code_setaddr(global, vec_size(code_globals)); + ir_value_code_setaddr(global, vec_size(code->globals)); if (global->hasvalue) { - vec_push(code_globals, code_genstring(global->constval.vstring)); + vec_push(code->globals, code_genstring(code, global->constval.vstring)); } else { - vec_push(code_globals, 0); + vec_push(code->globals, 0); } if (!islocal && global->cvq != CV_CONST) def.type |= DEF_SAVEGLOBAL; - if (pushdef) vec_push(code_defs, def); + if (pushdef) vec_push(code->defs, def); return global->code.globaladdr >= 0; } case TYPE_VECTOR: { size_t d; - ir_value_code_setaddr(global, vec_size(code_globals)); + 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]); + vec_push(code->globals, iptr[0]); if (global->code.globaladdr < 0) return false; for (d = 1; d < type_sizeof_[global->vtype]; ++d) { - vec_push(code_globals, iptr[d]); + vec_push(code->globals, iptr[d]); } } else { - vec_push(code_globals, 0); + vec_push(code->globals, 0); if (global->code.globaladdr < 0) return false; for (d = 1; d < type_sizeof_[global->vtype]; ++d) { - vec_push(code_globals, 0); + vec_push(code->globals, 0); } } if (!islocal && global->cvq != CV_CONST) def.type |= DEF_SAVEGLOBAL; if (pushdef) { - vec_push(code_defs, def); + vec_push(code->defs, def); def.type &= ~DEF_SAVEGLOBAL; - gen_vector_defs(def, global->name); + gen_vector_defs(code, def, global->name); } return global->code.globaladdr >= 0; } case TYPE_FUNCTION: - ir_value_code_setaddr(global, vec_size(code_globals)); + ir_value_code_setaddr(global, vec_size(code->globals)); if (!global->hasvalue) { - vec_push(code_globals, 0); + vec_push(code->globals, 0); if (global->code.globaladdr < 0) return false; } else { - vec_push(code_globals, vec_size(code_functions)); - if (!gen_global_function(self, global)) + vec_push(code->globals, vec_size(code->functions)); + if (!gen_global_function(code, self, global)) return false; } if (!islocal && global->cvq != CV_CONST) def.type |= DEF_SAVEGLOBAL; - if (pushdef) vec_push(code_defs, def); + if (pushdef) 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); + 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); + vec_push(code->globals, 0); return true; default: /* refuse to create 'void' type or any other fancy business. */ @@ -3494,12 +3487,12 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc } } -static void ir_builder_prepare_field(ir_value *field) +static GMQCC_INLINE void ir_builder_prepare_field(code_t *code, ir_value *field) { - field->code.fieldaddr = code_alloc_field(type_sizeof_[field->fieldtype]); + field->code.fieldaddr = code_alloc_field(code, type_sizeof_[field->fieldtype]); } -static bool ir_builder_gen_field(ir_builder *self, ir_value *field) +static bool ir_builder_gen_field(code_t *code, ir_builder *self, ir_value *field) { prog_section_def def; prog_section_field fld; @@ -3507,10 +3500,10 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) (void)self; def.type = (uint16_t)field->vtype; - def.offset = (uint16_t)vec_size(code_globals); + def.offset = (uint16_t)vec_size(code->globals); /* create a global named the same as the field */ - if (opts.standard == COMPILER_GMQCC) { + if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_GMQCC) { /* in our standard, the global gets a dot prefix */ size_t len = strlen(field->name); char name[1024]; @@ -3527,7 +3520,7 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) memcpy(name+1, field->name, len); /* no strncpy - we used strlen above */ name[len+1] = 0; - def.name = code_genstring(name); + def.name = code_genstring(code, name); fld.name = def.name + 1; /* we reuse that string table entry */ } else { /* in plain QC, there cannot be a global with the same name, @@ -3535,13 +3528,13 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) * FIXME: fteqcc should create a global as well * check if it actually uses the same name. Probably does */ - def.name = code_genstring(field->name); + def.name = code_genstring(code, field->name); fld.name = def.name; } field->code.name = def.name; - vec_push(code_defs, def); + vec_push(code->defs, def); fld.type = field->fieldtype; @@ -3552,24 +3545,24 @@ static bool ir_builder_gen_field(ir_builder *self, ir_value *field) fld.offset = field->code.fieldaddr; - vec_push(code_fields, fld); + vec_push(code->fields, fld); - ir_value_code_setaddr(field, vec_size(code_globals)); - vec_push(code_globals, fld.offset); + ir_value_code_setaddr(field, vec_size(code->globals)); + vec_push(code->globals, fld.offset); if (fld.type == TYPE_VECTOR) { - vec_push(code_globals, fld.offset+1); - vec_push(code_globals, fld.offset+2); + 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); + gen_vector_defs (code, def, field->name); + gen_vector_fields(code, fld, field->name); } return field->code.globaladdr >= 0; } -bool ir_builder_generate(ir_builder *self, const char *filename) +bool ir_builder_generate(code_t *code, ir_builder *self, const char *filename) { prog_section_statement stmt; size_t i; @@ -3579,12 +3572,12 @@ bool ir_builder_generate(ir_builder *self, const char *filename) for (i = 0; i < vec_size(self->fields); ++i) { - ir_builder_prepare_field(self->fields[i]); + ir_builder_prepare_field(code, self->fields[i]); } for (i = 0; i < vec_size(self->globals); ++i) { - if (!ir_builder_gen_global(self, self->globals[i], false)) { + if (!ir_builder_gen_global(code, self, self->globals[i], false)) { return false; } if (self->globals[i]->vtype == TYPE_FUNCTION) { @@ -3601,62 +3594,62 @@ bool ir_builder_generate(ir_builder *self, const char *filename) for (i = 0; i < vec_size(self->fields); ++i) { - if (!ir_builder_gen_field(self, self->fields[i])) { + if (!ir_builder_gen_field(code, self, self->fields[i])) { return false; } } /* generate nil */ - ir_value_code_setaddr(self->nil, vec_size(code_globals)); - vec_push(code_globals, 0); - vec_push(code_globals, 0); - vec_push(code_globals, 0); + ir_value_code_setaddr(self->nil, vec_size(code->globals)); + vec_push(code->globals, 0); + vec_push(code->globals, 0); + vec_push(code->globals, 0); /* generate global temps */ - self->first_common_globaltemp = vec_size(code_globals); + self->first_common_globaltemp = vec_size(code->globals); for (i = 0; i < self->max_globaltemps; ++i) { - vec_push(code_globals, 0); + vec_push(code->globals, 0); } /* generate common locals */ - self->first_common_local = vec_size(code_globals); + self->first_common_local = vec_size(code->globals); for (i = 0; i < self->max_locals; ++i) { - vec_push(code_globals, 0); + vec_push(code->globals, 0); } /* generate function code */ 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])) { + if (!gen_global_function_code(code, self, self->globals[i])) { return false; } } } - if (vec_size(code_globals) >= 65536) { + 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) + 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)); + code_push_statement(code, &stmt, vec_last(code->linenums)); } - if (opts.pp_only) + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) return true; - if (vec_size(code_statements) != vec_size(code_linenums)) { + 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)); + (unsigned long)vec_size(code->statements), + (unsigned long)vec_size(code->linenums)); } else if (OPTS_FLAG(LNO)) { - char *dot; + char *dot; size_t filelen = strlen(filename); memcpy(vec_add(lnofile, filelen+1), filename, filelen+1); @@ -3669,13 +3662,13 @@ bool ir_builder_generate(ir_builder *self, const char *filename) memcpy(vec_add(lnofile, 5), ".lno", 5); } - if (!opts.quiet) { + if (!OPTS_OPTION_BOOL(OPTION_QUIET)) { if (lnofile) con_out("writing '%s' and '%s'...\n", filename, lnofile); else con_out("writing '%s'\n", filename); } - if (!code_write(filename, lnofile)) { + if (!code_write(code, filename, lnofile)) { vec_free(lnofile); return false; } @@ -3727,6 +3720,10 @@ void ir_builder_dump(ir_builder *b, int (*oprintf)(const char*, ...)) oprintf("endmodule %s\n", b->name); } +static const char *storenames[] = { + "[global]", "[local]", "[param]", "[value]", "[return]" +}; + void ir_function_dump(ir_function *f, char *ind, int (*oprintf)(const char*, ...)) { @@ -3757,9 +3754,12 @@ void ir_function_dump(ir_function *f, char *ind, attr = "unique "; else if (v->locked) attr = "locked "; - oprintf("%s\t%s: %s %s%s@%i ", ind, v->name, type_name[v->vtype], + oprintf("%s\t%s: %s %s %s%s@%i ", ind, v->name, type_name[v->vtype], + storenames[v->store], attr, (v->callparam ? "callparam " : ""), (int)v->code.local); + if (!v->life) + oprintf("[null]"); for (l = 0; l < vec_size(v->life); ++l) { oprintf("[%i,%i] ", v->life[l].start, v->life[l].end); } @@ -3768,13 +3768,7 @@ void ir_function_dump(ir_function *f, char *ind, ir_value *vm = v->members[m]; if (!vm) continue; - if (vm->unique_life && vm->locked) - attr = "unique,locked "; - else if (vm->unique_life) - attr = "unique "; - else if (vm->locked) - attr = "locked "; - oprintf("%s\t%s: %s@%i ", ind, vm->name, attr, (int)vm->code.local); + oprintf("%s\t%s: @%i ", ind, vm->name, (int)vm->code.local); for (l = 0; l < vec_size(vm->life); ++l) { oprintf("[%i,%i] ", vm->life[l].start, vm->life[l].end); } @@ -3791,9 +3785,12 @@ void ir_function_dump(ir_function *f, char *ind, attr = "unique "; else if (v->locked) attr = "locked "; - oprintf("%s\t%s: %s %s%s@%i ", ind, v->name, type_name[v->vtype], + oprintf("%s\t%s: %s %s %s%s@%i ", ind, v->name, type_name[v->vtype], + storenames[v->store], attr, (v->callparam ? "callparam " : ""), (int)v->code.local); + if (!v->life) + oprintf("[null]"); for (l = 0; l < vec_size(v->life); ++l) { oprintf("[%i,%i] ", v->life[l].start, v->life[l].end); } @@ -3817,11 +3814,8 @@ void ir_function_dump(ir_function *f, char *ind, } if (vec_size(f->blocks)) { - oprintf("%slife passes (check): %i\n", ind, (int)f->run_id); + oprintf("%slife passes: %i\n", ind, (int)f->run_id); 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); - } ir_block_dump(f->blocks[i], ind, oprintf); } @@ -3837,6 +3831,8 @@ void ir_block_dump(ir_block* b, char *ind, oprintf("%s:%s\n", ind, b->label); strncat(ind, "\t", IND_BUFSZ); + if (b->instr && b->instr[0]) + oprintf("%s (%i) [entry]\n", ind, (int)(b->instr[0]->eid-1)); for (i = 0; i < vec_size(b->instr); ++i) ir_instr_dump(b->instr[i], ind, oprintf); ind[strlen(ind)-1] = 0;