va_list ap;
int lvl = LVL_WARNING;
- if (!OPTS_WARN(warntype))
+ if (warntype && !OPTS_WARN(warntype))
return false;
if (opts_werror)
return NULL;
}
- /* globals which always exist */
-
- /* for now we give it a vector size */
- ir_builder_create_global(self, "OFS_RETURN", TYPE_VARIANT);
-
return self;
}
ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype, bool param)
{
- ir_value *ve = ir_function_get_local(self, name);
- if (ve) {
+ ir_value *ve;
+
+ /*
+ if (ir_function_get_local(self, name))
return NULL;
- }
+ */
if (param &&
self->locals_count &&
memset(self, 0, sizeof(*self));
self->label = NULL;
- if (!ir_block_set_label(self, name)) {
+ if (name && !ir_block_set_label(self, name)) {
mem_d(self);
return NULL;
}
void ir_block_delete(ir_block* self)
{
size_t i;
- mem_d(self->label);
+ if (self->label) mem_d(self->label);
for (i = 0; i != self->instr_count; ++i)
ir_instr_delete(self->instr[i]);
MEM_VECTOR_CLEAR(self, instr);
self->context.file = "<@no context>";
self->context.line = 0;
self->name = NULL;
- ir_value_set_name(self, name);
+ if (name && !ir_value_set_name(self, name)) {
+ irerror(self->context, "out of memory");
+ mem_d(self);
+ return NULL;
+ }
memset(&self->constval, 0, sizeof(self->constval));
memset(&self->code, 0, sizeof(self->code));
mem_d(self);
}
-void ir_value_set_name(ir_value *self, const char *name)
+bool ir_value_set_name(ir_value *self, const char *name)
{
if (self->name)
mem_d((void*)self->name);
self->name = util_strdup(name);
+ return !!self->name;
}
bool ir_value_set_float(ir_value *self, float f)
}
if (life->start < entry->start &&
- life->end >= entry->start)
+ life->end+1 >= entry->start)
{
/* starts earlier and overlaps */
entry->start = life->start;
}
- if (life->end > entry->end &&
- life->start-1 <= entry->end)
+ if (life->end > entry->end &&
+ life->start <= entry->end+1)
{
/* ends later and overlaps */
entry->end = life->end;
{
if (self->blocks[i]->is_return)
{
+ self->blocks[i]->living_count = 0;
if (!ir_block_life_propagate(self->blocks[i], NULL, &changed))
return false;
}
/* 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 */
for (o = 0; o < 3; ++o)
{
*
* Breaking conventions is annoying...
*/
-static bool ir_builder_gen_global(ir_builder *self, ir_value *global);
+static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal);
static bool gen_global_field(ir_value *global)
{
}
fun.firstlocal = code_globals_elements;
- fun.locals = irfun->allocated_locals + irfun->locals_count;
local_var_end = fun.firstlocal;
for (i = 0; i < irfun->locals_count; ++i) {
- if (!ir_builder_gen_global(ir, 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;
}
code_globals_add(0);
}
+ fun.locals = code_globals_elements - fun.firstlocal;
+
if (irfun->builtin)
fun.entry = irfun->builtin;
else {
ir_function *irfun;
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);
+ /* this was a function pointer, don't generate code for those */
+ return true;
+ }
+
if (irfun->builtin)
return true;
return true;
}
-static bool ir_builder_gen_global(ir_builder *self, ir_value *global)
+static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal)
{
size_t i;
int32_t *iptr;
/* I'd argue setting it to 0 is sufficient, but maybe some depend on knowing how far
* the system fields actually go? Though the engine knows this anyway...
* 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, def.offset);
+ ir_value_code_setaddr(global, code_globals_add(0));
/* Add the def */
if (code_defs_add(def) < 0)
return false;
/* fall through */
case TYPE_FLOAT:
{
- if (code_defs_add(def) < 0)
- return false;
-
if (global->isconst) {
iptr = (int32_t*)&global->constval.vfloat;
ir_value_code_setaddr(global, code_globals_add(*iptr));
- } else
+ } else {
ir_value_code_setaddr(global, code_globals_add(0));
+ if (!islocal)
+ def.type |= DEF_SAVEGLOBAL;
+ }
+ if (code_defs_add(def) < 0)
+ return false;
return global->code.globaladdr >= 0;
}
case TYPE_STRING:
{
- if (code_defs_add(def) < 0)
- return false;
if (global->isconst)
ir_value_code_setaddr(global, code_globals_add(code_cachedstring(global->constval.vstring)));
- else
+ else {
ir_value_code_setaddr(global, code_globals_add(0));
+ if (!islocal)
+ def.type |= DEF_SAVEGLOBAL;
+ }
+ if (code_defs_add(def) < 0)
+ return false;
return global->code.globaladdr >= 0;
}
case TYPE_VECTOR:
{
size_t d;
- if (code_defs_add(def) < 0)
- return false;
-
if (global->isconst) {
iptr = (int32_t*)&global->constval.vvec;
ir_value_code_setaddr(global, code_globals_add(iptr[0]));
if (code_globals_add(0) < 0)
return false;
}
+ if (!islocal)
+ def.type |= DEF_SAVEGLOBAL;
}
+
+ if (code_defs_add(def) < 0)
+ return false;
return global->code.globaladdr >= 0;
}
case TYPE_FUNCTION:
+ if (!global->isconst) {
+ ir_value_code_setaddr(global, code_globals_add(0));
+ if (global->code.globaladdr < 0)
+ return false;
+ } else {
+ ir_value_code_setaddr(global, code_globals_elements);
+ code_globals_add(code_functions_elements);
+ if (!gen_global_function(self, global))
+ return false;
+ if (!islocal)
+ def.type |= DEF_SAVEGLOBAL;
+ }
if (code_defs_add(def) < 0)
return false;
- ir_value_code_setaddr(global, code_globals_elements);
- code_globals_add(code_functions_elements);
- return gen_global_function(self, global);
+ return true;
case TYPE_VARIANT:
/* assume biggest type */
ir_value_code_setaddr(global, code_globals_add(0));
bool ir_builder_generate(ir_builder *self, const char *filename)
{
+ prog_section_statement stmt;
size_t i;
code_init();
- for (i = 0; i < self->fields_count; ++i)
+ for (i = 0; i < self->globals_count; ++i)
{
- if (!ir_builder_gen_field(self, self->fields[i])) {
+ if (!ir_builder_gen_global(self, self->globals[i], false)) {
return false;
}
}
- for (i = 0; i < self->globals_count; ++i)
+ for (i = 0; i < self->fields_count; ++i)
{
- if (!ir_builder_gen_global(self, self->globals[i])) {
+ if (!ir_builder_gen_field(self, self->fields[i])) {
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;
+ if (code_statements_add(stmt) < 0)
+ return false;
+
printf("writing '%s'...\n", filename);
return code_write(filename);
}
oprintf("\n");
}
}
+ oprintf("%sliferanges:\n", ind);
+ for (i = 0; i < f->locals_count; ++i) {
+ size_t l;
+ ir_value *v = f->locals[i];
+ oprintf("%s\t%s: unique ", ind, v->name);
+ for (l = 0; l < v->life_count; ++l) {
+ oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
+ }
+ oprintf("\n");
+ }
+ for (i = 0; i < f->values_count; ++i) {
+ size_t l;
+ ir_value *v = f->values[i];
+ oprintf("%s\t%s: @%i ", ind, v->name, (int)v->code.local);
+ for (l = 0; l < v->life_count; ++l) {
+ oprintf("[%i,%i] ", v->life[l].start, v->life[l].end);
+ }
+ oprintf("\n");
+ }
if (f->blocks_count)
{
oprintf("%slife passes (check): %i\n", ind, (int)f->run_id);
}
if (in->bops[1])
oprintf("%s[%s]", comma, in->bops[1]->label);
+ if (in->params_count) {
+ oprintf("\tparams: ");
+ for (i = 0; i != in->params_count; ++i) {
+ oprintf("%s, ", in->params[i]->name);
+ }
+ }
oprintf("\n");
ind[strlen(ind)-1] = 0;
}
oprintf("(void)");
break;
case TYPE_FUNCTION:
- oprintf("(function)");
+ oprintf("fn:%s", v->name);
break;
case TYPE_FLOAT:
oprintf("%g", v->constval.vfloat);
}
}
-void ir_value_dump_life(ir_value *self, int (*oprintf)(const char*,...))
+void ir_value_dump_life(const ir_value *self, int (*oprintf)(const char*,...))
{
size_t i;
- oprintf("Life of %s:\n", self->name);
+ oprintf("Life of %12s:", self->name);
for (i = 0; i < self->life_count; ++i)
{
oprintf(" + [%i, %i]\n", self->life[i].start, self->life[i].end);
projects / xonotic / gmqcc.git / blobdiff