fix uninitialized warnings in ir.c

This commit is contained in:
Wolfgang Bumiller 2012-12-26 20:06:30 +01:00
parent f832b86dcd
commit de3d8747f7

17
ir.c
View file

@ -2623,7 +2623,7 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change
* *
* Breaking conventions is annoying... * Breaking conventions is annoying...
*/ */
static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal, bool defs_only); static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal);
static bool gen_global_field(ir_value *global) static bool gen_global_field(ir_value *global)
{ {
@ -3154,7 +3154,7 @@ static bool gen_function_locals(ir_builder *ir, ir_value *global)
vec_push(code_globals, 0); vec_push(code_globals, 0);
for (i = 0; i < vec_size(irfun->locals); ++i) { for (i = 0; i < vec_size(irfun->locals); ++i) {
ir_value_code_setaddr(irfun->locals[i], firstlocal + irfun->locals[i]->code.local); ir_value_code_setaddr(irfun->locals[i], firstlocal + irfun->locals[i]->code.local);
if (!ir_builder_gen_global(ir, irfun->locals[i], true, true)) { if (!ir_builder_gen_global(ir, irfun->locals[i], true)) {
irerror(irfun->locals[i]->context, "failed to generate local %s", irfun->locals[i]->name); irerror(irfun->locals[i]->context, "failed to generate local %s", irfun->locals[i]->name);
return false; return false;
} }
@ -3267,18 +3267,19 @@ static void gen_vector_fields(prog_section_field fld, const char *name)
} }
} }
static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal, bool defs_only) static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool islocal)
{ {
size_t i; size_t i;
int32_t *iptr; int32_t *iptr;
prog_section_def def; prog_section_def def;
bool pushdef = false; bool pushdef = false;
def.type = global->vtype;
def.offset = vec_size(code_globals);
def.name = 0;
if (opts.g || !islocal) if (opts.g || !islocal)
{ {
pushdef = true; pushdef = true;
def.type = global->vtype;
def.offset = vec_size(code_globals);
if (OPTS_OPTIMIZATION(OPTIM_STRIP_CONSTANT_NAMES) && if (OPTS_OPTIMIZATION(OPTIM_STRIP_CONSTANT_NAMES) &&
(global->name[0] == '#' || global->cvq == CV_CONST)) (global->name[0] == '#' || global->cvq == CV_CONST))
@ -3297,7 +3298,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
} }
else else
def.name = 0; def.name = 0;
if (defs_only) { if (islocal) {
def.offset = ir_value_code_addr(global); def.offset = ir_value_code_addr(global);
vec_push(code_defs, def); vec_push(code_defs, def);
if (global->vtype == TYPE_VECTOR) if (global->vtype == TYPE_VECTOR)
@ -3307,7 +3308,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
return true; return true;
} }
} }
if (defs_only) if (islocal)
return true; return true;
switch (global->vtype) switch (global->vtype)
@ -3525,7 +3526,7 @@ bool ir_builder_generate(ir_builder *self, const char *filename)
for (i = 0; i < vec_size(self->globals); ++i) for (i = 0; i < vec_size(self->globals); ++i)
{ {
if (!ir_builder_gen_global(self, self->globals[i], false, false)) { if (!ir_builder_gen_global(self, self->globals[i], false)) {
return false; return false;
} }
if (self->globals[i]->vtype == TYPE_FUNCTION) { if (self->globals[i]->vtype == TYPE_FUNCTION) {