* Type sizes used at multiple points in the IR codegen
*/
+const char *type_name[TYPE_COUNT] = {
+ "void",
+ "string",
+ "float",
+ "vector",
+ "entity",
+ "field",
+ "function",
+ "pointer",
+#if 0
+ "integer",
+#endif
+ "variant"
+};
+
size_t type_sizeof[TYPE_COUNT] = {
1, /* TYPE_VOID */
1, /* TYPE_STRING */
INSTR_STORE_FNC,
INSTR_STORE_ENT, /* should use I */
#if 0
- INSTR_STORE_ENT, /* integer type */
+ INSTR_STORE_I, /* integer type */
#endif
+
INSTR_STORE_V, /* variant, should never be accessed */
};
+uint16_t type_storep_instr[TYPE_COUNT] = {
+ INSTR_STOREP_F, /* should use I when having integer support */
+ INSTR_STOREP_S,
+ INSTR_STOREP_F,
+ INSTR_STOREP_V,
+ INSTR_STOREP_ENT,
+ INSTR_STOREP_FLD,
+ INSTR_STOREP_FNC,
+ INSTR_STOREP_ENT, /* should use I */
+#if 0
+ INSTR_STOREP_ENT, /* integer type */
+#endif
+
+ INSTR_STOREP_V, /* variant, should never be accessed */
+};
+
+uint16_t type_eq_instr[TYPE_COUNT] = {
+ INSTR_EQ_F, /* should use I when having integer support */
+ INSTR_EQ_S,
+ INSTR_EQ_F,
+ INSTR_EQ_V,
+ INSTR_EQ_E,
+ INSTR_EQ_E, /* FLD has no comparison */
+ INSTR_EQ_FNC,
+ INSTR_EQ_E, /* should use I */
+#if 0
+ INSTR_EQ_I,
+#endif
+
+ INSTR_EQ_V, /* variant, should never be accessed */
+};
+
+uint16_t type_ne_instr[TYPE_COUNT] = {
+ INSTR_NE_F, /* should use I when having integer support */
+ INSTR_NE_S,
+ INSTR_NE_F,
+ INSTR_NE_V,
+ INSTR_NE_E,
+ INSTR_NE_E, /* FLD has no comparison */
+ INSTR_NE_FNC,
+ INSTR_NE_E, /* should use I */
+#if 0
+ INSTR_NE_I,
+#endif
+
+ INSTR_NE_V, /* variant, should never be accessed */
+};
+
MEM_VEC_FUNCTIONS(ir_value_vector, ir_value*, v)
+static void irerror(lex_ctx ctx, const char *msg, ...)
+{
+ va_list ap;
+ va_start(ap, msg);
+ cvprintmsg(ctx, LVL_ERROR, "internal error", msg, ap);
+ va_end(ap);
+}
+
+static bool irwarning(lex_ctx ctx, int warntype, const char *fmt, ...)
+{
+ va_list ap;
+ int lvl = LVL_WARNING;
+
+ if (!OPTS_WARN(warntype))
+ return false;
+
+ if (opts_werror)
+ lvl = LVL_ERROR;
+
+ va_start(ap, fmt);
+ vprintmsg(lvl, ctx.file, ctx.line, "warning", fmt, ap);
+ va_end(ap);
+
+ return opts_werror;
+}
+
/***********************************************************************
*IR Builder
*/
MEM_VECTOR_INIT(self, functions);
MEM_VECTOR_INIT(self, globals);
+ MEM_VECTOR_INIT(self, fields);
self->name = NULL;
if (!ir_builder_set_name(self, modulename)) {
mem_d(self);
}
MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals)
+MEM_VEC_FUNCTIONS(ir_builder, ir_value*, fields)
MEM_VEC_FUNCTIONS(ir_builder, ir_function*, functions)
void ir_builder_delete(ir_builder* self)
ir_value_delete(self->globals[i]);
}
MEM_VECTOR_CLEAR(self, globals);
+ for (i = 0; i != self->fields_count; ++i) {
+ ir_value_delete(self->fields[i]);
+ }
+ MEM_VECTOR_CLEAR(self, fields);
mem_d(self);
}
ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype)
{
- ir_value *ve = ir_builder_get_global(self, name);
- if (ve) {
- return NULL;
+ ir_value *ve;
+
+ if (name && name[0] != '#')
+ {
+ ve = ir_builder_get_global(self, name);
+ if (ve) {
+ return NULL;
+ }
}
ve = ir_value_var(name, store_global, vtype);
return ve;
}
+ir_value* ir_builder_get_field(ir_builder *self, const char *name)
+{
+ size_t i;
+ for (i = 0; i < self->fields_count; ++i) {
+ if (!strcmp(self->fields[i]->name, name))
+ return self->fields[i];
+ }
+ return NULL;
+}
+
+
+ir_value* ir_builder_create_field(ir_builder *self, const char *name, int vtype)
+{
+ ir_value *ve = ir_builder_get_field(self, name);
+ if (ve) {
+ return NULL;
+ }
+
+ ve = ir_value_var(name, store_global, TYPE_FIELD);
+ ve->fieldtype = vtype;
+ if (!ir_builder_fields_add(self, ve)) {
+ ir_value_delete(ve);
+ return NULL;
+ }
+ return ve;
+}
+
/***********************************************************************
*IR Function
*/
if (!self)
return NULL;
+ memset(self, 0, sizeof(*self));
+
self->name = NULL;
if (!ir_function_set_name(self, "<@unnamed>")) {
mem_d(self);
MEM_VECTOR_INIT(self, values);
MEM_VECTOR_INIT(self, locals);
+ self->code_function_def = -1;
+ self->allocated_locals = 0;
+
self->run_id = 0;
return self;
}
return NULL;
}
-ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype)
+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) {
return NULL;
}
- ve = ir_value_var(name, store_local, vtype);
+ if (param &&
+ self->locals_count &&
+ self->locals[self->locals_count-1]->store != store_param) {
+ irerror(self->context, "cannot add parameters after adding locals");
+ return NULL;
+ }
+
+ ve = ir_value_var(name, (param ? store_param : store_local), vtype);
if (!ir_function_locals_add(self, ve)) {
ir_value_delete(ve);
return NULL;
*IR Value
*/
+void ir_value_code_setaddr(ir_value *self, int32_t gaddr)
+{
+ self->code.globaladdr = gaddr;
+ if (self->members[0]) self->members[0]->code.globaladdr = gaddr;
+ if (self->members[1]) self->members[1]->code.globaladdr = gaddr;
+ if (self->members[2]) self->members[2]->code.globaladdr = gaddr;
+}
+
+int32_t ir_value_code_addr(const ir_value *self)
+{
+ if (self->store == store_return)
+ return OFS_RETURN + self->code.addroffset;
+ return self->code.globaladdr + self->code.addroffset;
+}
+
ir_value* ir_value_var(const char *name, int storetype, int vtype)
{
ir_value *self;
memset(&self->constval, 0, sizeof(self->constval));
memset(&self->code, 0, sizeof(self->code));
+ self->members[0] = NULL;
+ self->members[1] = NULL;
+ self->members[2] = NULL;
+ self->memberof = NULL;
+
MEM_VECTOR_INIT(self, life);
return self;
}
+
+ir_value* ir_value_vector_member(ir_value *self, unsigned int member)
+{
+ ir_value *m;
+ if (member >= 3)
+ return NULL;
+
+ if (self->members[member])
+ return self->members[member];
+
+ if (self->vtype == TYPE_VECTOR)
+ {
+ m = ir_value_var(self->name, self->store, TYPE_FLOAT);
+ if (!m)
+ return NULL;
+ m->context = self->context;
+
+ self->members[member] = m;
+ m->code.addroffset = member;
+ }
+ else if (self->vtype == TYPE_FIELD)
+ {
+ if (self->fieldtype != TYPE_VECTOR)
+ return NULL;
+ m = ir_value_var(self->name, self->store, TYPE_FIELD);
+ if (!m)
+ return NULL;
+ m->fieldtype = TYPE_FLOAT;
+ m->context = self->context;
+
+ self->members[member] = m;
+ m->code.addroffset = member;
+ }
+ else
+ {
+ irerror(self->context, "invalid member access on %s", self->name);
+ return NULL;
+ }
+
+ m->memberof = self;
+ return m;
+}
+
MEM_VEC_FUNCTIONS(ir_value, ir_life_entry_t, life)
MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, reads)
MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, writes)
void ir_value_delete(ir_value* self)
{
+ size_t i;
if (self->name)
mem_d((void*)self->name);
if (self->isconst)
if (self->vtype == TYPE_STRING)
mem_d((void*)self->constval.vstring);
}
+ for (i = 0; i < 3; ++i) {
+ if (self->members[i])
+ ir_value_delete(self->members[i]);
+ }
MEM_VECTOR_CLEAR(self, reads);
MEM_VECTOR_CLEAR(self, writes);
MEM_VECTOR_CLEAR(self, life);
return true;
}
+bool ir_value_set_field(ir_value *self, ir_value *fld)
+{
+ if (self->vtype != TYPE_FIELD)
+ return false;
+ self->constval.vpointer = fld;
+ self->isconst = true;
+ return true;
+}
+
+static char *ir_strdup(const char *str)
+{
+ if (str && !*str) {
+ /* actually dup empty strings */
+ char *out = 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 = util_strdup(str);
+ self->constval.vstring = ir_strdup(str);
self->isconst = true;
return true;
}
/* check if the entries overlap, for that,
* both must start before the other one ends.
*/
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- if (la->start <= lb->end &&
- lb->start <= la->end)
-#else
- if (la->start < lb->end &&
- lb->start < la->end)
-#endif
+ if (la->start < lb->end &&
+ lb->start < la->end)
{
return true;
}
if (++la == enda)
break;
}
- else if (lb->start < la->start)
+ else /* if (lb->start < la->start) actually <= */
{
/* order: B A, move B forward
* check if we hit the end with B
bool ir_block_create_store_op(ir_block *self, int op, ir_value *target, ir_value *what)
{
- if (target->store == store_value) {
- fprintf(stderr, "cannot store to an SSA value\n");
- fprintf(stderr, "trying to store: %s <- %s\n", target->name, what->name);
+ ir_instr *in = ir_instr_new(self, op);
+ if (!in)
+ return false;
+
+ if (target->store == store_value &&
+ (op < INSTR_STOREP_F || op > INSTR_STOREP_FNC))
+ {
+ irerror(self->context, "cannot store to an SSA value");
+ irerror(self->context, "trying to store: %s <- %s", target->name, what->name);
+ irerror(self->context, "instruction: %s", asm_instr[op].m);
return false;
- } else {
- ir_instr *in = ir_instr_new(self, op);
- if (!in)
- return false;
- if (!ir_instr_op(in, 0, target, true) ||
- !ir_instr_op(in, 1, what, false) ||
- !ir_block_instr_add(self, in) )
- {
- return false;
- }
- return true;
}
+
+ if (!ir_instr_op(in, 0, target, true) ||
+ !ir_instr_op(in, 1, what, false) ||
+ !ir_block_instr_add(self, in) )
+ {
+ return false;
+ }
+ return true;
}
bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what)
else
vtype = target->vtype;
- switch (vtype) {
- case TYPE_FLOAT:
#if 0
- if (what->vtype == TYPE_INTEGER)
- op = INSTR_CONV_ITOF;
- else
+ if (vtype == TYPE_FLOAT && what->vtype == TYPE_INTEGER)
+ op = INSTR_CONV_ITOF;
+ else if (vtype == TYPE_INTEGER && what->vtype == TYPE_FLOAT)
+ op = INSTR_CONV_FTOI;
#endif
- op = INSTR_STORE_F;
- break;
- case TYPE_VECTOR:
+ op = type_store_instr[vtype];
+
+ if (OPTS_FLAG(ADJUST_VECTOR_FIELDS)) {
+ if (op == INSTR_STORE_FLD && what->fieldtype == TYPE_VECTOR)
op = INSTR_STORE_V;
- break;
- case TYPE_ENTITY:
- op = INSTR_STORE_ENT;
- break;
- case TYPE_STRING:
- op = INSTR_STORE_S;
- break;
- case TYPE_FIELD:
- op = INSTR_STORE_FLD;
- break;
-#if 0
- case TYPE_INTEGER:
- if (what->vtype == TYPE_INTEGER)
- op = INSTR_CONV_FTOI;
- else
- op = INSTR_STORE_I;
- break;
-#endif
- case TYPE_POINTER:
-#if 0
- op = INSTR_STORE_I;
-#else
- op = INSTR_STORE_ENT;
-#endif
- break;
- default:
- /* Unknown type */
- return false;
}
+
return ir_block_create_store_op(self, op, target, what);
}
*/
vtype = what->vtype;
- switch (vtype) {
- case TYPE_FLOAT:
- op = INSTR_STOREP_F;
- break;
- case TYPE_VECTOR:
+ op = type_storep_instr[vtype];
+ if (OPTS_FLAG(ADJUST_VECTOR_FIELDS)) {
+ if (op == INSTR_STOREP_FLD && what->fieldtype == TYPE_VECTOR)
op = INSTR_STOREP_V;
- break;
- case TYPE_ENTITY:
- op = INSTR_STOREP_ENT;
- break;
- case TYPE_STRING:
- op = INSTR_STOREP_S;
- break;
- case TYPE_FIELD:
- op = INSTR_STOREP_FLD;
- break;
-#if 0
- case TYPE_INTEGER:
- op = INSTR_STOREP_I;
- break;
-#endif
- case TYPE_POINTER:
-#if 0
- op = INSTR_STOREP_I;
-#else
- op = INSTR_STOREP_ENT;
-#endif
- break;
- default:
- /* Unknown type */
- return false;
}
+
return ir_block_create_store_op(self, op, target, what);
}
{
ir_instr *in;
if (self->final) {
- fprintf(stderr, "block already ended (%s)\n", self->label);
+ irerror(self->context, "block already ended (%s)", self->label);
return false;
}
self->final = true;
if (!in)
return false;
- if (!ir_instr_op(in, 0, v, false) ||
- !ir_block_instr_add(self, in) )
- {
+ if (v && !ir_instr_op(in, 0, v, false))
+ return false;
+
+ if (!ir_block_instr_add(self, in))
return false;
- }
return true;
}
{
ir_instr *in;
if (self->final) {
- fprintf(stderr, "block already ended (%s)\n", self->label);
+ irerror(self->context, "block already ended (%s)", self->label);
return false;
}
self->final = true;
{
ir_instr *in;
if (self->final) {
- fprintf(stderr, "block already ended (%s)\n", self->label);
+ irerror(self->context, "block already ended (%s)", self->label);
return false;
}
self->final = true;
{
ir_instr *in;
if (self->final) {
- fprintf(stderr, "block already ended (%s)\n", self->label);
+ irerror(self->context, "block already ended (%s)", self->label);
return false;
}
self->final = true;
/* Must not be possible to cause this, otherwise the AST
* is doing something wrong.
*/
- fprintf(stderr, "Invalid entry block for PHI\n");
+ irerror(self->context, "Invalid entry block for PHI");
abort();
}
in = ir_instr_new(self, INSTR_CALL0);
if (!in)
return NULL;
- out = ir_value_out(self->owner, label, store_return, func->outtype);
+ 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;
return ir_block_create_general_instr(self, label, opcode, left, right, ot);
}
+ir_value* ir_block_create_unary(ir_block *self,
+ const char *label, int opcode,
+ ir_value *operand)
+{
+ int ot = TYPE_FLOAT;
+ switch (opcode) {
+ case INSTR_NOT_F:
+ case INSTR_NOT_V:
+ case INSTR_NOT_S:
+ case INSTR_NOT_ENT:
+ case INSTR_NOT_FNC:
+#if 0
+ case INSTR_NOT_I:
+#endif
+ ot = TYPE_FLOAT;
+ break;
+ /* QC doesn't have other unary operations. We expect extensions to fill
+ * the above list, otherwise we assume out-type = in-type, eg for an
+ * unary minus
+ */
+ default:
+ ot = operand->vtype;
+ break;
+ };
+ if (ot == TYPE_VOID) {
+ /* The AST or parser were supposed to check this! */
+ return NULL;
+ }
+
+ /* let's use the general instruction creator and pass NULL for OPB */
+ return ir_block_create_general_instr(self, label, opcode, operand, NULL, ot);
+}
+
ir_value* ir_block_create_general_instr(ir_block *self, const char *label,
int op, ir_value *a, ir_value *b, int outype)
{
ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_value *ent, ir_value *field)
{
+ ir_value *v;
+
/* Support for various pointer types todo if so desired */
if (ent->vtype != TYPE_ENTITY)
return NULL;
if (field->vtype != TYPE_FIELD)
return NULL;
- return ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER);
+ v = ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER);
+ v->fieldtype = field->fieldtype;
+ return v;
}
ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_value *ent, ir_value *field, int outype)
switch (outype)
{
- case TYPE_FLOAT: op = INSTR_LOAD_F; break;
- case TYPE_VECTOR: op = INSTR_LOAD_V; break;
- case TYPE_STRING: op = INSTR_LOAD_S; break;
- case TYPE_FIELD: op = INSTR_LOAD_FLD; break;
- case TYPE_ENTITY: op = INSTR_LOAD_ENT; break;
+ case TYPE_FLOAT: op = INSTR_LOAD_F; break;
+ case TYPE_VECTOR: op = INSTR_LOAD_V; break;
+ case TYPE_STRING: op = INSTR_LOAD_S; break;
+ case TYPE_FIELD: op = INSTR_LOAD_FLD; break;
+ case TYPE_ENTITY: op = INSTR_LOAD_ENT; break;
+ case TYPE_FUNCTION: op = INSTR_LOAD_FNC; break;
#if 0
case TYPE_POINTER: op = INSTR_LOAD_I; break;
case TYPE_INTEGER: op = INSTR_LOAD_I; break;
if (v->writes[w]->_ops[0] == v)
v->writes[w]->_ops[0] = instr->_ops[0];
- if (old->store != store_value && old->store != store_local)
+ if (old->store != store_value && old->store != store_local && old->store != store_param)
{
/* If it originally wrote to a global we need to store the value
* there as welli
}
}
} while (changed);
+ if (self->blocks_count) {
+ ir_block *block = self->blocks[0];
+ for (i = 0; i < block->living_count; ++i) {
+ ir_value *v = block->living[i];
+ if (v->memberof || v->store != store_local)
+ continue;
+ if (irwarning(v->context, WARN_USED_UNINITIALIZED,
+ "variable `%s` may be used uninitialized in this function", v->name))
+ {
+ return false;
+ }
+ }
+ }
return true;
}
function_allocator alloc;
+ if (!self->locals_count && !self->values_count)
+ return true;
+
MEM_VECTOR_INIT(&alloc, locals);
MEM_VECTOR_INIT(&alloc, sizes);
MEM_VECTOR_INIT(&alloc, positions);
}
}
+ if (!alloc.sizes) {
+ goto cleanup;
+ }
+
/* Adjust slot positions based on sizes */
if (!function_allocator_positions_add(&alloc, 0))
goto error;
self->allocated_locals = pos + alloc.sizes[alloc.sizes_count-1];
/* Take over the actual slot positions */
- for (i = 0; i < self->values_count; ++i)
+ for (i = 0; i < self->values_count; ++i) {
self->values[i]->code.local = alloc.positions[self->values[i]->code.local];
+ }
goto cleanup;
*write = 0;
*read = 1;
break;
+ case INSTR_STOREP_F:
+ case INSTR_STOREP_V:
+ case INSTR_STOREP_S:
+ case INSTR_STOREP_ENT:
+ case INSTR_STOREP_FLD:
+ case INSTR_STOREP_FNC:
+ *write = 0;
+ *read = 7;
+ break;
default:
*write = 1;
*read = 6;
tempbool = ir_value_life_merge(self->living[i], eid);
/* debug
if (tempbool)
- fprintf(stderr, "block_living_add_instr() value instruction added %s: %i\n", self->living[i]->_name, (int)eid);
+ irerror(self->context, "block_living_add_instr() value instruction added %s: %i", self->living[i]->_name, (int)eid);
*/
changed = changed || tempbool;
}
if (!ir_block_living_add(self, prev->living[i]))
return false;
/*
- printf("%s got from prev: %s\n", self->label, prev->living[i]->_name);
+ irerror(self->contextt from prev: %s", self->label, prev->living[i]->_name);
*/
}
return true;
size_t i, o, p;
/* bitmasks which operands are read from or written to */
size_t read, write;
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- size_t rd;
- new_reads_t new_reads;
-#endif
char dbg_ind[16] = { '#', '0' };
(void)dbg_ind;
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- MEM_VECTOR_INIT(&new_reads, v);
-#endif
-
if (prev)
{
if (!ir_block_life_prop_previous(self, prev, changed))
for (p = 0; p < instr->phi_count; ++p)
{
value = instr->phi[p].value;
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
+ if (value->memberof)
+ value = value->memberof;
if (!ir_block_living_find(self, value, NULL) &&
!ir_block_living_add(self, value))
{
- goto on_error;
+ return false;
}
-#else
- if (!new_reads_t_v_find(&new_reads, value, NULL))
+ }
+
+ /* call params are read operands too */
+ for (p = 0; p < instr->params_count; ++p)
+ {
+ value = instr->params[p];
+ if (value->memberof)
+ value = value->memberof;
+ if (!ir_block_living_find(self, value, NULL) &&
+ !ir_block_living_add(self, value))
{
- if (!new_reads_t_v_add(&new_reads, value))
- goto on_error;
+ return false;
}
-#endif
}
/* See which operands are read and write operands */
continue;
value = instr->_ops[o];
+ if (value->memberof)
+ value = value->memberof;
/* We only care about locals */
+ /* we also calculate parameter liferanges so that locals
+ * can take up parameter slots */
if (value->store != store_value &&
- value->store != store_local)
+ value->store != store_local &&
+ value->store != store_param)
continue;
/* read operands */
if (read & (1<<o))
{
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
if (!ir_block_living_find(self, value, NULL) &&
!ir_block_living_add(self, value))
{
- goto on_error;
- }
-#else
- /* fprintf(stderr, "read: %s\n", value->_name); */
- if (!new_reads_t_v_find(&new_reads, value, NULL))
- {
- if (!new_reads_t_v_add(&new_reads, value))
- goto on_error;
+ return false;
}
-#endif
}
/* write operands */
{
size_t idx;
bool in_living = ir_block_living_find(self, value, &idx);
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- size_t readidx;
- bool in_reads = new_reads_t_v_find(&new_reads, value, &readidx);
- if (!in_living && !in_reads)
-#else
if (!in_living)
-#endif
{
/* If the value isn't alive it hasn't been read before... */
/* TODO: See if the warning can be emitted during parsing or AST processing
* since this function is run multiple times.
*/
/* For now: debug info: */
- fprintf(stderr, "Value only written %s\n", value->name);
+ /* fprintf(stderr, "Value only written %s\n", value->name); */
tempbool = ir_value_life_merge(value, instr->eid);
*changed = *changed || tempbool;
/*
*/
*changed = *changed || tempbool;
/* Then remove */
-#if ! defined(LIFE_RANGE_WITHOUT_LAST_READ)
if (!ir_block_living_remove(self, idx))
- goto on_error;
-#else
- if (in_reads)
- {
- if (!new_reads_t_v_remove(&new_reads, readidx))
- goto on_error;
- }
-#endif
+ return false;
}
}
}
/*fprintf(stderr, "living added values\n");*/
*changed = *changed || tempbool;
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- /* new reads: */
- for (rd = 0; rd < new_reads.v_count; ++rd)
- {
- if (!ir_block_living_find(self, new_reads.v[rd], NULL)) {
- if (!ir_block_living_add(self, new_reads.v[rd]))
- goto on_error;
- }
- if (!i && !self->entries_count) {
- /* fix the top */
- *changed = *changed || ir_value_life_merge(new_reads.v[rd], instr->eid);
- }
- }
- MEM_VECTOR_CLEAR(&new_reads, v);
-#endif
}
if (self->run_id == self->owner->run_id)
}
return true;
-on_error:
-#if defined(LIFE_RANGE_WITHOUT_LAST_READ)
- MEM_VECTOR_CLEAR(&new_reads, v);
-#endif
- return false;
}
/***********************************************************************
{
ir_value *fld = global->constval.vpointer;
if (!fld) {
- printf("Invalid field constant with no field: %s\n", global->name);
+ irerror(global->context, "Invalid field constant with no field: %s", global->name);
return false;
}
* for functions... might as well support that here.
*/
if (!fld->code.globaladdr) {
- printf("FIXME: Relocation support\n");
+ irerror(global->context, "FIXME: Relocation support");
return false;
}
/* copy the field's value */
- global->code.globaladdr = code_globals_add(code_globals_data[fld->code.globaladdr]);
+ ir_value_code_setaddr(global, code_globals_add(code_globals_data[fld->code.globaladdr]));
+ if (global->fieldtype == TYPE_VECTOR) {
+ code_globals_add(code_globals_data[fld->code.globaladdr]+1);
+ code_globals_add(code_globals_data[fld->code.globaladdr]+2);
+ }
}
else
{
- prog_section_field fld;
-
- fld.name = global->code.name;
- fld.offset = code_fields_elements;
- fld.type = global->fieldtype;
-
- if (fld.type == TYPE_VOID) {
- printf("Field is missing a type: %s\n", global->name);
- return false;
+ ir_value_code_setaddr(global, code_globals_add(0));
+ if (global->fieldtype == TYPE_VECTOR) {
+ code_globals_add(0);
+ code_globals_add(0);
}
-
- if (code_fields_add(fld) < 0)
- return false;
-
- global->code.globaladdr = code_globals_add(fld.offset);
}
if (global->code.globaladdr < 0)
return false;
{
ir_value *target = global->constval.vpointer;
if (!target) {
- printf("Invalid pointer constant: %s\n", global->name);
+ irerror(global->context, "Invalid pointer constant: %s", global->name);
/* NULL pointers are pointing to the NULL constant, which also
* sits at address 0, but still has an ir_value for itself.
*/
/* FIXME: Check for the constant nullptr ir_value!
* because then code.globaladdr being 0 is valid.
*/
- printf("FIXME: Relocation support\n");
+ irerror(global->context, "FIXME: Relocation support");
return false;
}
- global->code.globaladdr = code_globals_add(target->code.globaladdr);
+ ir_value_code_setaddr(global, code_globals_add(target->code.globaladdr));
}
else
{
- global->code.globaladdr = code_globals_add(0);
+ ir_value_code_setaddr(global, code_globals_add(0));
}
if (global->code.globaladdr < 0)
return false;
instr = block->instr[i];
if (instr->opcode == VINSTR_PHI) {
- printf("cannot generate virtual instruction (phi)\n");
+ irerror(block->context, "cannot generate virtual instruction (phi)");
return false;
}
* come first: eg. optimize IFs without ELSE...
*/
- stmt.o1.u1 = instr->_ops[0]->code.globaladdr;
+ stmt.o1.u1 = ir_value_code_addr(instr->_ops[0]);
stmt.o2.u1 = 0;
stmt.o3.s1 = 0;
if (ontrue->generated) {
stmt.opcode = INSTR_IF;
- stmt.o2.s1 = (ontrue->code_start-1) - code_statements_elements;
+ stmt.o2.s1 = (ontrue->code_start) - code_statements_elements;
if (code_statements_add(stmt) < 0)
return false;
}
if (onfalse->generated) {
stmt.opcode = INSTR_IFNOT;
- stmt.o2.s1 = (onfalse->code_start-1) - code_statements_elements;
+ stmt.o2.s1 = (onfalse->code_start) - code_statements_elements;
if (code_statements_add(stmt) < 0)
return false;
}
stmt.o3.u1 = 0;
stmt.opcode = type_store_instr[param->vtype];
- stmt.o1.u1 = param->code.globaladdr;
+ stmt.o1.u1 = ir_value_code_addr(param);
stmt.o2.u1 = OFS_PARM0 + 3 * p;
if (code_statements_add(stmt) < 0)
return false;
stmt.opcode = INSTR_CALL0 + instr->params_count;
if (stmt.opcode > INSTR_CALL8)
stmt.opcode = INSTR_CALL8;
- stmt.o1.u1 = instr->_ops[1]->code.globaladdr;
+ stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]);
stmt.o2.u1 = 0;
stmt.o3.u1 = 0;
if (code_statements_add(stmt) < 0)
/* not to be kept in OFS_RETURN */
stmt.opcode = type_store_instr[retvalue->vtype];
stmt.o1.u1 = OFS_RETURN;
- stmt.o2.u1 = retvalue->code.globaladdr;
+ stmt.o2.u1 = ir_value_code_addr(retvalue);
stmt.o3.u1 = 0;
if (code_statements_add(stmt) < 0)
return false;
}
- return false;
+ continue;
}
if (instr->opcode == INSTR_STATE) {
- printf("TODO: state instruction\n");
+ irerror(block->context, "TODO: state instruction");
return false;
}
/* This is the general order of operands */
if (instr->_ops[0])
- stmt.o3.u1 = instr->_ops[0]->code.globaladdr;
+ stmt.o3.u1 = ir_value_code_addr(instr->_ops[0]);
if (instr->_ops[1])
- stmt.o1.u1 = instr->_ops[1]->code.globaladdr;
+ stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]);
if (instr->_ops[2])
- stmt.o2.u1 = instr->_ops[2]->code.globaladdr;
+ stmt.o2.u1 = ir_value_code_addr(instr->_ops[2]);
if (stmt.opcode == INSTR_RETURN || stmt.opcode == INSTR_DONE)
{
stmt.o1.u1 = stmt.o3.u1;
stmt.o3.u1 = 0;
}
- else if ((stmt.opcode >= INSTR_STORE_F &&
- stmt.opcode <= INSTR_STORE_FNC) ||
- (stmt.opcode >= INSTR_NOT_F &&
- stmt.opcode <= INSTR_NOT_FNC))
+ else if ((stmt.opcode >= INSTR_STORE_F &&
+ stmt.opcode <= INSTR_STORE_FNC) ||
+ (stmt.opcode >= INSTR_STOREP_F &&
+ stmt.opcode <= INSTR_STOREP_FNC))
{
/* 2-operand instructions with A -> B */
stmt.o2.u1 = stmt.o3.u1;
static bool gen_function_code(ir_function *self)
{
ir_block *block;
+ prog_section_statement stmt;
/* Starting from entry point, we generate blocks "as they come"
* for now. Dead blocks will not be translated obviously.
*/
if (!self->blocks_count) {
- printf("Function '%s' declared without body.\n", self->name);
+ irerror(self->context, "Function '%s' declared without body.", self->name);
return false;
}
return true;
if (!gen_blocks_recursive(self, block)) {
- printf("failed to generate blocks for '%s'\n", self->name);
+ irerror(self->context, "failed to generate blocks for '%s'", self->name);
return false;
}
+
+ /* otherwise code_write crashes since it debug-prints functions until AINSTR_END */
+ stmt.opcode = AINSTR_END;
+ stmt.o1.u1 = 0;
+ stmt.o2.u1 = 0;
+ stmt.o3.u1 = 0;
+ if (code_statements_add(stmt) < 0)
+ return false;
return true;
}
if (!global->isconst || (!global->constval.vfunc))
{
- printf("Invalid state of function-global: not constant: %s\n", global->name);
+ irerror(global->context, "Invalid state of function-global: not constant: %s", global->name);
return false;
}
for (i = 0;i < 8; ++i) {
if (i >= fun.nargs)
fun.argsize[i] = 0;
- else if (irfun->params[i] == TYPE_VECTOR)
- fun.argsize[i] = 3;
else
- fun.argsize[i] = 1;
+ fun.argsize[i] = type_sizeof[irfun->params[i]];
}
fun.firstlocal = code_globals_elements;
fun.locals = irfun->allocated_locals + irfun->locals_count;
- local_var_end = 0;
+ local_var_end = fun.firstlocal;
for (i = 0; i < irfun->locals_count; ++i) {
if (!ir_builder_gen_global(ir, irfun->locals[i])) {
- printf("Failed to generate global %s\n", irfun->locals[i]->name);
+ irerror(irfun->locals[i]->context, "Failed to generate local %s", irfun->locals[i]->name);
return false;
}
}
{
/* generate code.globaladdr for ssa values */
ir_value *v = irfun->values[i];
- v->code.globaladdr = local_var_end + v->code.local;
+ ir_value_code_setaddr(v, local_var_end + v->code.local);
}
- for (i = 0; i < irfun->locals_count; ++i) {
+ for (i = 0; i < irfun->allocated_locals; ++i) {
/* fill the locals with zeros */
code_globals_add(0);
}
if (irfun->builtin)
fun.entry = irfun->builtin;
else {
+ irfun->code_function_def = code_functions_elements;
fun.entry = code_statements_elements;
- if (!gen_function_code(irfun)) {
- printf("Failed to generate code for function %s\n", irfun->name);
- return false;
- }
}
return (code_functions_add(fun) >= 0);
}
+static bool gen_global_function_code(ir_builder *ir, ir_value *global)
+{
+ prog_section_function *fundef;
+ ir_function *irfun;
+
+ irfun = global->constval.vfunc;
+ if (irfun->builtin)
+ return true;
+
+ if (irfun->code_function_def < 0) {
+ irerror(irfun->context, "`%s`: IR global wasn't generated, failed to access function-def", irfun->name);
+ return false;
+ }
+ fundef = &code_functions_data[irfun->code_function_def];
+
+ fundef->entry = code_statements_elements;
+ if (!gen_function_code(irfun)) {
+ irerror(irfun->context, "Failed to generate code for function %s", irfun->name);
+ return false;
+ }
+ return true;
+}
+
static bool ir_builder_gen_global(ir_builder *self, ir_value *global)
{
+ size_t i;
int32_t *iptr;
prog_section_def def;
if (global->isconst) {
iptr = (int32_t*)&global->constval.vfloat;
- global->code.globaladdr = code_globals_add(*iptr);
+ ir_value_code_setaddr(global, code_globals_add(*iptr));
} else
- global->code.globaladdr = code_globals_add(0);
+ ir_value_code_setaddr(global, code_globals_add(0));
return global->code.globaladdr >= 0;
}
if (code_defs_add(def) < 0)
return false;
if (global->isconst)
- global->code.globaladdr = code_globals_add(code_cachedstring(global->constval.vstring));
+ ir_value_code_setaddr(global, code_globals_add(code_cachedstring(global->constval.vstring)));
else
- global->code.globaladdr = code_globals_add(0);
+ ir_value_code_setaddr(global, code_globals_add(0));
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;
- global->code.globaladdr = code_globals_add(iptr[0]);
- if (code_globals_add(iptr[1]) < 0 || code_globals_add(iptr[2]) < 0)
+ ir_value_code_setaddr(global, code_globals_add(iptr[0]));
+ if (global->code.globaladdr < 0)
return false;
+ for (d = 1; d < type_sizeof[global->vtype]; ++d)
+ {
+ if (code_globals_add(iptr[d]) < 0)
+ return false;
+ }
} else {
- global->code.globaladdr = code_globals_add(0);
- if (code_globals_add(0) < 0 || code_globals_add(0) < 0)
+ ir_value_code_setaddr(global, code_globals_add(0));
+ if (global->code.globaladdr < 0)
return false;
+ for (d = 1; d < type_sizeof[global->vtype]; ++d)
+ {
+ if (code_globals_add(0) < 0)
+ return false;
+ }
}
return global->code.globaladdr >= 0;
}
case TYPE_FUNCTION:
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);
case TYPE_VARIANT:
/* assume biggest type */
- global->code.globaladdr = code_globals_add(0);
- code_globals_add(0);
- code_globals_add(0);
+ ir_value_code_setaddr(global, code_globals_add(0));
+ for (i = 1; i < type_sizeof[TYPE_VARIANT]; ++i)
+ code_globals_add(0);
return true;
default:
/* refuse to create 'void' type or any other fancy business. */
- printf("Invalid type for global variable %s\n", global->name);
+ irerror(global->context, "Invalid type for global variable `%s`: %s",
+ global->name, type_name[global->vtype]);
+ return false;
+ }
+}
+
+static bool ir_builder_gen_field(ir_builder *self, ir_value *field)
+{
+ prog_section_def def;
+ prog_section_field fld;
+
+ def.type = field->vtype;
+ def.offset = code_globals_elements;
+
+ /* create a global named the same as the field */
+ if (opts_standard == COMPILER_GMQCC) {
+ /* in our standard, the global gets a dot prefix */
+ size_t len = strlen(field->name);
+ char name[1024];
+
+ /* we really don't want to have to allocate this, and 1024
+ * bytes is more than enough for a variable/field name
+ */
+ if (len+2 >= sizeof(name)) {
+ irerror(field->context, "invalid field name size: %u", (unsigned int)len);
+ return false;
+ }
+
+ name[0] = '.';
+ memcpy(name+1, field->name, len); /* no strncpy - we used strlen above */
+ name[len+1] = 0;
+
+ def.name = code_genstring(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,
+ * and so we also name the global the same.
+ * FIXME: fteqcc should create a global as well
+ * check if it actually uses the same name. Probably does
+ */
+ def.name = code_genstring(field->name);
+ fld.name = def.name;
+ }
+
+ field->code.name = def.name;
+
+ if (code_defs_add(def) < 0)
+ return false;
+
+ fld.type = field->fieldtype;
+
+ if (fld.type == TYPE_VOID) {
+ irerror(field->context, "field is missing a type: %s - don't know its size", field->name);
return false;
}
+
+ fld.offset = code_alloc_field(type_sizeof[field->fieldtype]);
+
+ if (code_fields_add(fld) < 0)
+ return false;
+
+ ir_value_code_setaddr(field, code_globals_elements);
+ if (!code_globals_add(fld.offset))
+ return false;
+ if (fld.type == TYPE_VECTOR) {
+ if (!code_globals_add(fld.offset+1))
+ return false;
+ if (!code_globals_add(fld.offset+2))
+ return false;
+ }
+
+ return field->code.globaladdr >= 0;
}
bool ir_builder_generate(ir_builder *self, const char *filename)
code_init();
+ for (i = 0; i < self->fields_count; ++i)
+ {
+ if (!ir_builder_gen_field(self, self->fields[i])) {
+ return false;
+ }
+ }
+
for (i = 0; i < self->globals_count; ++i)
{
if (!ir_builder_gen_global(self, self->globals[i])) {
}
}
+ /* generate function code */
+ for (i = 0; i < self->globals_count; ++i)
+ {
+ if (self->globals[i]->vtype == TYPE_FUNCTION) {
+ if (!gen_global_function_code(self, self->globals[i])) {
+ return false;
+ }
+ }
+ }
+
printf("writing '%s'...\n", filename);
return code_write(filename);
}
#define IND_BUFSZ 1024
+#ifdef WIN32
+# define strncat(dst, src, sz) strncat_s(dst, sz, src, _TRUNCATE)
+#else
+# define strncat strncat
+#endif
+
const char *qc_opname(int op)
{
if (op < 0) return "<INVALID>";
void ir_builder_dump(ir_builder *b, int (*oprintf)(const char*, ...))
{
- size_t i;
- char indent[IND_BUFSZ];
- indent[0] = '\t';
- indent[1] = 0;
-
- oprintf("module %s\n", b->name);
- for (i = 0; i < b->globals_count; ++i)
- {
- oprintf("global ");
- if (b->globals[i]->isconst)
- oprintf("%s = ", b->globals[i]->name);
- ir_value_dump(b->globals[i], oprintf);
- oprintf("\n");
- }
- for (i = 0; i < b->functions_count; ++i)
- ir_function_dump(b->functions[i], indent, oprintf);
- oprintf("endmodule %s\n", b->name);
+ size_t i;
+ char indent[IND_BUFSZ];
+ indent[0] = '\t';
+ indent[1] = 0;
+
+ oprintf("module %s\n", b->name);
+ for (i = 0; i < b->globals_count; ++i)
+ {
+ oprintf("global ");
+ if (b->globals[i]->isconst)
+ oprintf("%s = ", b->globals[i]->name);
+ ir_value_dump(b->globals[i], oprintf);
+ oprintf("\n");
+ }
+ for (i = 0; i < b->functions_count; ++i)
+ ir_function_dump(b->functions[i], indent, oprintf);
+ oprintf("endmodule %s\n", b->name);
}
void ir_function_dump(ir_function *f, char *ind,
int (*oprintf)(const char*, ...))
{
- size_t i;
- oprintf("%sfunction %s\n", ind, f->name);
- strncat(ind, "\t", IND_BUFSZ);
- if (f->locals_count)
- {
- oprintf("%s%i locals:\n", ind, (int)f->locals_count);
- for (i = 0; i < f->locals_count; ++i) {
- oprintf("%s\t", ind);
- ir_value_dump(f->locals[i], oprintf);
- oprintf("\n");
- }
- }
- if (f->blocks_count)
- {
- oprintf("%slife passes (check): %i\n", ind, (int)f->run_id);
- for (i = 0; i < f->blocks_count; ++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);
- }
-
- }
- ind[strlen(ind)-1] = 0;
- oprintf("%sendfunction %s\n", ind, f->name);
+ size_t i;
+ if (f->builtin != 0) {
+ oprintf("%sfunction %s = builtin %i\n", ind, f->name, -f->builtin);
+ return;
+ }
+ oprintf("%sfunction %s\n", ind, f->name);
+ strncat(ind, "\t", IND_BUFSZ);
+ if (f->locals_count)
+ {
+ oprintf("%s%i locals:\n", ind, (int)f->locals_count);
+ for (i = 0; i < f->locals_count; ++i) {
+ oprintf("%s\t", ind);
+ ir_value_dump(f->locals[i], oprintf);
+ oprintf("\n");
+ }
+ }
+ if (f->blocks_count)
+ {
+ oprintf("%slife passes (check): %i\n", ind, (int)f->run_id);
+ for (i = 0; i < f->blocks_count; ++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);
+ }
+
+ }
+ ind[strlen(ind)-1] = 0;
+ oprintf("%sendfunction %s\n", ind, f->name);
}
void ir_block_dump(ir_block* b, char *ind,
int (*oprintf)(const char*, ...))
{
- size_t i;
- oprintf("%s:%s\n", ind, b->label);
- strncat(ind, "\t", IND_BUFSZ);
+ size_t i;
+ oprintf("%s:%s\n", ind, b->label);
+ strncat(ind, "\t", IND_BUFSZ);
- for (i = 0; i < b->instr_count; ++i)
- ir_instr_dump(b->instr[i], ind, oprintf);
- ind[strlen(ind)-1] = 0;
+ for (i = 0; i < b->instr_count; ++i)
+ ir_instr_dump(b->instr[i], ind, oprintf);
+ ind[strlen(ind)-1] = 0;
}
void dump_phi(ir_instr *in, char *ind,
int (*oprintf)(const char*, ...))
{
- size_t i;
- oprintf("%s <- phi ", in->_ops[0]->name);
- for (i = 0; i < in->phi_count; ++i)
- {
- oprintf("([%s] : %s) ", in->phi[i].from->label,
- in->phi[i].value->name);
- }
- oprintf("\n");
+ size_t i;
+ oprintf("%s <- phi ", in->_ops[0]->name);
+ for (i = 0; i < in->phi_count; ++i)
+ {
+ oprintf("([%s] : %s) ", in->phi[i].from->label,
+ in->phi[i].value->name);
+ }
+ oprintf("\n");
}
void ir_instr_dump(ir_instr *in, char *ind,
int (*oprintf)(const char*, ...))
{
- size_t i;
- const char *comma = NULL;
-
- oprintf("%s (%i) ", ind, (int)in->eid);
-
- if (in->opcode == VINSTR_PHI) {
- dump_phi(in, ind, oprintf);
- return;
- }
-
- strncat(ind, "\t", IND_BUFSZ);
-
- if (in->_ops[0] && (in->_ops[1] || in->_ops[2])) {
- ir_value_dump(in->_ops[0], oprintf);
- if (in->_ops[1] || in->_ops[2])
- oprintf(" <- ");
- }
- oprintf("%s\t", qc_opname(in->opcode));
- if (in->_ops[0] && !(in->_ops[1] || in->_ops[2])) {
- ir_value_dump(in->_ops[0], oprintf);
- comma = ",\t";
- }
- else
- {
- for (i = 1; i != 3; ++i) {
- if (in->_ops[i]) {
- if (comma)
- oprintf(comma);
- ir_value_dump(in->_ops[i], oprintf);
- comma = ",\t";
- }
- }
- }
- if (in->bops[0]) {
- if (comma)
- oprintf(comma);
- oprintf("[%s]", in->bops[0]->label);
- comma = ",\t";
- }
- if (in->bops[1])
- oprintf("%s[%s]", comma, in->bops[1]->label);
- oprintf("\n");
- ind[strlen(ind)-1] = 0;
+ size_t i;
+ const char *comma = NULL;
+
+ oprintf("%s (%i) ", ind, (int)in->eid);
+
+ if (in->opcode == VINSTR_PHI) {
+ dump_phi(in, ind, oprintf);
+ return;
+ }
+
+ strncat(ind, "\t", IND_BUFSZ);
+
+ if (in->_ops[0] && (in->_ops[1] || in->_ops[2])) {
+ ir_value_dump(in->_ops[0], oprintf);
+ if (in->_ops[1] || in->_ops[2])
+ oprintf(" <- ");
+ }
+ if (in->opcode == INSTR_CALL0) {
+ oprintf("CALL%i\t", in->params_count);
+ } else
+ oprintf("%s\t", qc_opname(in->opcode));
+
+ if (in->_ops[0] && !(in->_ops[1] || in->_ops[2])) {
+ ir_value_dump(in->_ops[0], oprintf);
+ comma = ",\t";
+ }
+ else
+ {
+ for (i = 1; i != 3; ++i) {
+ if (in->_ops[i]) {
+ if (comma)
+ oprintf(comma);
+ ir_value_dump(in->_ops[i], oprintf);
+ comma = ",\t";
+ }
+ }
+ }
+ if (in->bops[0]) {
+ if (comma)
+ oprintf(comma);
+ oprintf("[%s]", in->bops[0]->label);
+ comma = ",\t";
+ }
+ if (in->bops[1])
+ oprintf("%s[%s]", comma, in->bops[1]->label);
+ oprintf("\n");
+ ind[strlen(ind)-1] = 0;
}
void ir_value_dump(ir_value* v, int (*oprintf)(const char*, ...))
{
- if (v->isconst) {
- switch (v->vtype) {
- case TYPE_VOID:
- oprintf("(void)");
- break;
- case TYPE_FLOAT:
- oprintf("%g", v->constval.vfloat);
- break;
- case TYPE_VECTOR:
- oprintf("'%g %g %g'",
- v->constval.vvec.x,
- v->constval.vvec.y,
- v->constval.vvec.z);
- break;
- case TYPE_ENTITY:
- oprintf("(entity)");
- break;
- case TYPE_STRING:
- oprintf("\"%s\"", v->constval.vstring);
- break;
+ if (v->isconst) {
+ switch (v->vtype) {
+ default:
+ case TYPE_VOID:
+ oprintf("(void)");
+ break;
+ case TYPE_FUNCTION:
+ oprintf("(function)");
+ break;
+ case TYPE_FLOAT:
+ oprintf("%g", v->constval.vfloat);
+ break;
+ case TYPE_VECTOR:
+ oprintf("'%g %g %g'",
+ v->constval.vvec.x,
+ v->constval.vvec.y,
+ v->constval.vvec.z);
+ break;
+ case TYPE_ENTITY:
+ oprintf("(entity)");
+ break;
+ case TYPE_STRING:
+ oprintf("\"%s\"", v->constval.vstring);
+ break;
#if 0
- case TYPE_INTEGER:
- oprintf("%i", v->constval.vint);
- break;
+ case TYPE_INTEGER:
+ oprintf("%i", v->constval.vint);
+ break;
#endif
- case TYPE_POINTER:
- oprintf("&%s",
- v->constval.vpointer->name);
- break;
- }
- } else {
- oprintf("%s", v->name);
- }
+ case TYPE_POINTER:
+ oprintf("&%s",
+ v->constval.vpointer->name);
+ break;
+ }
+ } else {
+ oprintf("%s", v->name);
+ }
}
void ir_value_dump_life(ir_value *self, int (*oprintf)(const char*,...))
{
- size_t i;
- oprintf("Life of %s:\n", self->name);
- for (i = 0; i < self->life_count; ++i)
- {
- oprintf(" + [%i, %i]\n", self->life[i].start, self->life[i].end);
- }
+ size_t i;
+ oprintf("Life of %s:\n", 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