removed C99 constructs

[r4701]

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 50d19cf..3f2c874 100644 (file)
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -773,9 +773,11 @@ static void dump_const_node_local(FILE *F, ir_node *n) {
 
 /** If the block of an edge is a const_like node, dump it local with an edge */
 static void dump_const_block_local(FILE *F, ir_node *n) {
+  ir_node *blk;
+
   if (!get_opt_dump_const_local()) return;
 
-  ir_node *blk = get_nodes_block(n);
+  blk = get_nodes_block(n);
   if (is_constlike_node(blk)) {
     int bad = 0;
 
@@ -1009,7 +1011,8 @@ print_edge_vcgattr(FILE *F, ir_node *from, int to) {
 /* dump edges to our inputs */
 static void
 dump_ir_data_edges(FILE *F, ir_node *n)  {
-  int i, visited = get_irn_visited(n);
+  int i;
+  unsigned long visited = get_irn_visited(n);
 
   if ((get_irn_op(n) == op_End) && (!dump_keepalive))
     return;
@@ -2052,11 +2055,13 @@ static int compute_color (int my, int max) {
   if (!max) {
     color = 0;
   } else {
+    int step;
+
     /* if small, scale to the full color range. */
     if (max < n_colors)
       my = my * (n_colors/max);
 
-    int step = 1 + (max / n_colors);
+    step = 1 + (max / n_colors);
 
     color = my/step;
   }
@@ -2064,22 +2069,24 @@ static int compute_color (int my, int max) {
 }
 
 static int get_entity_color(entity *ent) {
-  assert(get_entity_irg(ent));
   ir_graph *irg = get_entity_irg(ent);
+  assert(irg);
 
-  int rec_depth     = get_irg_recursion_depth(irg);
-  int loop_depth    = get_irg_loop_depth(irg);
-  int overall_depth = weight_overall(rec_depth, loop_depth);
+  {
+    int rec_depth     = get_irg_recursion_depth(irg);
+    int loop_depth    = get_irg_loop_depth(irg);
+    int overall_depth = weight_overall(rec_depth, loop_depth);
 
-  int max_rec_depth     = irp->max_callgraph_recursion_depth;
-  int max_loop_depth    = irp->max_callgraph_loop_depth;
-  int max_overall_depth = weight_overall(max_rec_depth, max_loop_depth);
+    int max_rec_depth     = irp->max_callgraph_recursion_depth;
+    int max_loop_depth    = irp->max_callgraph_loop_depth;
+    int max_overall_depth = weight_overall(max_rec_depth, max_loop_depth);
 
-  /* int my_rec_color     = compute_color(rec_depth, max_rec_depth); */
-  /* int my_loop_color    = compute_color(loop_depth, max_loop_depth); */
-  int my_overall_color = compute_color(overall_depth, max_overall_depth);;
+    /* int my_rec_color     = compute_color(rec_depth, max_rec_depth); */
+    /* int my_loop_color    = compute_color(loop_depth, max_loop_depth); */
+    int my_overall_color = compute_color(overall_depth, max_overall_depth);;
 
-  return my_overall_color;
+    return my_overall_color;
+  }
 }
 
 void dump_callgraph(const char *suffix) {
@@ -2278,9 +2285,11 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
       /* Causes indeterministic output: if (is_Block(n)) fprintf (F, "\t ->%d", (int)get_irn_link(n)); */
       if (has_backedges(n)) fprintf(F, "\t loop head!");
     } else { /* for callgraph loop tree */
+      ir_graph *n;
       assert(get_kind(son) == k_ir_graph);
+
       /* We are a loop node -> Collect firm graphs */
-      ir_graph *n = (ir_graph *)le.node;
+      n = (ir_graph *)le.node;
       if (!loop_node_started) {
         /* Start a new node which contains all firm nodes of the current loop */
         fprintf (F, "node: { title: \"");
@@ -2290,7 +2299,7 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
         first = i;
       }
       else
-    fprintf(F, "\n");
+        fprintf(F, "\n");
       fprintf (F, " %s", get_irg_dump_name(n));
       /* fprintf (F, " %s (depth %d)", get_irg_dump_name(n), n->callgraph_weighted_loop_depth); */
     }

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 2ed06ed..8a79d24 100644 (file)
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -380,9 +380,11 @@ int addr_is_alloc(ir_node *acc) {
 #define X(a)    case a: fprintf(F, #a); break
 void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity) {
   int i, j;
-  assert(ent && ent->kind == k_entity);
-  type *owner = get_entity_owner(ent);
-  type *type  = get_entity_type(ent);
+  type *owner, *type;
+
+  assert(is_entity(ent));
+  owner = get_entity_owner(ent);
+  type  = get_entity_type(ent);
   if (verbosity & dump_verbosity_onlynames) {
     fprintf(F, "%sentity %s.%s (%ld)\n", prefix, get_type_name(get_entity_owner(ent)),
            get_entity_name(ent), get_entity_nr(ent));
@@ -396,24 +398,24 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
 
     if (is_class_type(get_entity_owner(ent))) {
       if (get_entity_n_overwrites(ent) > 0) {
-       fprintf(F, "%s  overwrites:\n", prefix);
-       for (i = 0; i < get_entity_n_overwrites(ent); ++i) {
-         entity *ov = get_entity_overwrites(ent, i);
-         fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
-                 get_type_name(get_entity_owner(ov)));
-       }
+           fprintf(F, "%s  overwrites:\n", prefix);
+           for (i = 0; i < get_entity_n_overwrites(ent); ++i) {
+             entity *ov = get_entity_overwrites(ent, i);
+             fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
+                     get_type_name(get_entity_owner(ov)));
+           }
       } else {
-       fprintf(F, "%s  Does not overwrite other entities. \n", prefix);
+           fprintf(F, "%s  Does not overwrite other entities. \n", prefix);
       }
       if (get_entity_n_overwrittenby(ent) > 0) {
-       fprintf(F, "%s  overwritten by:\n", prefix);
-       for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) {
-         entity *ov = get_entity_overwrittenby(ent, i);
-         fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
-                 get_type_name(get_entity_owner(ov)));
+           fprintf(F, "%s  overwritten by:\n", prefix);
+           for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) {
+             entity *ov = get_entity_overwrittenby(ent, i);
+             fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
+                     get_type_name(get_entity_owner(ov)));
        }
       } else {
-       fprintf(F, "%s  Is not overwritten by other entities. \n", prefix);
+           fprintf(F, "%s  Is not overwritten by other entities. \n", prefix);
       }
     }
 
@@ -508,6 +510,14 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
   if (verbosity & dump_verbosity_accessStats) {
     int n_acc = get_entity_n_accesses(ent);
     int max_depth = 0;
+    int max_L_freq = -1;
+    int max_S_freq = -1;
+    int max_LA_freq = -1;
+    int max_SA_freq = -1;
+    int *L_freq;
+    int *S_freq;
+    int *LA_freq;
+    int *SA_freq;
 
     /* Find maximal depth */
     for (i = 0; i < n_acc; ++i) {
@@ -516,53 +526,46 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       max_depth = (depth > max_depth) ? depth : max_depth ;
     }
 
-    int L_freq[max_depth];
-    int max_L_freq = -1;
-    int S_freq[max_depth];
-    int max_S_freq = -1;
-    int LA_freq[max_depth];
-    int max_LA_freq = -1;
-    int SA_freq[max_depth];
-    int max_SA_freq = -1;
-    for (i = 0; i < max_depth; ++i) {
-      L_freq[i] = 0;
-      LA_freq[i] = 0;
-      S_freq[i] = 0;
-      SA_freq[i] = 0;
-    }
+    L_freq = xmalloc(sizeof(*L_freq) * 4 * max_depth);
+    memset(L_freq, 0, sizeof(*L_freq) * 4 * max_depth);
+
+    S_freq  = L_freq + 1*max_depth;
+    LA_freq = L_freq + 2*max_depth;
+    SA_freq = L_freq + 3*max_depth;
 
     for (i = 0; i < n_acc; ++i) {
       ir_node *acc = get_entity_access(ent, i);
       int depth = get_weighted_loop_depth(acc);
       assert(depth < max_depth);
       if ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) {
-       L_freq[depth]++;
-       max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
-       if (addr_is_alloc(acc)) {
-         LA_freq[depth]++;
-         max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
-       }
+           L_freq[depth]++;
+           max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
+           if (addr_is_alloc(acc)) {
+             LA_freq[depth]++;
+             max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
+           }
       } else if (get_irn_op(acc) == op_Store) {
-       S_freq[depth]++;
-       max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
-       if (addr_is_alloc(acc)) {
-         SA_freq[depth]++;
-         max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq;
-       }
+           S_freq[depth]++;
+           max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
+           if (addr_is_alloc(acc)) {
+             SA_freq[depth]++;
+             max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq;
+           }
       } else {
-       assert(0);
+           assert(0);
       }
     }
 
     if (max_L_freq >= 0) {
-      fprintf(F, "%s  Load  Stats", prefix);
       char comma = ':';
+
+      fprintf(F, "%s  Load  Stats", prefix);
       for (i = 0; i <= max_L_freq; ++i) {
-       if (L_freq[i])
-         fprintf(F, "%c %d x  L%d", comma, L_freq[i], i);
-       else
-         fprintf(F, "         ");
-       comma = ',';
+           if (L_freq[i])
+             fprintf(F, "%c %d x  L%d", comma, L_freq[i], i);
+           else
+             fprintf(F, "         ");
+           comma = ',';
       }
       fprintf(F, "\n");
     }
@@ -570,23 +573,24 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       //fprintf(F, "%s  LoadA Stats", prefix);
       char comma = ':';
       for (i = 0; i <= max_LA_freq; ++i) {
-       //if (LA_freq[i])
-         //fprintf(F, "%c %d x LA%d", comma, LA_freq[i], i);
-         //else
-         //fprintf(F, "         ");
-       comma = ',';
+           //if (LA_freq[i])
+             //fprintf(F, "%c %d x LA%d", comma, LA_freq[i], i);
+             //else
+             //fprintf(F, "         ");
+           comma = ',';
       }
       fprintf(F, "\n");
     }
     if (max_S_freq >= 0) {
-      fprintf(F, "%s  Store Stats", prefix);
       char comma = ':';
+
+      fprintf(F, "%s  Store Stats", prefix);
       for (i = 0; i <= max_S_freq; ++i) {
-       if (S_freq[i])
-         fprintf(F, "%c %d x  S%d", comma, S_freq[i], i);
-       else
-         fprintf(F, "         ");
-       comma = ',';
+           if (S_freq[i])
+             fprintf(F, "%c %d x  S%d", comma, S_freq[i], i);
+           else
+             fprintf(F, "         ");
+           comma = ',';
       }
       fprintf(F, "\n");
     }
@@ -594,14 +598,17 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       //fprintf(F, "%s  StoreAStats", prefix);
       char comma = ':';
       for (i = 0; i <= max_SA_freq; ++i) {
-       //if (SA_freq[i])
-         //fprintf(F, "%c %d x SA%d", comma, SA_freq[i], i);
-       //else
-         //fprintf(F, "         ");
-       comma = ',';
+           //if (SA_freq[i])
+             //fprintf(F, "%c %d x SA%d", comma, SA_freq[i], i);
+           //else
+             //fprintf(F, "         ");
+           comma = ',';
       }
       fprintf(F, "\n");
     }
+
+    /* free allocated space */
+    free(L_freq);
   }
 
 }
