"array"
};
-size_t type_sizeof[TYPE_COUNT] = {
+size_t type_sizeof_[TYPE_COUNT] = {
1, /* TYPE_VOID */
1, /* TYPE_STRING */
1, /* TYPE_FLOAT */
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;
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;
{
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;
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);
*IR main operations
*/
+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(ctx, self, op);
- if (!in)
+ if (!ir_check_unreachable(self))
return false;
if (target->store == store_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);
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(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;
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(ctx, self, (v->vtype == TYPE_STRING ? INSTR_IF_S : INSTR_IF_F));*/
in = ir_instr_new(ctx, self, VINSTR_COND);
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(ctx, self, VINSTR_JUMP);
if (!in)
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(ctx, self, INSTR_GOTO);
if (!in)
{
ir_value *out;
ir_instr *in;
+ if (!ir_check_unreachable(self))
+ return false;
in = ir_instr_new(ctx, self, VINSTR_PHI);
if (!in)
return NULL;
}
/* call related code */
-ir_instr* ir_block_create_call(ir_block *self, lex_ctx ctx, 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(ctx, self, INSTR_CALL0);
+ if (!ir_check_unreachable(self))
+ return false;
+ in = ir_instr_new(ctx, self, (noreturn ? VINSTR_NRCALL : INSTR_CALL0));
if (!in)
return NULL;
+ if (noreturn) {
+ self->final = true;
+ self->is_return = true;
+ }
out = ir_value_out(self->owner, label, (func->outtype == TYPE_VOID) ? store_return : store_value, func->outtype);
if (!out) {
ir_instr_delete(in);
return NULL;
}
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;
}
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))
{
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)
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;
* will be required later when overlapping temps + locals
*/
if (a < vec_size(self->params) &&
- alloc.sizes[a] < type_sizeof[v->vtype])
+ alloc.sizes[a] < ir_value_sizeof(v))
{
continue;
}
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;
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);
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);
}
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);
}
continue;
value = instr->_ops[o];
- if (value->memberof)
- value = value->memberof;
/* We only care about locals */
/* we also calculate parameter liferanges so that locals
if (ontrue->generated) {
stmt.opcode = INSTR_IF;
stmt.o2.s1 = (ontrue->code_start) - vec_size(code_statements);
- code_push_statement(&stmt, instr->context.line);
+ 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);
- code_push_statement(&stmt, instr->context.line);
+ if (stmt.o2.s1 != 1)
+ code_push_statement(&stmt, instr->context.line);
}
if (!ontrue->generated) {
if (onfalse->generated) {
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 ||
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,
ir_function *irfun;
size_t i;
-#ifndef NEW_ALLOC_STRAT
- size_t local_var_end;
-#endif
if (!global->hasvalue || (!global->constval.vfunc))
{
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);
-#ifndef NEW_ALLOC_STRAT
- local_var_end = fun.firstlocal;
- 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;
- if (last->vtype == TYPE_FIELD && last->fieldtype == TYPE_VECTOR)
- local_var_end += type_sizeof[TYPE_VECTOR];
- else
- local_var_end += type_sizeof[last->vtype];
- }
- for (i = 0; i < vec_size(irfun->values); ++i)
- {
- /* generate code.globaladdr for ssa values */
- ir_value *v = irfun->values[i];
- ir_value_code_setaddr(v, local_var_end + v->code.local);
- }
- for (i = 0; i < irfun->allocated_locals; ++i) {
- /* fill the locals with zeros */
- vec_push(code_globals, 0);
- }
-
- fun.locals = vec_size(code_globals) - fun.firstlocal;
-#else
fun.locals = irfun->allocated_locals;
for (i = 0; i < vec_size(irfun->locals); ++i) {
if (!ir_builder_gen_global(ir, irfun->locals[i], true)) {
}
ir_value_code_setaddr(irfun->locals[i], fun.firstlocal + irfun->locals[i]->code.local);
}
- for (i = vec_size(code_globals) - fun.firstlocal; i < fun.locals; ++i) {
- vec_push(code_globals, 0);
- }
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, fun.firstlocal + v->code.local);
}
-#endif
+ for (i = vec_size(code_globals); i < fun.firstlocal + irfun->allocated_locals; ++i)
+ vec_push(code_globals, 0);
if (irfun->builtin)
fun.entry = irfun->builtin+1;
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;
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 */
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;
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;
}
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:
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:
static void ir_builder_prepare_field(ir_value *field)
{
- field->code.fieldaddr = code_alloc_field(type_sizeof[field->fieldtype]);
+ field->code.fieldaddr = code_alloc_field(type_sizeof_[field->fieldtype]);
}
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;
}
#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)
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));
projects / xonotic / gmqcc.git / blobdiff