X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=8941410f2d28ef5928df76570caa997eb9bdd634;hb=03a0b8a1e06fb7837b2a99ec64eefeddeeddfa7a;hp=22dff63d53bbb5e73a0a7470da525db054c5e5d7;hpb=64d13bb5d7e4b2c992d562840c9625afad83fa22;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 22dff63d5..8941410f2 100644
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -26,9 +26,7 @@
  */
 #include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 #include "irprog_t.h"
 #include "irgraph_t.h"
@@ -63,10 +61,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
@@ -74,13 +69,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"));
@@ -97,13 +97,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;
@@ -122,13 +123,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
@@ -189,26 +190,28 @@ 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, found = 0;
+	int i, l, found = 0;
 
 	assert(irg);
-	for (i = 0; i < (ARR_LEN (irp->graphs)); i++) {
+	l = ARR_LEN(irp->graphs);
+	for (i = 0; i < l; i++) {
 		if (irp->graphs[i] == irg) {
 			found = 1;
-			for(; i < (ARR_LEN (irp->graphs)) - 1; i++) {
+			for(; i < l - 1; i++) {
 				irp->graphs[i] = irp->graphs[i+1];
 			}
-			ARR_SETLEN(ir_graph*, irp->graphs, (ARR_LEN(irp->graphs)) - 1);
+			ARR_SETLEN(ir_graph*, irp->graphs, l - 1);
 			break;
 		}
 	}
 	if (!found) {
-		for (i = 0; i < (ARR_LEN (irp->pseudo_graphs)); i++) {
+		l = ARR_LEN(irp->pseudo_graphs);
+		for (i = 0; i < l; i++) {
 			if (irp->pseudo_graphs[i] == irg) {
-				for(; i < (ARR_LEN (irp->pseudo_graphs)) - 1; i++) {
+				for(; i < l - 1; i++) {
 					irp->pseudo_graphs[i] = irp->pseudo_graphs[i+1];
 				}
-				ARR_SETLEN(ir_graph*, irp->pseudo_graphs, (ARR_LEN(irp->pseudo_graphs)) - 1);
+				ARR_SETLEN(ir_graph*, irp->pseudo_graphs, l - 1);
 				break;
 			}
 		}
@@ -217,7 +220,6 @@ void remove_irp_irg_from_list(ir_graph *irg){
 
 /* Removes irg from the list or irgs, shrinks the list by one. */
 void remove_irp_irg(ir_graph *irg){
-	assert(irg);
 	free_ir_graph(irg);
 	remove_irp_irg_from_list(irg);
 }
@@ -262,15 +264,15 @@ ir_graph *get_irp_allirg(int pos) {
 void add_irp_type(ir_type *typ) {
 	assert(typ != NULL);
 	assert(irp);
-	ARR_APP1 (ir_type *, irp->types, typ);
+	ARR_APP1(ir_type *, irp->types, typ);
 }
 
-/* Remove type form the list of types in irp. */
+/* Remove type from the list of types in irp. */
 void remove_irp_type(ir_type *typ) {
 	int i;
 	assert(typ);
 
-	for (i = ARR_LEN(irp->types) -1; i >= 0; i--) {
+	for (i = ARR_LEN(irp->types) - 1; i >= 0; i--) {
 		if (irp->types[i] == typ) {
 			for(; i < (ARR_LEN(irp->types)) - 1; i++) {
 				irp->types[i] = irp->types[i+1];
@@ -314,27 +316,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(opcode->code < ARR_LEN(irp->opcodes));
+	irp->opcodes[opcode->code] = NULL;
 }
 
 /* Returns the number of all opcodes in the irp. */
@@ -364,10 +364,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);
 }
 
@@ -430,12 +430,13 @@ int get_irp_n_asms(void) {
 
 /* Return the global asm include at position pos. */
 ident *get_irp_asm(int pos) {
-	assert(pos <= 0 && pos < get_irp_n_asms());
+	assert(0 <= pos && pos < get_irp_n_asms());
 	return irp->global_asms[pos];
 }
 
 #ifndef NDEBUG
 void irp_reserve_resources(ir_prog *irp, ir_resources_t resources) {
+	assert((resources & ~IR_RESOURCE_GLOBAL_MASK) == 0);
 	assert((irp->reserved_resources & resources) == 0);
 	irp->reserved_resources |= resources;
 }