some fixes for xml dumper / still buggy.

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 128298d..5b9ca0e 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -1,29 +1,50 @@
 /* Copyright (C) 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** irprog.c: ir representation of a program
+* All rights reserved.
+*
+* Authors: Goetz Lindenmaier
+*
+* irprog.c: ir representation of a program
 */
 
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+# include <string.h>
+
 # include "irprog_t.h"
+# include "irgraph_t.h"
 # include "array.h"
 # include "obst.h"
+# include "typegmod.h"
 
 #define GLOBAL_TYPE_NAME "GlobalType"
 
 /* A variable from where everything in the ir can be accessed. */
 ir_prog *irp;
+ir_prog *get_irp() { return irp; }
 
 /* initializes ir_prog. Calles the constructor for an ir_prog. */
 void init_irprog(void) {
   new_ir_prog ();
 }
 
+INLINE void remove_irp_type_from_list (type *typ) {
+  int i;
+  assert(typ);
+  for (i = 1; i < (ARR_LEN (irp->types)); i++) {
+    if (irp->types[i] == typ) {
+      for(; i < (ARR_LEN (irp->types)) - 1; i++) {
+       irp->types[i] = irp->types[i+1];
+      }
+      ARR_SETLEN(type*, irp->types, (ARR_LEN(irp->types)) - 1);
+      break;
+    }
+  }
+}
+
 /* Create a new ir prog. Automatically called by init_firm through
    init_irprog. */
 ir_prog *new_ir_prog (void) {
@@ -31,18 +52,23 @@ ir_prog *new_ir_prog (void) {
 
   res = (ir_prog *) malloc (sizeof(ir_prog));
   irp = res;
-
   /* res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack)); */
   res->graphs = NEW_ARR_F (ir_graph *, 1);
   res->types  = NEW_ARR_F (type *, 1);
-  res->glob_type = new_type_class(id_from_str (GLOBAL_TYPE_NAME,
-                                              strlen(GLOBAL_TYPE_NAME)));
-  add_irp_type((type *)res->glob_type);
 
 #ifdef DEBUG_libfirm
-  res->max_node_nr = 1;
+  res->max_node_nr = 0;
 #endif
 
+  res->glob_type = new_type_class(id_from_str (GLOBAL_TYPE_NAME,
+                                              strlen(GLOBAL_TYPE_NAME)));
+  /* Remove type from type list.  Must be treated differently than
+     other types. */
+  remove_irp_type_from_list(res->glob_type);
+
+  res->const_code_irg = new_const_code_irg();
+
+
   return res;
 }
 
@@ -62,16 +88,32 @@ void set_irp_main_irg(ir_graph *main_irg) {
 
 type *get_glob_type(void) {
   assert(irp);
-  return irp->glob_type;
+  return irp->glob_type = skip_tid(irp->glob_type);
 }
 
 /* Adds irg to the list of ir graphs in irp. */
-void      add_irp_irg(ir_graph *irg) {
+void add_irp_irg(ir_graph *irg) {
   assert (irg != NULL);
   assert(irp && irp->graphs);
   ARR_APP1 (ir_graph *, irp->graphs, irg);
 }
 
+/* Removes irg from the list or irgs, shrinks the list by one. */
+void remove_irp_irg(ir_graph *irg){
+  int i;
+  assert(irg);
+  free_ir_graph(irg);
+  for (i = 1; i < (ARR_LEN (irp->graphs)); i++) {
+    if (irp->graphs[i] == irg) {
+      for(; i < (ARR_LEN (irp->graphs)) - 1; i++) {
+       irp->graphs[i] = irp->graphs[i+1];
+      }
+      ARR_SETLEN(ir_graph*, irp->graphs, (ARR_LEN(irp->graphs)) - 1);
+      break;
+    }
+  }
+}
+
 int get_irp_n_irgs() {
   assert (irp && irp->graphs);
   /* Strangely the first element of the array is NULL.  Why??  */
@@ -98,6 +140,10 @@ void add_irp_type(type *typ) {
   ARR_APP1 (type *, irp->types, typ);
 }
 
+void remove_irp_type(type *typ) {
+  remove_irp_type_from_list (typ);
+}
+
 int get_irp_n_types (void) {
   assert (irp && irp->types);
   /* Strangely the first element of the array is NULL.  Why??  */
@@ -107,8 +153,8 @@ int get_irp_n_types (void) {
 type *get_irp_type(int pos) {
   assert (irp && irp->types);
   /* Strangely the first element of the array is NULL.  Why??  */
-  return irp->types[pos+1];
-
+  /* Don't set the skip_tid result so that no double entries are generated. */
+  return skip_tid(irp->types[pos+1]);
 }
 
 void  set_irp_type(int pos, type *typ) {
@@ -116,7 +162,6 @@ void  set_irp_type(int pos, type *typ) {
   assert (pos < (ARR_LEN((irp)->types) - 1));
   /* Strangely the first element of the array is NULL.  Why??  */
   irp->types[pos+1] = typ;
-
 }
 
 #ifdef DEBUG_libfirm
@@ -126,3 +171,8 @@ int get_irp_new_node_nr() {
   return irp->max_node_nr - 1;
 }
 #endif
+
+ir_graph *get_const_code_irg()
+{
+  return irp->const_code_irg;
+}