Same style fixups for ir_instr

This commit is contained in:
Wolfgang (Blub) Bumiller 2012-04-25 14:56:47 +02:00
parent 38532ceb11
commit be620ff431

72
ir.c
View file

@ -82,7 +82,7 @@ ir_value* ir_builder_get_global(ir_builder *self, const char *name)
return NULL;
}
ir_value* ir_builder_create_global(ir_builder *self, const char *name, ir_type_t vtype)
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) {
@ -247,48 +247,48 @@ void ir_block_set_label(ir_block *self, const char *name)
*IR Instructions
*/
ir_instr* ir_instr_new(ir_block* owner, ir_op_t op)
ir_instr* ir_instr_new(ir_block* owner, int op)
{
ir_instr *self;
self = (ir_instr*)malloc(sizeof(*self));
self->owner = owner;
self->context.file = "<@no context>";
self->context.line = 0;
self->opcode = op;
self->_ops[0] = NULL;
self->_ops[1] = NULL;
self->_ops[2] = NULL;
self->bops[0] = NULL;
self->bops[1] = NULL;
VEC_INIT(self, phi);
ir_instr *self;
self = (ir_instr*)mem_a(sizeof(*self));
self->owner = owner;
self->context.file = "<@no context>";
self->context.line = 0;
self->opcode = op;
self->_ops[0] = NULL;
self->_ops[1] = NULL;
self->_ops[2] = NULL;
self->bops[0] = NULL;
self->bops[1] = NULL;
MEM_VECTOR_INIT(self, phi);
self->eid = 0;
return self;
self->eid = 0;
return self;
}
MAKE_VEC_ADD(ir_instr, ir_phi_entry_t, phi)
MEM_VECTOR_FUNCTIONS(ir_instr, ir_phi_entry_t, phi)
void ir_instr_delete(ir_instr *self)
{
ir_instr_op(self, 0, NULL, ifalse);
ir_instr_op(self, 1, NULL, ifalse);
ir_instr_op(self, 2, NULL, ifalse);
VEC_CLEAR(self, phi);
free(self);
ir_instr_op(self, 0, NULL, ifalse);
ir_instr_op(self, 1, NULL, ifalse);
ir_instr_op(self, 2, NULL, ifalse);
MEM_VECTOR_CLEAR(self, phi);
mem_d(self);
}
void ir_instr_op(ir_instr *self, int op, ir_value *v, ir_bool writing)
void ir_instr_op(ir_instr *self, int op, ir_value *v, qbool writing)
{
if (self->_ops[op]) {
if (writing)
ir_value_writes_add(self->_ops[op], self);
else
ir_value_reads_add(self->_ops[op], self);
}
if (v) {
if (writing)
ir_value_writes_add(v, self);
else
ir_value_reads_add(v, self);
}
self->_ops[op] = v;
if (self->_ops[op]) {
if (writing)
ir_value_writes_add(self->_ops[op], self);
else
ir_value_reads_add(self->_ops[op], self);
}
if (v) {
if (writing)
ir_value_writes_add(v, self);
else
ir_value_reads_add(v, self);
}
self->_ops[op] = v;
}