X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firprog.c;h=fdbcfb60a596bfb905eb2e0ee4756bfa9738ee23;hb=8399216d8aebc713bbda04b6e3e250a1d52b20bf;hp=b0a44eb3f4ad23f211dbe818e42746bb8cceb384;hpb=56c4f99a95cfeda4dbea6a1d702be5cff87e7fd3;p=libfirm

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index b0a44eb3f..fdbcfb60a 100644
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -11,10 +11,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
+#ifdef HAVE_STRING_H
 # include <string.h>
+#endif
 
 # include "irprog_t.h"
 # include "irgraph_t.h"
@@ -58,10 +60,10 @@ INLINE void remove_irp_type_from_list (type *typ) {
 ir_prog *new_ir_prog (void) {
   ir_prog *res;
 
-  res = (ir_prog *) malloc (sizeof(ir_prog));
-  memset(res, 0, sizeof(res));
+  res = xmalloc (sizeof(*res));
+  memset(res, 0, sizeof(*res));
   irp = res;
-  /* res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack)); */
+  /* res->obst      = xmalloc (sizeof(*res->obst)); */
   res->graphs        = NEW_ARR_F (ir_graph *, 0);
   res->pseudo_graphs = NEW_ARR_F (ir_graph *, 0);
   res->types  = NEW_ARR_F (type *, 0);
@@ -122,12 +124,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;
+void remove_irp_irg_from_list(ir_graph *irg){
+  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];
       }
@@ -135,6 +137,24 @@ 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;
+      }
+    }
+  }
+}
+
+/* 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);
 }
 
 int (get_irp_n_irgs)(void) {
@@ -160,11 +180,13 @@ int       get_irp_n_allirgs(void) {
 /* 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 = get_irp_n_irgs();
-  if (pos < n_irgs)
+  int n_irgs = ARR_LEN((irp)->graphs);
+  assert(0 <= pos);
+  if (pos < n_irgs) {
     return (irp)->graphs[pos];
-  else
+  } else {
     return get_irp_pseudo_irg(pos-n_irgs);
+  }
 }