fixes of pseudo irgs

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 1c5bc9b..1e58c68 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -18,11 +18,13 @@
 
 # include "irprog_t.h"
 # include "irgraph_t.h"
+# include "pseudo_irg.h"
 # include "array.h"
 # include "obst.h"
 # include "typegmod.h"
 
 #define GLOBAL_TYPE_NAME "GlobalType"
+#define INITAL_PROG_NAME "no_name_set"
 
 /* A variable from where everything in the ir can be accessed. */
 ir_prog *irp;
@@ -60,16 +62,16 @@ ir_prog *new_ir_prog (void) {
   memset(res, 0, sizeof(res));
   irp = res;
   /* res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack)); */
-  res->graphs = NEW_ARR_F (ir_graph *, 0);
+  res->graphs        = NEW_ARR_F (ir_graph *, 0);
+  res->pseudo_graphs = NEW_ARR_F (ir_graph *, 0);
   res->types  = NEW_ARR_F (type *, 0);
-  res->name   = new_id_from_str("no_name_set");
+  res->name   = new_id_from_str(INITAL_PROG_NAME);
 
 #ifdef DEBUG_libfirm
   res->max_node_nr = 0;
 #endif
 
-  res->glob_type = new_type_class(new_id_from_chars (GLOBAL_TYPE_NAME,
-                                              strlen(GLOBAL_TYPE_NAME)));
+  res->glob_type = new_type_class(new_id_from_str (GLOBAL_TYPE_NAME));
   /* Remove type from type list.  Must be treated differently than
      other types. */
   remove_irp_type_from_list(res->glob_type);
@@ -121,11 +123,12 @@ void add_irp_irg(ir_graph *irg) {
 
 /* Removes irg from the list or irgs, shrinks the list by one. */
 void remove_irp_irg(ir_graph *irg){
-  int i;
+  int i, found = false;
   assert(irg);
   free_ir_graph(irg);
   for (i = 0; i < (ARR_LEN (irp->graphs)); i++) {
     if (irp->graphs[i] == irg) {
+      found = true;
       for(; i < (ARR_LEN (irp->graphs)) - 1; i++) {
        irp->graphs[i] = irp->graphs[i+1];
       }
@@ -133,6 +136,17 @@ void remove_irp_irg(ir_graph *irg){
       break;
     }
   }
+  if (!found) {
+    for (i = 0; i < (ARR_LEN (irp->pseudo_graphs)); i++) {
+      if (irp->pseudo_graphs[i] == irg) {
+       for(; i < (ARR_LEN (irp->pseudo_graphs)) - 1; i++) {
+         irp->pseudo_graphs[i] = irp->pseudo_graphs[i+1];
+       }
+       ARR_SETLEN(ir_graph*, irp->pseudo_graphs, (ARR_LEN(irp->pseudo_graphs)) - 1);
+       break;
+      }
+    }
+  }
 }
 
 int (get_irp_n_irgs)(void) {
@@ -149,6 +163,25 @@ void set_irp_irg(int pos, ir_graph *irg) {
   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(type *typ) {
   assert (typ != NULL);
@@ -186,6 +219,9 @@ int get_irp_new_node_nr() {
 void   set_irp_prog_name(ident *name) {
   irp->name = name;
 }
+int irp_prog_name_is_set(void) {
+  return irp->name != new_id_from_str(INITAL_PROG_NAME);
+}
 ident *get_irp_prog_ident(void) {
   return irp->name;
 }