X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=daeb232b9909a4b95811796c8e0887a7fa08e9b0;hb=7d070c58e7bef1ed875fac066b57f29de449724b;hp=d41f6fbb167c2e6ea3e96fc837f9bacfea1012c5;hpb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index d41f6fbb1..daeb232b9 100644
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -85,9 +85,10 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name)
 #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(IDENT("GlobalType"));
+	irp->segment_types[IR_SEGMENT_GLOBAL]
+		= new_type_class(IDENT("GlobalType"));
 	irp->segment_types[IR_SEGMENT_THREAD_LOCAL]
-		= new_type_class(IDENT("ThreadLocal"));
+		= new_type_struct(IDENT("ThreadLocal"));
 	irp->segment_types[IR_SEGMENT_CONSTRUCTORS]
 		= new_type_class(IDENT("Constructors"));
 	irp->segment_types[IR_SEGMENT_DESTRUCTORS]
@@ -214,14 +215,13 @@ void add_irp_irg(ir_graph *irg)
 /* Removes irg from the list or irgs, shrinks the list by one. */
 void remove_irp_irg_from_list(ir_graph *irg)
 {
-	int i, l, found = 0;
+	size_t i, l;
 
 	assert(irg);
 	l = ARR_LEN(irp->graphs);
-	for (i = 0; i < l; i++) {
+	for (i = 0; i < l; ++i) {
 		if (irp->graphs[i] == irg) {
-			found = 1;
-			for (; i < l - 1; i++) {
+			for (; i < l - 1; ++i) {
 				irp->graphs[i] = irp->graphs[i+1];
 			}
 			ARR_SETLEN(ir_graph*, irp->graphs, l - 1);
@@ -237,25 +237,25 @@ void remove_irp_irg(ir_graph *irg)
 	remove_irp_irg_from_list(irg);
 }
 
-int (get_irp_n_irgs)(void)
+size_t (get_irp_n_irgs)(void)
 {
 	return _get_irp_n_irgs();
 }
 
-ir_graph *(get_irp_irg)(int pos)
+ir_graph *(get_irp_irg)(size_t pos)
 {
 	return _get_irp_irg(pos);
 }
 
-int get_irp_last_idx(void)
+size_t get_irp_last_idx(void)
 {
 	return irp->max_irg_idx;
 }
 
-void set_irp_irg(int pos, ir_graph *irg)
+void set_irp_irg(size_t pos, ir_graph *irg)
 {
 	assert(irp && irg);
-	assert(pos < (ARR_LEN(irp->graphs)));
+	assert(pos < ARR_LEN(irp->graphs));
 	irp->graphs[pos] = irg;
 }
 
@@ -270,45 +270,46 @@ void add_irp_type(ir_type *typ)
 /* Remove type from the list of types in irp. */
 void remove_irp_type(ir_type *typ)
 {
-	int i;
+	size_t i, l;
 	assert(typ);
 
-	for (i = ARR_LEN(irp->types) - 1; i >= 0; i--) {
+	l = ARR_LEN(irp->types);
+	for (i = 0; i < l; ++i) {
 		if (irp->types[i] == typ) {
-			for (; i < (ARR_LEN(irp->types)) - 1; i++) {
+			for (; i < l - 1; ++i) {
 				irp->types[i] = irp->types[i+1];
 			}
-			ARR_SETLEN(ir_type *, irp->types, (ARR_LEN(irp->types)) - 1);
+			ARR_SETLEN(ir_type *, irp->types, l - 1);
 			break;
 		}
 	}
 }
 
-int (get_irp_n_types) (void)
+size_t (get_irp_n_types) (void)
 {
 	return _get_irp_n_types();
 }
 
-ir_type *(get_irp_type) (int pos)
+ir_type *(get_irp_type) (size_t pos)
 {
 	return _get_irp_type(pos);
 }
 
-void set_irp_type(int pos, ir_type *typ)
+void set_irp_type(size_t pos, ir_type *typ)
 {
 	assert(irp && typ);
-	assert(pos < (ARR_LEN((irp)->types)));
+	assert(pos < ARR_LEN((irp)->types));
 	irp->types[pos] = typ;
 }
 
 /* Returns the number of all modes in the irp. */
-int (get_irp_n_modes)(void)
+size_t (get_irp_n_modes)(void)
 {
 	return _get_irp_n_modes();
 }
 
 /* Returns the mode at position pos in the irp. */
-ir_mode *(get_irp_mode)(int pos)
+ir_mode *(get_irp_mode)(size_t pos)
 {
 	return _get_irp_mode(pos);
 }
@@ -324,13 +325,13 @@ void add_irp_mode(ir_mode *mode)
 /* Adds opcode to the list of opcodes in irp. */
 void add_irp_opcode(ir_op *opcode)
 {
-	int    len;
+	size_t len;
 	size_t code;
 	assert(opcode != NULL);
 	assert(irp);
 	len  = ARR_LEN(irp->opcodes);
 	code = opcode->code;
-	if ((int) code >= len) {
+	if (code >= len) {
 		ARR_RESIZE(ir_op*, irp->opcodes, code+1);
 		memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0]));
 	}
@@ -342,35 +343,35 @@ void add_irp_opcode(ir_op *opcode)
 /* Removes opcode from the list of opcodes and shrinks the list by one. */
 void remove_irp_opcode(ir_op *opcode)
 {
-	assert((int) opcode->code < ARR_LEN(irp->opcodes));
+	assert(opcode->code < ARR_LEN(irp->opcodes));
 	irp->opcodes[opcode->code] = NULL;
 }
 
 /* Returns the number of all opcodes in the irp. */
-int (get_irp_n_opcodes)(void)
+size_t (get_irp_n_opcodes)(void)
 {
 	return _get_irp_n_opcodes();
 }
 
 /* Returns the opcode at position pos in the irp. */
-ir_op *(get_irp_opcode)(int pos)
+ir_op *(get_irp_opcode)(size_t pos)
 {
 	return _get_irp_opcode(pos);
 }
 
 /* Sets the generic function pointer of all opcodes to NULL */
-void  clear_irp_opcodes_generic_func(void)
+void clear_irp_opcodes_generic_func(void)
 {
-	int i;
+	size_t i, n;
 
-	for (i = get_irp_n_opcodes() - 1; i >= 0; --i) {
+	for (i = 0, n = get_irp_n_opcodes(); i < n; ++i) {
 		ir_op *op = get_irp_opcode(i);
 		op->ops.generic = (op_func)NULL;
 	}
 }
 
 /*- File name / executable name or the like -*/
-void   set_irp_prog_name(ident *name)
+void set_irp_prog_name(ident *name)
 {
 	irp->name = name;
 }
@@ -415,12 +416,12 @@ static int set_irp_phase_state_wrapper(ir_prog *irp, void *context)
 {
 	pass_t         *pass  = (pass_t *)context;
 	irg_phase_state state = pass->state;
-	int             i;
+	size_t          i, n;
 
 	(void)irp;
 
 	/* set the phase of all graphs */
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i)
 		set_irg_phase_state(get_irp_irg(i), state);
 
 	/* set the irp phase */
@@ -493,15 +494,15 @@ void add_irp_asm(ident *asm_string)
 }
 
 /* Return the number of global asm includes. */
-int get_irp_n_asms(void)
+size_t get_irp_n_asms(void)
 {
 	return ARR_LEN(irp->global_asms);
 }
 
 /* Return the global asm include at position pos. */
-ident *get_irp_asm(int pos)
+ident *get_irp_asm(size_t pos)
 {
-	assert(0 <= pos && pos < get_irp_n_asms());
+	assert(pos < get_irp_n_asms());
 	return irp->global_asms[pos];
 }