@@ -620,6 +627,14 @@ void    dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig
                                       int *max_disp, int disp[], const char *comma) {
   int i, max_depth = 0;
   int n_acc = get_entity_n_accesses(ent);
+  int max_L_freq = -1;
+  int max_S_freq = -1;
+  int max_LA_freq = -1;
+  int max_SA_freq = -1;
+  int *L_freq;
+  int *S_freq;
+  int *LA_freq;
+  int *SA_freq;
 
   /* Find maximal depth */
   for (i = 0; i < n_acc; ++i) {
@@ -628,20 +643,12 @@ void    dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig
     max_depth = (depth > max_depth) ? depth : max_depth ;
   }
 
-  int L_freq[max_depth];
-  int max_L_freq = -1;
-  int S_freq[max_depth];
-  int max_S_freq = -1;
-  int LA_freq[max_depth];
-  int max_LA_freq = -1;
-  int SA_freq[max_depth];
-  int max_SA_freq = -1;
-  for (i = 0; i < max_depth; ++i) {
-    L_freq[i] = 0;
-    LA_freq[i] = 0;
-    S_freq[i] = 0;
-    SA_freq[i] = 0;
-  }
+  L_freq = xmalloc(sizeof(*L_freq) * 4 * max_depth);
+  memset(L_freq, 0, sizeof(*L_freq) * 4 * max_depth);
+
+  S_freq  = L_freq + 1*max_depth;
+  LA_freq = L_freq + 2*max_depth;
+  SA_freq = L_freq + 3*max_depth;
 
   for (i = 0; i < n_acc; ++i) {
     ir_node *acc = get_entity_access(ent, i);
@@ -651,50 +658,56 @@ void    dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig
       L_freq[depth]++;
       max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
       if (addr_is_alloc(acc)) {
-       LA_freq[depth]++;
-       max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
+           LA_freq[depth]++;
+           max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
       }
       if (get_entity_allocation(ent) == allocation_static) {
-       disp[depth]++;
-       *max_disp = (depth > *max_disp) ? depth : *max_disp;
+           disp[depth]++;
+           *max_disp = (depth > *max_disp) ? depth : *max_disp;
       }
     } else if (get_irn_op(acc) == op_Store) {
       S_freq[depth]++;
       max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
       if (addr_is_alloc(acc)) {
-       SA_freq[depth]++;
-       max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq;
+           SA_freq[depth]++;
+           max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq;
       }
       if (get_entity_allocation(ent) == allocation_static) {
-       assert(0);
+           assert(0);
       }
     } else {
       assert(0);
     }
   }
 
