X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=daeb232b9909a4b95811796c8e0887a7fa08e9b0;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=5fd654527ae82d642cfb5bd5b9ed5e6451847031;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 5fd654527..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.
  *
@@ -31,7 +31,6 @@
 #include "irprog_t.h"
 #include "irgraph_t.h"
 #include "irpass_t.h"
-#include "pseudo_irg.h"
 #include "array.h"
 #include "error.h"
 #include "obst.h"
@@ -44,6 +43,10 @@
 /* A variable from where everything in the ir can be accessed. */
 ir_prog *irp;
 ir_prog *get_irp(void) { return irp; }
+void set_irp(ir_prog *new_irp)
+{
+	irp = new_irp;
+}
 
 /**
  *  Create a new incomplete ir_prog.
@@ -54,7 +57,6 @@ static ir_prog *new_incomplete_ir_prog(void)
 
 	res->kind           = k_ir_prog;
 	res->graphs         = NEW_ARR_F(ir_graph *, 0);
-	res->pseudo_graphs  = NEW_ARR_F(ir_graph *, 0);
 	res->types          = NEW_ARR_F(ir_type *, 0);
 	res->modes          = NEW_ARR_F(ir_mode *, 0);
 	res->opcodes        = NEW_ARR_F(ir_op *, 0);
@@ -64,7 +66,7 @@ static ir_prog *new_incomplete_ir_prog(void)
 	res->max_irg_idx    = 0;
 	res->max_node_nr    = 0;
 #ifndef NDEBUG
-	res->reserved_resources = 0;
+	res->reserved_resources = IR_RESOURCE_NONE;
 #endif
 
 	return res;
@@ -83,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]
@@ -114,6 +117,8 @@ static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name)
 	irp->class_cast_state           = ir_class_casts_transitive;
 	irp->globals_entity_usage_state = ir_entity_usage_not_computed;
 
+	current_ir_graph = irp->const_code_irg;
+
 	return irp;
 #undef IDENT
 }
@@ -148,7 +153,6 @@ void free_ir_prog(void)
 
 	free_ir_graph(irp->const_code_irg);
 	DEL_ARR_F(irp->graphs);
-	DEL_ARR_F(irp->pseudo_graphs);
 	DEL_ARR_F(irp->types);
 	DEL_ARR_F(irp->modes);
 
@@ -211,32 +215,19 @@ 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);
 			break;
 		}
 	}
-	if (!found) {
-		l = ARR_LEN(irp->pseudo_graphs);
-		for (i = 0; i < l; i++) {
-			if (irp->pseudo_graphs[i] == irg) {
-				for(; i < l - 1; i++) {
-					irp->pseudo_graphs[i] = irp->pseudo_graphs[i+1];
-				}
-				ARR_SETLEN(ir_graph*, irp->pseudo_graphs, l - 1);
-				break;
-			}
-		}
-	}
 }
 
 /* Removes irg from the list or irgs, shrinks the list by one. */
@@ -246,48 +237,28 @@ 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;
 }
 
-/* Gets the number of graphs _and_ pseudo graphs. */
-int get_irp_n_allirgs(void)
-{
-	/* We can not call get_irp_n_irgs, as we end up in a recursion ... */
-	return ARR_LEN(irp->graphs) + get_irp_n_pseudo_irgs();
-}
-
-/* Returns the ir graph at position pos of all graphs (including
- pseudo graphs).  Visits first graphs, then pseudo graphs. */
-ir_graph *get_irp_allirg(int pos)
-{
-	int n_irgs = ARR_LEN(irp->graphs);
-	assert(0 <= pos);
-	if (pos < n_irgs) {
-		return irp->graphs[pos];
-	} else {
-		return get_irp_pseudo_irg(pos-n_irgs);
-	}
-}
-
 /* Adds type to the list of types in irp. */
 void add_irp_type(ir_type *typ)
 {
@@ -299,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);
 }
@@ -353,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]));
 	}
@@ -371,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;
 }
@@ -432,24 +404,24 @@ void set_irp_phase_state(irg_phase_state s)
 	irp->phase_state = s;
 }
 
-struct pass_t {
+typedef struct pass_t {
 	ir_prog_pass_t  pass;
 	irg_phase_state state;
-};
+} pass_t;
 
 /**
  * Wrapper for setting the state of a whole ir_prog.
  */
 static int set_irp_phase_state_wrapper(ir_prog *irp, void *context)
 {
-	struct pass_t  *pass  = 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 */
@@ -522,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];
 }