darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-25 12:41:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Same style fixup for ir_block as previous commits for function

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-04-25 14:54:37 +02:00
parent 2e0feca040
commit dbe1b56f48
1 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ir.c
View file

@ -201,49 +201,44 @@ ir_value* ir_function_create_local(ir_function *self, const char *name, int vtyp
ir_block* ir_block_new(ir_function* owner, const char *name) ir_block* ir_block_new(ir_function* owner, const char *name)
{ {
ir_block *self; ir_block *self;
self = (ir_block*)malloc(sizeof(*self)); self = (ir_block*)mem_a(sizeof(*self));
self->owner = owner; self->owner = owner;
self->context.file = "<@no context>"; self->context.file = "<@no context>";
self->context.line = 0; self->context.line = 0;
self->final = ifalse; self->final = ifalse;
VEC_INIT(self, instr); MEM_VECTOR_INIT(self, instr);
VEC_INIT(self, entries); MEM_VECTOR_INIT(self, entries);
VEC_INIT(self, exits); MEM_VECTOR_INIT(self, exits);
self->_label = NULL; self->label = NULL;
ir_block_set_label(self, name); ir_block_set_label(self, name);
self->eid = 0; self->eid = 0;
self->is_return = ifalse; self->is_return = ifalse;
self->run_id = 0; self->run_id = 0;
VEC_INIT(self, living); MEM_VECTOR_INIT(self, living);
return self; return self;
} }
MAKE_VEC_ADD(ir_block, ir_instr*, instr) MEM_VECTOR_FUNCTIONS(ir_block, ir_instr*, instr)
MAKE_VEC_REMOVE(ir_block, ir_instr*, instr) MEM_VECTOR_FUNCTIONS_ALL(ir_block, ir_block*, entries)
MAKE_VEC_ADD(ir_block, ir_block*, entries) MEM_VECTOR_FUNCTIONS_ALL(ir_block, ir_block*, exits)
MAKE_VEC_FIND(ir_block, ir_block*, entries) MEM_VECTOR_FUNCTIONS_ALL(ir_block, ir_value*, living)
MAKE_VEC_ADD(ir_block, ir_block*, exits)
MAKE_VEC_ADD(ir_block, ir_value*, living)
MAKE_VEC_REMOVE(ir_block, ir_value*, living)
MAKE_VEC_FIND(ir_block, ir_value*, living)
void ir_block_delete(ir_block* self) void ir_block_delete(ir_block* self)
{ {
size_t i; size_t i;
free((void*)self->_label); mem_d((void*)self->label);
for (i = 0; i != self->instr_count; ++i) for (i = 0; i != self->instr_count; ++i)
ir_instr_delete(self->instr[i]); ir_instr_delete(self->instr[i]);
VEC_CLEAR(self, instr); MEM_VECTOR_CLEAR(self, instr);
VEC_CLEAR(self, entries); MEM_VECTOR_CLEAR(self, entries);
VEC_CLEAR(self, exits); MEM_VECTOR_CLEAR(self, exits);
VEC_CLEAR(self, living); MEM_VECTOR_CLEAR(self, living);
free(self); mem_d(self);
} }
void ir_block_set_label(ir_block *self, const char *name) void ir_block_set_label(ir_block *self, const char *name)
{ {
if (self->_label) if (self->label)
free((void*)self->_label); mem_d((void*)self->label);
self->_label = strdup(name); self->label = util_strdup(name);
} }