- Phi nodes are now collected by collect_phiprojs() and stored into a phi-list attrib...

[libfirm] / ir / lower / lower_intrinsics.c

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index 4288bee..e5ac97a 100644 (file)
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (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.
  *
@@ -63,8 +63,7 @@ static void call_mapper(ir_node *node, void *env) {
                ir_entity *ent;
 
                symconst = get_Call_ptr(node);
-               if (get_irn_op(symconst) != op_SymConst ||
-                       get_SymConst_kind(symconst) != symconst_addr_ent)
+               if (! is_SymConst_addr_ent(symconst))
                        return;
 
                ent = get_SymConst_entity(symconst);
@@ -161,8 +160,9 @@ unsigned lower_intrinsics(i_record *list, int length, int part_block_used) {
  * @param exc_jmp  new exception control flow, if reg_jmp == NULL, a Bad will be used
  */
 static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg_jmp, ir_node *exc_jmp) {
+       ir_node *block = get_nodes_block(call);
+
        if (reg_jmp == NULL) {
-               ir_node *block = get_nodes_block(call);
 
                /* Beware: do we need here a protection against CSE? Better we do it. */
                int old_cse = get_opt_cse();
@@ -171,7 +171,7 @@ static void replace_call(ir_node *irn, ir_node *call, ir_node *mem, ir_node *reg
                set_opt_cse(old_cse);
                exc_jmp = new_Bad();
        }
-       irn = new_Tuple(1, &irn);
+       irn = new_r_Tuple(current_ir_graph, block, 1, &irn);
 
        turn_into_tuple(call, pn_Call_max);
        set_Tuple_pred(call, pn_Call_M_regular, mem);
@@ -480,7 +480,7 @@ int i_mapper_tanh(ir_node *call, void *ctx) {
  */
 static ir_entity *get_const_entity(ir_node *ptr) {
        /* FIXME: this cannot handle constant strings inside struct initializers yet */
-       if (is_SymConst(ptr) && get_SymConst_kind(ptr) == symconst_addr_ent) {
+       if (is_SymConst_addr_ent(ptr)) {
                ir_entity *ent = get_SymConst_entity(ptr);
 
                if (get_entity_variability(ent) == variability_constant) {
@@ -541,6 +541,8 @@ int i_mapper_strlen(ir_node *call, void *ctx) {
        ir_node *s     = get_Call_param(call, 0);
        ir_entity *ent = get_const_entity(s);
 
+       (void) ctx;
+
        /* FIXME: this cannot handle constant strings inside struct initializers yet */
        if (ent != NULL) {
                /* a constant entity */
@@ -922,7 +924,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
 
        /* step 1: create the call */
        sym.entity_p = rt->ent;
-       addr = new_r_SymConst(irg, bl, sym, symconst_addr_ent);
+       addr = new_r_SymConst(irg, bl, mode_P_code, sym, symconst_addr_ent);
        call = new_rd_Call(get_irn_dbg_info(node), irg, bl, mem, addr, n_param, in, mtp);
        set_irn_pinned(call, get_irn_pinned(node));