removed exc.h from libfirm interface

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 8956173..53759f4 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -1,17 +1,21 @@
-/* Copyright (C) 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Goetz Lindenmaier
-**
-** irprog.c: ir representation of a program
-*/
-
-/* $Id$ */
+/*
+ * Project:     libFIRM
+ * File name:   ir/ir/irprog.c
+ * Purpose:     Entry point to the representation of a whole program.
+ * Author:      Goetz Lindenmaier
+ * Modified by:
+ * Created:     2000
+ * CVS-ID:      $Id$
+ * Copyright:   (c) 2000-2003 Universität Karlsruhe
+ * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+# include <string.h>
+
 # include "irprog_t.h"
 # include "irgraph_t.h"
 # include "array.h"
@@ -22,12 +26,27 @@
 
 /* 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) {
@@ -38,16 +57,19 @@ ir_prog *new_ir_prog (void) {
   /* res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack)); */
   res->graphs = NEW_ARR_F (ir_graph *, 1);
   res->types  = NEW_ARR_F (type *, 1);
+
+#ifdef DEBUG_libfirm
+  res->max_node_nr = 0;
+#endif
+
   res->glob_type = new_type_class(id_from_str (GLOBAL_TYPE_NAME,
                                               strlen(GLOBAL_TYPE_NAME)));
-  // @@@ Das ist hier das 2. mal!!
-  add_irp_type(res->glob_type);
+  /* 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();
 
-#ifdef DEBUG_libfirm
-  res->max_node_nr = 1;
-#endif
 
   return res;
 }
@@ -78,8 +100,7 @@ void add_irp_irg(ir_graph *irg) {
   ARR_APP1 (ir_graph *, irp->graphs, irg);
 }
 
-/* Removes irg from the list or irgs, shrinks the list by one.
-   @@@ does not work properly. */
+/* Removes irg from the list or irgs, shrinks the list by one. */
 void remove_irp_irg(ir_graph *irg){
   int i;
   assert(irg);
@@ -121,6 +142,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??  */