Used new arch_dep names

[libfirm] / ir / ir / irprog.c

diff --git a/ir/ir/irprog.c b/ir/ir/irprog.c
index 372e456..1c5bc9b 100644 (file)
--- a/ir/ir/irprog.c
+++ b/ir/ir/irprog.c
@@ -37,7 +37,7 @@ INLINE void remove_irp_type_from_list (type *typ) {
   int i;
   assert(typ);
 #if 0
-  for (i = 1; i < (ARR_LEN (irp->types)); i++) {
+  for (i = 0; i < (ARR_LEN (irp->types)); i++) {
 #else
   for (i = ARR_LEN (irp->types) -1; i >= 0; i--) {
 #endif
@@ -60,15 +60,15 @@ 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 *, 1);
-  res->types  = NEW_ARR_F (type *, 1);
+  res->graphs = NEW_ARR_F (ir_graph *, 0);
+  res->types  = NEW_ARR_F (type *, 0);
   res->name   = new_id_from_str("no_name_set");
 
 #ifdef DEBUG_libfirm
   res->max_node_nr = 0;
 #endif
 
-  res->glob_type = new_type_class(id_from_str (GLOBAL_TYPE_NAME,
+  res->glob_type = new_type_class(new_id_from_chars (GLOBAL_TYPE_NAME,
                                               strlen(GLOBAL_TYPE_NAME)));
   /* Remove type from type list.  Must be treated differently than
      other types. */
@@ -76,7 +76,7 @@ ir_prog *new_ir_prog (void) {
 
   res->const_code_irg = new_const_code_irg();
 
-  res->outs_state = no_outs;
+  res->outs_state = outs_none;
   res->ip_outedges = NULL;
 
   return res;
@@ -108,9 +108,8 @@ void set_irp_main_irg(ir_graph *main_irg) {
   irp->main_irg = main_irg;
 }
 
-type *get_glob_type(void) {
-  assert(irp);
-  return irp->glob_type = skip_tid(irp->glob_type);
+type *(get_glob_type)(void) {
+  return __get_glob_type();
 }
 
 /* Adds irg to the list of ir graphs in irp. */
@@ -125,7 +124,7 @@ void remove_irp_irg(ir_graph *irg){
   int i;
   assert(irg);
   free_ir_graph(irg);
-  for (i = 1; i < (ARR_LEN (irp->graphs)); i++) {
+  for (i = 0; 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];
@@ -136,23 +135,18 @@ void remove_irp_irg(ir_graph *irg){
   }
 }
 
-int get_irp_n_irgs() {
-  assert (irp && irp->graphs);
-  /* Strangely the first element of the array is NULL.  Why??  */
-  return (ARR_LEN((irp)->graphs) - 1);
+int (get_irp_n_irgs)(void) {
+  return __get_irp_n_irgs();
 }
 
-ir_graph *get_irp_irg(int pos){
-  assert (irp && irp->graphs);
-  /* Strangely the first element of the array is NULL.  Why??  */
-  return irp->graphs[pos+1];
+ir_graph *(get_irp_irg)(int pos){
+  return __get_irp_irg(pos);
 }
 
 void set_irp_irg(int pos, ir_graph *irg) {
   assert (irp && irg);
-  assert (pos < (ARR_LEN((irp)->graphs) - 1));
-  /* Strangely the first element of the array is NULL.  Why??  */
-  irp->graphs[pos+1] = irg;
+  assert (pos < (ARR_LEN((irp)->graphs)));
+  irp->graphs[pos] = irg;
 }
 
 /* Adds type to the list of types in irp. */
@@ -166,24 +160,18 @@ 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??  */
-  return (ARR_LEN((irp)->types) - 1);
+int (get_irp_n_types) (void) {
+  return __get_irp_n_types();
 }
 
-type *get_irp_type(int pos) {
-  assert (irp && irp->types);
-  /* Strangely the first element of the array is NULL.  Why??  */
-  /* Don't set the skip_tid result so that no double entries are generated. */
-  return skip_tid(irp->types[pos+1]);
+type *(get_irp_type) (int pos) {
+  return __get_irp_type(pos);
 }
 
 void  set_irp_type(int pos, type *typ) {
   assert (irp && typ);
-  assert (pos < (ARR_LEN((irp)->types) - 1));
-  /* Strangely the first element of the array is NULL.  Why??  */
-  irp->types[pos+1] = typ;
+  assert (pos < (ARR_LEN((irp)->types)));
+  irp->types[pos] = typ;
 }
 
 #ifdef DEBUG_libfirm
@@ -206,17 +194,19 @@ const char  *get_irp_prog_name(void) {
 }
 
 
-ir_graph *get_const_code_irg(void)
+ir_graph *(get_const_code_irg)(void)
 {
-  return irp->const_code_irg;
+  return __get_const_code_irg();
 }
 
 irg_outs_state get_irp_ip_outs_state() {
   return irp->outs_state;
 }
+
 void set_irp_ip_outs_inconsistent() {
   irp->outs_state = outs_inconsistent;
 }
+
 void      set_irp_ip_outedges(ir_node ** ip_outedges)
 {
   irp -> ip_outedges = ip_outedges;
@@ -226,3 +216,12 @@ ir_node** get_irp_ip_outedges(void)
 {
   return(irp -> ip_outedges);
 }
+
+
+irg_callee_info_state get_irp_callee_info_state(void) {
+  return irp->callee_info_state;
+}
+
+void set_irp_callee_info_state(irg_callee_info_state s) {
+  irp->callee_info_state = s;
+}