* Vector utility functions
*/
-static bool GMQCC_WARN vec_ir_value_find(ir_value **vec, const ir_value *what, size_t *idx)
+static bool GMQCC_WARN vec_ir_value_find(std::vector<ir_value *> &vec, const ir_value *what, size_t *idx)
{
- size_t i;
- size_t len = vec_size(vec);
- for (i = 0; i < len; ++i) {
- if (vec[i] == what) {
- if (idx) *idx = i;
- return true;
- }
+ for (auto &it : vec) {
+ if (it != what)
+ continue;
+ if (idx)
+ *idx = &it - &vec[0];
+ return true;
}
return false;
}
return false;
}
-static bool GMQCC_WARN vec_ir_instr_find(ir_instr **vec, ir_instr *what, size_t *idx)
+static bool GMQCC_WARN vec_ir_instr_find(std::vector<ir_instr *> &vec, ir_instr *what, size_t *idx)
{
- size_t i;
- size_t len = vec_size(vec);
- for (i = 0; i < len; ++i) {
- if (vec[i] == what) {
- if (idx) *idx = i;
- return true;
- }
+ for (auto &it : vec) {
+ if (it != what)
+ continue;
+ if (idx)
+ *idx = &it - &vec[0];
+ return true;
}
return false;
}
continue;
/* don't optimize out the temp if it's used later again */
- if (vec_size(value->reads) != 1)
+ if (value->reads.size() != 1)
continue;
/* The very next store must use this value */
ir_value *value;
value = inst->_ops[0];
- if (value->store != store_value ||
- vec_size(value->reads) != 1 ||
- value->reads[0] != inst)
- {
+ if (value->store != store_value || value->reads.size() != 1 || value->reads[0] != inst)
break;
- }
inot = value->writes[0];
if (inot->_ops[0] != value ||
block->final = false; /* open it back up */
/* emite parameter-stores */
- for (p = 0; p < vec_size(call->params); ++p) {
+ for (p = 0; p < call->params.size(); ++p) {
/* assert(call->params_count <= self->locals_count); */
if (!ir_block_create_store(block, call->context, self->locals[p], call->params[p])) {
irerror(call->context, "failed to create tailcall store instruction for parameter %i", (int)p);
ir_block* ir_block_new(ir_function* owner, const char *name)
{
- ir_block *self;
- self = (ir_block*)mem_a(sizeof(*self));
- if (!self)
- return NULL;
-
+ ir_block *self = new ir_block;
memset(self, 0, sizeof(*self));
self->label = NULL;
self->context.line = 0;
self->final = false;
- self->instr = NULL;
+ self->instr = NULL;
self->entries = NULL;
- self->exits = NULL;
+ self->exits = NULL;
self->eid = 0;
self->is_return = false;
-
- self->living = NULL;
-
self->generated = false;
return self;
vec_free(self->instr);
vec_free(self->entries);
vec_free(self->exits);
- vec_free(self->living);
- mem_d(self);
+ delete self;
}
void ir_block_delete(ir_block* self)
vec_free(self->instr);
vec_free(self->entries);
vec_free(self->exits);
- vec_free(self->living);
- mem_d(self);
+ delete self;
}
bool ir_block_set_label(ir_block *self, const char *name)
static ir_instr* ir_instr_new(lex_ctx_t ctx, ir_block* owner, int op)
{
- ir_instr *self;
- self = (ir_instr*)mem_a(sizeof(*self));
- if (!self)
- return NULL;
-
+ ir_instr *self = new ir_instr;
self->owner = owner;
self->context = ctx;
self->opcode = op;
self->_ops[2] = NULL;
self->bops[0] = NULL;
self->bops[1] = NULL;
-
- self->phi = NULL;
- self->params = NULL;
-
self->eid = 0;
-
self->likely = true;
return self;
}
static void ir_instr_delete_quick(ir_instr *self)
{
- vec_free(self->phi);
- vec_free(self->params);
- mem_d(self);
+ delete self;
}
static void ir_instr_delete(ir_instr *self)
{
- size_t i;
/* The following calls can only delete from
* vectors, we still want to delete this instruction
* so ignore the return value. Since with the warn_unused_result attribute
* gcc doesn't care about an explicit: (void)foo(); to ignore the result,
* I have to improvise here and use if(foo());
*/
- for (i = 0; i < vec_size(self->phi); ++i) {
+ for (auto &it : self->phi) {
size_t idx;
- if (vec_ir_instr_find(self->phi[i].value->writes, self, &idx))
- vec_remove(self->phi[i].value->writes, idx, 1);
- if (vec_ir_instr_find(self->phi[i].value->reads, self, &idx))
- vec_remove(self->phi[i].value->reads, idx, 1);
+ if (vec_ir_instr_find(it.value->writes, self, &idx))
+ it.value->writes.erase(it.value->writes.begin() + idx);
+ if (vec_ir_instr_find(it.value->reads, self, &idx))
+ it.value->reads.erase(it.value->reads.begin() + idx);
}
- vec_free(self->phi);
- for (i = 0; i < vec_size(self->params); ++i) {
+ for (auto &it : self->params) {
size_t idx;
- if (vec_ir_instr_find(self->params[i]->writes, self, &idx))
- vec_remove(self->params[i]->writes, idx, 1);
- if (vec_ir_instr_find(self->params[i]->reads, self, &idx))
- vec_remove(self->params[i]->reads, idx, 1);
+ if (vec_ir_instr_find(it->writes, self, &idx))
+ it->writes.erase(it->writes.begin() + idx);
+ if (vec_ir_instr_find(it->reads, self, &idx))
+ it->reads.erase(it->reads.begin() + idx);
}
- vec_free(self->params);
(void)!ir_instr_op(self, 0, NULL, false);
(void)!ir_instr_op(self, 1, NULL, false);
(void)!ir_instr_op(self, 2, NULL, false);
if (self->_ops[op]) {
size_t idx;
if (writing && vec_ir_instr_find(self->_ops[op]->writes, self, &idx))
- vec_remove(self->_ops[op]->writes, idx, 1);
+ self->_ops[op]->writes.erase(self->_ops[op]->writes.begin() + idx);
else if (vec_ir_instr_find(self->_ops[op]->reads, self, &idx))
- vec_remove(self->_ops[op]->reads, idx, 1);
+ self->_ops[op]->reads.erase(self->_ops[op]->reads.begin() + idx);
}
if (v) {
if (writing)
- vec_push(v->writes, self);
+ v->writes.push_back(self);
else
- vec_push(v->reads, self);
+ v->reads.push_back(self);
}
self->_ops[op] = v;
return true;
{
ir_value *self;
self = (ir_value*)mem_a(sizeof(*self));
+ new (self) ir_value();
self->vtype = vtype;
self->fieldtype = TYPE_VOID;
self->outtype = TYPE_VOID;
self->store = storetype;
self->flags = 0;
- self->reads = NULL;
- self->writes = NULL;
-
- self->cvq = CV_NONE;
- self->hasvalue = false;
+ self->cvq = CV_NONE;
+ self->hasvalue = false;
self->context.file = "<@no context>";
self->context.line = 0;
self->name = NULL;
self->memberof = NULL;
self->unique_life = false;
- self->locked = false;
- self->callparam = false;
+ self->locked = false;
+ self->callparam = false;
self->life = NULL;
return self;
ir_value* ir_value_vector_member(ir_value *self, unsigned int member)
{
- char *name;
- size_t len;
+ char *name;
+ size_t len;
ir_value *m;
if (member >= 3)
return NULL;
ir_value_delete(self->members[i]);
}
}
- vec_free(self->reads);
- vec_free(self->writes);
vec_free(self->life);
mem_d(self);
}
pe.value = v;
pe.from = b;
- vec_push(v->reads, self);
- vec_push(self->phi, pe);
+ v->reads.push_back(self);
+ self->phi.push_back(pe);
}
/* call related code */
void ir_call_param(ir_instr* self, ir_value *v)
{
- vec_push(self->params, v);
- vec_push(v->reads, self);
+ self->params.push_back(v);
+ v->reads.push_back(self);
}
/* binary op related code */
static bool ir_block_naive_phi(ir_block *self)
{
- size_t i, p; /*, w;*/
+ size_t i;
/* FIXME: optionally, create_phi can add the phis
* to a list so we don't need to loop through blocks
* - anyway: "don't optimize YET"
vec_remove(self->instr, i, 1);
--i; /* NOTE: i+1 below */
- for (p = 0; p < vec_size(instr->phi); ++p)
- {
- ir_value *v = instr->phi[p].value;
- ir_block *b = instr->phi[p].from;
-
- if (v->store == store_value &&
- vec_size(v->reads) == 1 &&
- vec_size(v->writes) == 1)
- {
+ for (auto &it : instr->phi) {
+ ir_value *v = it.value;
+ ir_block *b = it.from;
+ if (v->store == store_value && v->reads.size() == 1 && v->writes.size() == 1) {
/* replace the value */
if (!ir_instr_op(v->writes[0], 0, instr->_ops[0], true))
return false;
- }
- else
- {
+ } else {
/* force a move instruction */
ir_instr *prevjump = vec_last(b->instr);
vec_pop(b->instr);
* and it's not "locked", write it to the OFS_PARM directly.
*/
if (OPTS_OPTIMIZATION(OPTIM_CALL_STORES) && !v->locked && !v->unique_life) {
- if (vec_size(v->reads) == 1 && vec_size(v->writes) == 1 &&
+ if (v->reads.size() == 1 && v->writes.size() == 1 &&
(v->reads[0]->opcode == VINSTR_NRCALL ||
(v->reads[0]->opcode >= INSTR_CALL0 && v->reads[0]->opcode <= INSTR_CALL8)
)
)
{
- size_t param;
+ size_t param;
ir_instr *call = v->reads[0];
if (!vec_ir_value_find(call->params, v, ¶m)) {
irerror(call->context, "internal error: unlocked parameter %s not found", v->name);
}
continue;
}
- if (vec_size(v->writes) == 1 && v->writes[0]->opcode == INSTR_CALL0)
- {
+ if (v->writes.size() == 1 && v->writes[0]->opcode == INSTR_CALL0) {
v->store = store_return;
if (v->members[0]) v->members[0]->store = store_return;
if (v->members[1]) v->members[1]->store = store_return;
};
}
-static bool ir_block_living_add_instr(ir_block *self, size_t eid)
-{
- size_t i;
- const size_t vs = vec_size(self->living);
- bool changed = false;
- for (i = 0; i != vs; ++i)
- {
- if (ir_value_life_merge(self->living[i], eid))
+static bool ir_block_living_add_instr(ir_block *self, size_t eid) {
+ bool changed = false;
+ for (auto &it : self->living)
+ if (ir_value_life_merge(it, eid))
changed = true;
- }
return changed;
}
-static bool ir_block_living_lock(ir_block *self)
-{
- size_t i;
+static bool ir_block_living_lock(ir_block *self) {
bool changed = false;
- for (i = 0; i != vec_size(self->living); ++i)
- {
- if (!self->living[i]->locked) {
- self->living[i]->locked = true;
- changed = true;
- }
+ for (auto &it : self->living) {
+ if (it->locked)
+ continue;
+ it->locked = true;
+ changed = true;
}
return changed;
}
{
ir_instr *instr;
ir_value *value;
- size_t i, o, p, mem, cnt;
+ size_t i, o, p, mem;
/* bitmasks which operands are read from or written to */
size_t read, write;
char dbg_ind[16];
dbg_ind[1] = '0';
(void)dbg_ind;
- vec_free(self->living);
+ self->living.clear();
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]);
- }
+ for (auto &it : prev->living)
+ if (!vec_ir_value_find(self->living, it, nullptr))
+ self->living.push_back(it);
}
i = vec_size(self->instr);
*/
if (ir_value_life_merge(value, instr->eid))
*changed = true;
- /* Then remove */
- vec_remove(self->living, idx, 1);
+ // Then remove
+ self->living.erase(self->living.begin() + idx);
}
/* 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)) {
if (ir_value_life_merge(value->members[mem], instr->eid))
*changed = true;
- vec_remove(self->living, idx, 1);
+ self->living.erase(self->living.begin() + idx);
}
}
/* Removing the last member removes the vector */
if (mem == 3 && vec_ir_value_find(self->living, value, &idx)) {
if (ir_value_life_merge(value, instr->eid))
*changed = true;
- vec_remove(self->living, idx, 1);
+ self->living.erase(self->living.begin() + idx);
}
}
}
if (read & (1<<o))
{
if (!vec_ir_value_find(self->living, value, NULL))
- vec_push(self->living, value);
+ self->living.push_back(value);
/* reading adds the full vector */
if (value->memberof && !vec_ir_value_find(self->living, value->memberof, NULL))
- vec_push(self->living, value->memberof);
+ self->living.push_back(value->memberof);
for (mem = 0; mem < 3; ++mem) {
if (value->members[mem] && !vec_ir_value_find(self->living, value->members[mem], NULL))
- vec_push(self->living, value->members[mem]);
+ self->living.push_back(value->members[mem]);
}
}
}
/* PHI operands are always read operands */
- for (p = 0; p < vec_size(instr->phi); ++p)
- {
- value = instr->phi[p].value;
+ for (auto &it : instr->phi) {
+ value = it.value;
if (!vec_ir_value_find(self->living, value, NULL))
- vec_push(self->living, value);
+ self->living.push_back(value);
/* reading adds the full vector */
if (value->memberof && !vec_ir_value_find(self->living, value->memberof, NULL))
- vec_push(self->living, value->memberof);
+ self->living.push_back(value->memberof);
for (mem = 0; mem < 3; ++mem) {
if (value->members[mem] && !vec_ir_value_find(self->living, value->members[mem], NULL))
- vec_push(self->living, value->members[mem]);
+ self->living.push_back(value->members[mem]);
}
}
*changed = true;
}
/* call params are read operands too */
- for (p = 0; p < vec_size(instr->params); ++p)
- {
- value = instr->params[p];
+ for (auto &it : instr->params) {
+ value = it;
if (!vec_ir_value_find(self->living, value, NULL))
- vec_push(self->living, value);
+ self->living.push_back(value);
/* reading adds the full vector */
if (value->memberof && !vec_ir_value_find(self->living, value->memberof, NULL))
- vec_push(self->living, value->memberof);
+ self->living.push_back(value->memberof);
for (mem = 0; mem < 3; ++mem) {
if (value->members[mem] && !vec_ir_value_find(self->living, value->members[mem], NULL))
- vec_push(self->living, value->members[mem]);
+ self->living.push_back(value->members[mem]);
}
}
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];
+ for (auto &it : block->living) {
+ ir_value *v = it;
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) {
+ for (s = 0; s < v->reads.size(); ++s) {
if (v->reads[s]->eid == v->life[0].end)
break;
}
- if (s < vec_size(v->reads)) {
+ if (s < v->reads.size()) {
if (irwarning(v->context, WARN_USED_UNINITIALIZED,
"variable `%s` may be used uninitialized in this function\n"
" -> %s:%i",
}
if (v->memberof) {
ir_value *vec = v->memberof;
- for (s = 0; s < vec_size(vec->reads); ++s) {
+ for (s = 0; s < vec->reads.size(); ++s) {
if (vec->reads[s]->eid == v->life[0].end)
break;
}
- if (s < vec_size(vec->reads)) {
+ if (s < vec->reads.size()) {
if (irwarning(v->context, WARN_USED_UNINITIALIZED,
"variable `%s` may be used uninitialized in this function\n"
" -> %s:%i",
size_t p, first;
ir_value *retvalue;
- first = vec_size(instr->params);
+ first = instr->params.size();
if (first > 8)
first = 8;
for (p = 0; p < first; ++p)
code_push_statement(code, &stmt, instr->context);
}
/* Now handle extparams */
- first = vec_size(instr->params);
+ first = instr->params.size();
for (; p < first; ++p)
{
ir_builder *ir = func->owner;
code_push_statement(code, &stmt, instr->context);
}
- stmt.opcode = INSTR_CALL0 + vec_size(instr->params);
+ stmt.opcode = INSTR_CALL0 + instr->params.size();
if (stmt.opcode > INSTR_CALL8)
stmt.opcode = INSTR_CALL8;
stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]);
* if we're eraseable and the function isn't referenced ignore outputting
* the function.
*/
- if (global->flags & IR_FLAG_ERASABLE && vec_size(global->reads) == 0) {
+ if (global->flags & IR_FLAG_ERASABLE && global->reads.empty()) {
return true;
}
ir_value* found[3] = { NULL, NULL, NULL };
/* must not be written to */
- if (vec_size(vec->writes))
+ if (vec->writes.size())
return;
/* must not be trying to access individual members */
if (vec->members[0] || vec->members[1] || vec->members[2])
return;
/* should be actually used otherwise it won't be generated anyway */
- count = vec_size(vec->reads);
+ count = vec->reads.size();
if (!count)
return;
vec->members[2] = found[2];
/* register the readers for these floats */
- count = vec_size(vec->reads);
+ count = vec->reads.size();
for (i = 0; i != count; ++i) {
- vec_push(found[0]->reads, vec->reads[i]);
- vec_push(found[1]->reads, vec->reads[i]);
- vec_push(found[2]->reads, vec->reads[i]);
+ found[0]->reads.push_back(vec->reads[i]);
+ found[1]->reads.push_back(vec->reads[i]);
+ found[2]->reads.push_back(vec->reads[i]);
}
}
static void dump_phi(ir_instr *in, int (*oprintf)(const char*, ...))
{
- size_t i;
oprintf("%s <- phi ", in->_ops[0]->name);
- for (i = 0; i < vec_size(in->phi); ++i)
- {
- oprintf("([%s] : %s) ", in->phi[i].from->label,
- in->phi[i].value->name);
+ for (auto &it : in->phi) {
+ oprintf("([%s] : %s) ", it.from->label,
+ it.value->name);
}
oprintf("\n");
}
oprintf(" <- ");
}
if (in->opcode == INSTR_CALL0 || in->opcode == VINSTR_NRCALL) {
- oprintf("CALL%i\t", vec_size(in->params));
+ oprintf("CALL%i\t", in->params.size());
} else
oprintf("%s\t", qc_opname(in->opcode));
}
if (in->bops[1])
oprintf("%s[%s]", comma, in->bops[1]->label);
- if (vec_size(in->params)) {
+ if (in->params.size()) {
oprintf("\tparams: ");
- for (i = 0; i != vec_size(in->params); ++i) {
- oprintf("%s, ", in->params[i]->name);
- }
+ for (auto &it : in->params)
+ oprintf("%s, ", it->name);
}
oprintf("\n");
ind[strlen(ind)-1] = 0;
projects / xonotic / gmqcc.git / blobdiff