X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=9aa961267e1c229a4f727374622f7d349ad62620;hb=1852308bd33b77378f0fca9e5347d4f9082464c4;hp=6fb7660fc820082907d506814b34631b9f11d7a0;hpb=5e336be82986d1ba56d63b3862f9d8d8acc8f9e1;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 6fb7660fc..9aa961267 100644
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -30,6 +30,7 @@
 
 #include "irprog_t.h"
 #include "irgraph_t.h"
+#include "irpass_t.h"
 #include "pseudo_irg.h"
 #include "array.h"
 #include "error.h"
@@ -61,10 +62,7 @@ static ir_prog *new_incomplete_ir_prog(void)
 	res->last_region_nr = 0;
 	res->last_label_nr  = 1;  /* 0 is reserved as non-label */
 	res->max_irg_idx    = 0;
-
-#ifdef DEBUG_libfirm
 	res->max_node_nr    = 0;
-#endif
 #ifndef NDEBUG
 	res->reserved_resources = 0;
 #endif
@@ -72,13 +70,18 @@ static ir_prog *new_incomplete_ir_prog(void)
 	return res;
 }
 
-/** Completes an incomplete irprog. */
-static ir_prog *complete_ir_prog(ir_prog *irp) {
+/**
+ * Completes an incomplete irprog.
+ *
+ * @param irp          the (yet incomplete) irp
+ * @param module_name  the (module) name for this irp
+ */
+static ir_prog *complete_ir_prog(ir_prog *irp, const char *module_name) {
 	int i;
-#define IDENT(s) new_id_from_chars(s, sizeof(s)-1)
 
-	irp->name              = IDENT(INITAL_PROG_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_THREAD_LOCAL]
 		= new_type_struct(IDENT("ThreadLocal"));
@@ -95,13 +98,14 @@ static ir_prog *complete_ir_prog(ir_prog *irp) {
 	/* Set these flags for debugging. */
 	irp->segment_types[IR_SEGMENT_GLOBAL]->flags       |= tf_global_type;
 	irp->segment_types[IR_SEGMENT_THREAD_LOCAL]->flags |= tf_tls_type;
+	irp->segment_types[IR_SEGMENT_CONSTRUCTORS]->flags |= tf_constructors;
+	irp->segment_types[IR_SEGMENT_DESTRUCTORS]->flags  |= tf_destructors;
 
 	/* The global type is a class, but we cannot derive from it, so set
 	   the final property to assist optimizations that checks for it. */
 	set_class_final(irp->segment_types[IR_SEGMENT_GLOBAL], 1);
 
-	irp->const_code_irg   = new_const_code_irg();
-
+	irp->const_code_irg             = new_const_code_irg();
 	irp->phase_state                = phase_building;
 	irp->outs_state                 = outs_none;
 	irp->ip_outedges                = NULL;
@@ -120,13 +124,13 @@ void init_irprog_1(void) {
 
 /* Completes ir_prog. */
 void init_irprog_2(void) {
-	complete_ir_prog(irp);
+	(void)complete_ir_prog(irp, INITAL_PROG_NAME);
 }
 
 /* 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());
+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
@@ -313,27 +317,25 @@ 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 code;
 	assert(opcode != NULL);
 	assert(irp);
-	assert(opcode->code == (unsigned) ARR_LEN(irp->opcodes) && "new_ir_op() called in wrong order");
-	ARR_APP1(ir_op *, irp->opcodes, opcode);
+	len  = ARR_LEN(irp->opcodes);
+	code = opcode->code;
+	if ((int) code >= len) {
+		ARR_RESIZE(ir_op*, irp->opcodes, code+1);
+		memset(&irp->opcodes[len], 0, (code-len+1) * sizeof(irp->opcodes[0]));
+	}
+
+	assert(irp->opcodes[code] == NULL && "opcode registered twice");
+	irp->opcodes[code] = opcode;
 }
 
 /* Removes opcode from the list of opcodes and shrinks the list by one. */
 void remove_irp_opcode(ir_op *opcode) {
-	int i;
-
-	assert(opcode);
-	for (i = ARR_LEN(irp->opcodes) -1; i >= 0; i--) {
-		if (irp->opcodes[i] != opcode)
-			continue;
-		for (; i < (ARR_LEN(irp->opcodes)) - 1; i++) {
-			irp->opcodes[i] = irp->opcodes[i+1];
-		}
-		ARR_SETLEN(ir_op *, irp->opcodes, (ARR_LEN(irp->opcodes)) - 1);
-		return;
-	}
-	panic("Deleting unknown opcode");
+	assert((int) opcode->code < ARR_LEN(irp->opcodes));
+	irp->opcodes[opcode->code] = NULL;
 }
 
 /* Returns the number of all opcodes in the irp. */
@@ -363,10 +365,10 @@ void   set_irp_prog_name(ident *name) {
 int irp_prog_name_is_set(void) {
 	return irp->name != new_id_from_str(INITAL_PROG_NAME);
 }
-ident *get_irp_prog_ident(void) {
+ident *get_irp_ident(void) {
 	return irp->name;
 }
-const char  *get_irp_prog_name(void) {
+const char  *get_irp_name(void) {
 	return get_id_str(irp->name);
 }
 
@@ -383,6 +385,45 @@ void set_irp_phase_state(irg_phase_state s) {
 	irp->phase_state = s;
 }
 
+struct pass_t {
+	ir_prog_pass_t  pass;
+	irg_phase_state state;
+};
+
+/**
+ * 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;
+	irg_phase_state state = pass->state;
+	int             i;
+
+	(void)irp;
+
+	/* set the phase of all graphs */
+	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
+		set_irg_phase_state(get_irp_irg(i), state);
+
+	/* set the irp phase */
+	set_irp_phase_state(state);
+
+	return 0;
+}
+
+ir_prog_pass_t *set_irp_phase_state_pass(const char *name, irg_phase_state state) {
+	struct pass_t *pass = XMALLOCZ(struct pass_t);
+
+	def_prog_pass_constructor(
+		&pass->pass, name ? name : "set_irp_phase", set_irp_phase_state_wrapper);
+	pass->state = state;
+
+	/* no dump/verify */
+	pass->pass.verify_irprog = ir_prog_no_verify;
+	pass->pass.dump_irprog   = ir_prog_no_dump;
+
+	return &pass->pass;
+}
+
 irg_outs_state get_irp_ip_outs_state(void) {
 	return irp->outs_state;
 }