added phase reinit data per irn

[libfirm] / ir / lower / lower_intrinsics.c

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index 432e12c..69bfc6f 100644 (file)
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -27,6 +27,8 @@
 #include "irgwalk.h"
 #include "ircons.h"
 #include "irgmod.h"
+#include "irgopt.h"
+#include "trouts.h"
 #include "lower_intrinsics.h"
 #include "pmap.h"
 
@@ -34,7 +36,7 @@
 typedef struct _walker_env {
   pmap     *c_map;              /**< The intrinsic call map. */
   unsigned nr_of_intrinsics;    /**< statistics */
-  const i_instr_record **i_map; /**< The intrinsic instruction map. */
+  i_instr_record **i_map;       /**< The intrinsic instruction map. */
 } walker_env_t;
 
 /**
@@ -66,21 +68,26 @@ static void call_mapper(ir_node *node, void *env) {
   else {
     if (0 <= op->code && op->code < ARR_LEN(wenv->i_map)) {
       const i_instr_record *r = wenv->i_map[op->code];
-      if (r) {  /* we have a mapper */
-        wenv->nr_of_intrinsics += r->i_mapper(node, r->ctx) ? 1 : 0;
+      /* run all possible mapper */
+      while (r) {
+        if (r->i_mapper(node, r->ctx)) {
+          ++wenv->nr_of_intrinsics;
+          break;
+        }
+        r = r->link;
       }
     }
   }
 }
 
 /* Go through all graphs and map calls to intrinsic functions. */
-unsigned lower_intrinsics(const i_record *list, int length) {
-  int                  i, n_ops = get_irp_n_opcodes();
-  ir_graph             *irg;
-  pmap                 *c_map = pmap_create_ex(length);
-  const i_instr_record **i_map;
-  unsigned             nr_of_intrinsics = 0;
-  walker_env_t         wenv;
+unsigned lower_intrinsics(i_record *list, int length) {
+  int            i, n_ops = get_irp_n_opcodes();
+  ir_graph       *irg;
+  pmap           *c_map = pmap_create_ex(length);
+  i_instr_record **i_map;
+  unsigned       nr_of_intrinsics = 0;
+  walker_env_t   wenv;
 
   /* we use the ir_op generic pointers here */
   NEW_ARR_A(const i_instr_record *, i_map, n_ops);
@@ -88,14 +95,15 @@ unsigned lower_intrinsics(const i_record *list, int length) {
 
   /* fill a map for faster search */
   for (i = length - 1; i >= 0; --i) {
-    if (list->i_call.kind == INTRINSIC_CALL) {
+    if (list[i].i_call.kind == INTRINSIC_CALL) {
       pmap_insert(c_map, list[i].i_call.i_ent, (void *)&list[i].i_call);
     }
     else {
-      ir_op *op = list->i_instr.op;
+      ir_op *op = list[i].i_instr.op;
       assert(0 <= op->code && op->code < ARR_LEN(i_map));
 
-      i_map[op->code] = &list->i_instr;
+      list[i].i_instr.link = i_map[op->code];
+      i_map[op->code] = &list[i].i_instr;
     }
   }
 
@@ -115,8 +123,15 @@ unsigned lower_intrinsics(const i_record *list, int length) {
 
       /* exception control flow might have changed */
       set_irg_doms_inconsistent(irg);
+      set_irg_extblk_inconsistent(irg);
       set_irg_loopinfo_inconsistent(irg);
 
+      /* calls might be removed/added */
+      set_trouts_inconsistent();
+
+      /* optimize it, tuple might be created */
+      local_optimize_graph(irg);
+
       nr_of_intrinsics += wenv.nr_of_intrinsics;
     }
   }
@@ -254,24 +269,27 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
     res_proj = new_r_Proj(irg, bl, call, mode_T, pn_Call_T_result);
 
   if (n_proj > 0) {
-    n_proj += n_res;
+    n_proj += n_res - 1;
 
     /* we are ready */
     turn_into_tuple(node, n_proj);
 
     for (i = 0; i < n_proj; ++i)
       set_Tuple_pred(node, i, new_r_Bad(irg));
-    if (rt->mem_proj_nr > 0)
+    if (rt->mem_proj_nr >= 0)
       set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_regular));
-    if (rt->exc_proj_nr > 0)
-      set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_except));
-    if (rt->exc_mem_proj_nr > 0)
-      set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_except));
+    if (get_irn_op(mem) != op_NoMem) {
+      /* Exceptions can only be handled with real memory */
+      if (rt->exc_proj_nr >= 0)
+        set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_except));
+      if (rt->exc_mem_proj_nr >= 0)
+        set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_except));
+    }
 
-    if (rt->res_proj_nr > 0)
+    if (rt->res_proj_nr >= 0)
       for (i = 0; i < n_res; ++i)
         set_Tuple_pred(node, rt->res_proj_nr + i,
-          new_r_Proj(irg, bl, call, get_type_mode(get_method_res_type(mtp, i)), i));
+          new_r_Proj(irg, bl, res_proj, get_type_mode(get_method_res_type(mtp, i)), i));
     return 1;
   }
   else {
@@ -280,7 +298,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
       ir_mode *mode = get_type_mode(get_method_res_type(mtp, 0));
 
       res_proj = new_r_Proj(irg, bl, call, mode_T, pn_Call_T_result);
-      res_proj = new_r_Proj(irg, bl, call, mode, 0);
+      res_proj = new_r_Proj(irg, bl, res_proj, mode, 0);
 
       exchange(node, res_proj);
       return 1;