Add irn_visited_else_mark(), which combines irn_visited() and mark_irn_visited().

[libfirm] / ir / ana / execution_frequency.c

diff --git a/ir/ana/execution_frequency.c b/ir/ana/execution_frequency.c
index 2ae6f79..b20f551 100644 (file)
--- a/ir/ana/execution_frequency.c
+++ b/ir/ana/execution_frequency.c
@@ -1,5 +1,5 @@
 /*
- * Copyrigth (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -62,6 +62,8 @@ static set *exec_freq_set = NULL;
 static int exec_freq_cmp(const void *e1, const void *e2, size_t size) {
   reg_exec_freq *ef1 = (reg_exec_freq *)e1;
   reg_exec_freq *ef2 = (reg_exec_freq *)e2;
+  (void) size;
+
   return (ef1->reg != ef2->reg);
 }
 
@@ -187,14 +189,15 @@ static void my_irg_walk_current_graph(irg_walk_func *pre, irg_walk_func *post, v
 }
 
 
-static void walk_pre(ir_node *n, void *env) {
-
-  if (get_irn_op(n) == op_Raise)
+static void walk_pre(ir_node *n, void *env)
+{
+  (void) env;
+  if (is_Raise(n))
     just_passed_a_Raise = 1;
 
-  if (   (get_irn_op(n) == op_Proj)
-      && (get_irn_op(get_Proj_pred(n)) == op_Cond)
-      && (just_passed_a_Raise)) {
+  if (get_irn_op(n) == op_Proj  &&
+      is_Cond(get_Proj_pred(n)) &&
+      just_passed_a_Raise) {
     ir_node *other_proj;
     ir_node *c = get_Proj_pred(n);
 
@@ -212,21 +215,23 @@ static void walk_pre(ir_node *n, void *env) {
     }
   }
 
-  if (get_irn_op(n) == op_Cond) {
+  if (is_Cond(n)) {
     set_irn_link(n, Cond_list);
     Cond_list = n;
   }
 }
 
-static void walk_post(ir_node *n, void *env) {
-
-  if (get_irn_op(n) == op_Raise)
+static void walk_post(ir_node *n, void *env)
+{
+  (void) env;
+  if (is_Raise(n))
     just_passed_a_Raise = 0;
 
-  if (   (get_irn_op(n) == op_Proj)
-      && (get_irn_op(get_Proj_pred(n)) == op_Cond)
-      && ((get_ProjX_probability(n) == Cond_prob_exception_taken)    ||
-         (get_ProjX_probability(n) == Cond_prob_was_exception_taken)   )) {
+  if (get_irn_op(n) == op_Proj  &&
+      is_Cond(get_Proj_pred(n)) && (
+        get_ProjX_probability(n) == Cond_prob_exception_taken ||
+        get_ProjX_probability(n) == Cond_prob_was_exception_taken
+      )) {
     just_passed_a_Raise = 1;
   }
 }
@@ -292,7 +297,9 @@ int is_fragile_Proj(ir_node *n) {
 
 static double exception_prob = 0.001;
 
-static INLINE int is_loop_head(ir_node *cond) {
+static INLINE int is_loop_head(ir_node *cond)
+{
+  (void) cond;
   return 0;
 }
 
@@ -309,7 +316,7 @@ static INLINE double get_weighted_region_exec_freq(void *reg, int pos) {
   ir_node *cfop;
   if (is_ir_node(reg)) {
     cfop = get_Block_cfgpred((ir_node *)reg, pos);
-    if (is_Proj(cfop) && (get_irn_op(get_Proj_pred(cfop)) != op_Cond))
+    if (is_Proj(cfop) && !is_Cond(get_Proj_pred(cfop)))
       cfop = skip_Proj(cfop);
   } else {
     assert(is_ir_loop(reg));
@@ -347,8 +354,10 @@ static INLINE void compute_region_freqency(void *reg, double head_weight) {
   set_region_exec_freq(reg, my_freq);
 }
 
-static void check_proper_head(ir_loop *l, void *reg) {
+static void check_proper_head(ir_loop *l, void *reg)
+{
   int i, n_ins = get_region_n_ins(reg);
+  (void) l;
   for (i = 0; i < n_ins; ++i) {
     assert(!get_region_in(reg, i));
   }