X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=8941410f2d28ef5928df76570caa997eb9bdd634;hb=03a0b8a1e06fb7837b2a99ec64eefeddeeddfa7a;hp=f3aef2d6d63696f3752409153664035aa7a4a9e2;hpb=202b43933e0cc0b71cc7fbe2b092b94efb7fd30e;p=libfirm diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c index f3aef2d6d..8941410f2 100644 --- a/ir/ir/irprog.c +++ b/ir/ir/irprog.c @@ -78,14 +78,16 @@ static ir_prog *new_incomplete_ir_prog(void) static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name) { int i; +#define IDENT(x) new_id_from_chars(x, sizeof(x) - 1) + irp->name = new_id_from_str(module_name); - irp->segment_types[IR_SEGMENT_GLOBAL] = new_type_class(new_id_from_str("GlobalType")); + irp->segment_types[IR_SEGMENT_GLOBAL] = new_type_class(IDENT("GlobalType")); irp->segment_types[IR_SEGMENT_THREAD_LOCAL] - = new_type_struct(new_id_from_str("ThreadLocal")); + = new_type_struct(IDENT("ThreadLocal")); irp->segment_types[IR_SEGMENT_CONSTRUCTORS] - = new_type_struct(new_id_from_str("Constructors")); + = new_type_struct(IDENT("Constructors")); irp->segment_types[IR_SEGMENT_DESTRUCTORS] - = new_type_struct(new_id_from_str("Destructors")); + = new_type_struct(IDENT("Destructors")); /* Remove these types from type list. Must be treated differently than other types. */ for (i = 0; i < IR_SEGMENT_COUNT; ++i) { @@ -111,6 +113,7 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name) { irp->globals_entity_usage_state = ir_entity_usage_not_computed; return irp; +#undef IDENT } /* initializes ir_prog. Constructs only the basic lists. */ @@ -125,8 +128,8 @@ void init_irprog_2(void) { /* Create a new ir prog. Automatically called by init_firm through init_irprog. */ -ir_prog *new_ir_prog(void) { - return complete_ir_prog(new_incomplete_ir_prog(), INITAL_PROG_NAME); +ir_prog *new_ir_prog(const char *name) { + return complete_ir_prog(new_incomplete_ir_prog(), name); } /* frees all memory used by irp. Types in type list, irgs in irg @@ -319,7 +322,7 @@ void add_irp_opcode(ir_op *opcode) { assert(irp); len = ARR_LEN(irp->opcodes); code = opcode->code; - if (code >= len) { + if ((int) code >= len) { ARR_RESIZE(ir_op*, irp->opcodes, code+1); memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0])); }