removed firm.ini which should not be here

[libfirm] / ir / be / bera.c

diff --git a/ir/be/bera.c b/ir/be/bera.c
index 024452a..f3b0139 100644 (file)
--- a/ir/be/bera.c
+++ b/ir/be/bera.c
@@ -20,27 +20,27 @@
 
 int value_dominates(const ir_node *a, const ir_node *b)
 {
-  int res = 0;
+       int res = 0;
        const ir_node *ba = get_block(a);
        const ir_node *bb = get_block(b);
 
-  /*
-   * a and b are not in the same block,
-   * so dominance is determined by the dominance of the blocks.
-   */
-  if(ba != bb)
-    res = block_dominates(ba, bb);
+       /*
+        * a and b are not in the same block,
+        * so dominance is determined by the dominance of the blocks.
+        */
+       if(ba != bb) {
+               res = block_dominates(ba, bb);
 
-  /*
-   * Dominance is determined by the time steps of the schedule.
-   */
-  else {
-    sched_timestep_t as = sched_get_time_step(a);
-    sched_timestep_t bs = sched_get_time_step(b);
-    res = as <= bs;
-  }
+       /*
+        * Dominance is determined by the time steps of the schedule.
+        */
+       } else {
+               sched_timestep_t as = sched_get_time_step(a);
+               sched_timestep_t bs = sched_get_time_step(b);
+               res = as <= bs;
+       }
 
-  return res;
+       return res;
 }
 
 /**
@@ -49,25 +49,25 @@ int value_dominates(const ir_node *a, const ir_node *b)
  * @param b The second value.
  * @return 1, if a and b interfere, 0 if not.
  */
-int values_interfere(const ir_node *a, const ir_node *b)
+int values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b)
 {
-  int a2b = value_dominates(a, b);
-  int b2a = value_dominates(b, a);
+       int a2b = value_dominates(a, b);
+       int b2a = value_dominates(b, a);
 
-  /* If there is no dominance relation, they do not interfere. */
-  if((a2b | b2a) > 0) {
-    const ir_edge_t *edge;
-    ir_node *bb;
+       /* If there is no dominance relation, they do not interfere. */
+       if((a2b | b2a) > 0) {
+               const ir_edge_t *edge;
+               ir_node *bb;
 
-    /*
-     * Adjust a and b so, that a dominates b if
-     * a dominates b or vice versa.
-     */
-    if(b2a) {
-      const ir_node *t = a;
-      a = b;
-      b = t;
-    }
+               /*
+                * Adjust a and b so, that a dominates b if
+                * a dominates b or vice versa.
+                */
+               if(b2a) {
+                       const ir_node *t = a;
+                       a = b;
+                       b = t;
+               }
 
                bb = get_nodes_block(b);
 
@@ -75,7 +75,7 @@ int values_interfere(const ir_node *a, const ir_node *b)
      * If a is live end in b's block it is
      * live at b's definition (a dominates b)
      */
-    if(is_live_end(bb, a))
+    if(be_is_live_end(lv, bb, a))
       return 1;
 
     /*
@@ -91,10 +91,7 @@ int values_interfere(const ir_node *a, const ir_node *b)
      */
     foreach_out_edge(a, edge) {
       const ir_node *user = edge->src;
-      if(get_nodes_block(user) == bb
-          && !is_Phi(user)
-                                       && b != user
-          && value_dominates(b, user))
+      if(get_nodes_block(user) == bb && !is_Phi(user) && b != user && value_dominates(b, user))
         return 1;
     }
   }