-  if (get_entity_allocation(ent) == allocation_static) return;
+  if (get_entity_allocation(ent) != allocation_static) {
 
-  fprintf(F, "%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
+    fprintf(F, "%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
 
-  if (max_L_freq >= 0) {
-    fprintf(F, "%s Load", comma);
-    for (i = 0; i <= max_L_freq; ++i) {
-      fprintf(F, "%s %d", comma, L_freq[i]);
+    if (max_L_freq >= 0) {
+      fprintf(F, "%s Load", comma);
+      for (i = 0; i <= max_L_freq; ++i) {
+        fprintf(F, "%s %d", comma, L_freq[i]);
+      }
     }
-  }
-  if (max_S_freq >= 0) {
-    if (max_L_freq >= 0)    fprintf(F, "\n%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
-    fprintf(F, "%s Store", comma);
-    for (i = 0; i <= max_S_freq; ++i) {
-      fprintf(F, "%s %d", comma, S_freq[i]);
+    if (max_S_freq >= 0) {
+      if (max_L_freq >= 0)    fprintf(F, "\n%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
+      fprintf(F, "%s Store", comma);
+      for (i = 0; i <= max_S_freq; ++i) {
+        fprintf(F, "%s %d", comma, S_freq[i]);
+      }
     }
+    fprintf(F, "\n");
   }
-  fprintf(F, "\n");
+  free(L_freq);
 }
 
 /* A fast hack to dump a csv. */
 void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const char *comma) {
+  int max_freq = -1;
+  int max_disp = -1;
+  int *freq, *disp; /* Accumulated accesses to static members: dispatch table. */
+
   if (!is_class_type(tp)) return;
 
   if (verbosity & dump_verbosity_accessStats) {
@@ -708,14 +721,10 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha
       max_depth = (depth > max_depth) ? depth : max_depth ;
     }
 
-    int freq[max_depth];
-    int max_freq = -1;
-    int disp[max_depth];   /* Accumulated accesses to static members: dispatch table. */
-    int max_disp = -1;
-    for (i = 0; i < max_depth; ++i) {
-      freq[i] = 0;
-      disp[i] = 0;
-    }
+    freq = xmalloc(sizeof(*freq) * 2 * max_depth);
+    memset(freq, 0, sizeof(*freq) * 2 * max_depth);
+
+    disp = freq + max_depth;
 
     for (i = 0; i < n_all; ++i) {
       ir_node *all = get_type_allocation(tp, i);
@@ -731,7 +740,7 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha
 
     if (max_freq >= 0) {
       for (i = 0; i <= max_freq; ++i) {
-       fprintf(F, "%s %d", comma, freq[i]);
+           fprintf(F, "%s %d", comma, freq[i]);
       }
     }
     fprintf(F, "\n");
@@ -739,18 +748,21 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha
     for (i = 0; i < get_class_n_members(tp); ++i) {
       entity *mem = get_class_member(tp, i);
       if (((verbosity & dump_verbosity_methods) &&  is_method_type(get_entity_type(mem))) ||
-         ((verbosity & dump_verbosity_fields)  && !is_method_type(get_entity_type(mem)))   ) {
-       dump_entitycsv_to_file_prefix(F, mem, "    ", verbosity, &max_disp, disp, comma);
+             ((verbosity & dump_verbosity_fields)  && !is_method_type(get_entity_type(mem)))   ) {
+           dump_entitycsv_to_file_prefix(F, mem, "    ", verbosity, &max_disp, disp, comma);
       }
     }
 
     if (max_disp >= 0) {
       fprintf(F, "%s__disp_tab%s Load", get_type_name(tp), comma);
       for (i = 0; i <= max_disp; ++i) {
-       fprintf(F, "%s %d", comma, disp[i]);
+           fprintf(F, "%s %d", comma, disp[i]);
       }
       fprintf(F, "\n");
     }
+
+    /* free allocated space */
+    free(freq);
   }
 }
 
@@ -778,20 +790,20 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) {
     for (i = 0; i < get_class_n_members(tp); ++i) {
       entity *mem = get_class_member(tp, i);
       if (((verbosity & dump_verbosity_methods) &&  is_method_type(get_entity_type(mem))) ||
-         ((verbosity & dump_verbosity_fields)  && !is_method_type(get_entity_type(mem)))   ) {
-       dump_entity_to_file_prefix(F, mem, "    ", verbosity);
+             ((verbosity & dump_verbosity_fields)  && !is_method_type(get_entity_type(mem)))   ) {
+           dump_entity_to_file_prefix(F, mem, "    ", verbosity);
       }
     }
     if (verbosity & dump_verbosity_typeattrs) {
       fprintf(F, "  supertypes: ");
       for (i = 0; i < get_class_n_supertypes(tp); ++i) {
-       type *stp = get_class_supertype(tp, i);
-       fprintf(F, "\n    %s", get_type_name(stp));
+           type *stp = get_class_supertype(tp, i);
+           fprintf(F, "\n    %s", get_type_name(stp));
       }
       fprintf(F, "\n  subtypes: ");
       for (i = 0; i < get_class_n_subtypes(tp); ++i) {
-       type *stp = get_class_subtype(tp, i);
-       fprintf(F, "\n    %s", get_type_name(stp));
+           type *stp = get_class_subtype(tp, i);
+           fprintf(F, "\n    %s", get_type_name(stp));
       }
 
       fprintf(F, "\n  peculiarity: %s", get_peculiarity_string(get_class_peculiarity(tp)));
@@ -804,7 +816,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) {
     for (i = 0; i < get_compound_n_members(tp); ++i) {
       entity *mem = get_compound_member(tp, i);
       if (verbosity & dump_verbosity_fields) {
-       dump_entity_to_file_prefix(F, mem, "    ", verbosity);
+           dump_entity_to_file_prefix(F, mem, "    ", verbosity);
       }
     }
     break;
@@ -826,6 +838,8 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) {
   if (verbosity & dump_verbosity_accessStats) {
     int n_all = get_type_n_allocations(tp);
     int max_depth = 0;
+    int max_freq = -1;
+    int *freq;
 
     /* Find maximal depth */
     for (i = 0; i < n_all; ++i) {
@@ -834,9 +848,8 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) {
       max_depth = (depth > max_depth) ? depth : max_depth ;
     }
 
-    int freq[max_depth];
-    int max_freq = -1;
-    for (i = 0; i < max_depth; ++i) freq[i] = 0;
+    freq = xmalloc(sizeof(*freq) * max_depth);
+    memset(freq, 0, sizeof(*freq) * max_depth);
 
     for (i = 0; i < n_all; ++i) {
       ir_node *all = get_type_allocation(tp, i);
@@ -848,14 +861,17 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) {
     }
 
     if (max_freq >= 0) {
-      fprintf(F, "  Alloc Stats");
       char comma = ':';
+
+      fprintf(F, "  Alloc Stats");
       for (i = 0; i <= max_freq; ++i) {
-       fprintf(F, "%c %d x A%d", comma, freq[i], i);
-       comma = ',';
+           fprintf(F, "%c %d x A%d", comma, freq[i], i);
+           comma = ',';
       }
       fprintf(F, "\n");
     }
+
+    free(freq);
   }
 
   fprintf(F, "\n\n");

diff --git a/ir/ir/irgopt.c b/ir/ir/irgopt.c
index 9292431..12aad29 100644 (file)
--- a/ir/ir/irgopt.c
+++ b/ir/ir/irgopt.c
@@ -1191,7 +1191,7 @@ void inline_small_irgs(ir_graph *irg, int size) {
     for (i = 0; i < env.pos; i++) {
       ir_graph *callee;
       callee = get_entity_irg(get_SymConst_entity(get_Call_ptr(env.calls[i])));
-      if (((_obstack_memory_used(callee->obst) - obstack_room(callee->obst)) < size) ||
+      if (((_obstack_memory_used(callee->obst) - (int)obstack_room(callee->obst)) < size) ||
         (get_irg_inline_property(callee) == irg_inline_forced)) {
         inline_method(env.calls[i], callee);
       }
@@ -1282,7 +1282,7 @@ void inline_leave_functions(int maxsize, int leavesize, int size) {
 
   if (!(get_opt_optimize() && get_opt_inline())) return;
 
-  /* extend all irgs by a temporary data structure for inlineing. */
+  /* extend all irgs by a temporary data structure for inlining. */
   for (i = 0; i < n_irgs; ++i)
     set_irg_link(get_irp_irg(i), new_inline_irg_env());
 
@@ -1310,8 +1310,10 @@ void inline_leave_functions(int maxsize, int leavesize, int size) {
       env = (inline_irg_env *)get_irg_link(current_ir_graph);
 
       for (call = eset_first(env->call_nodes); call; call = eset_next(env->call_nodes)) {
+        ir_graph *callee;
+
         if (get_irn_op(call) == op_Tuple) continue;   /* We already inlined. */
-        ir_graph *callee = get_call_called_irg(call);
+        callee = get_call_called_irg(call);
 
         if (env->n_nodes > maxsize) continue; // break;