- handle strictConv and remainderlessDiv for in opcode map

[libfirm] / ir / opt / proc_cloning.c

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 7fc2838..3099f53 100644 (file)
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.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.
  *
@@ -31,9 +31,7 @@
  * aren't be constant. The constant parameters of the function are placed
  * in the function graph. They aren't be passed as parameters.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -50,11 +48,7 @@
 #include "irnode_t.h"
 #include "irtools.h"
 #include "irgmod.h"
-#include "array.h"
-#include "xmalloc.h"
-
-/* A macro to iterate sets.*/
-#define ITERATE_SET(set_entries, entry) for(entry = set_first(set_entries); entry; entry = set_next(set_entries))
+#include "array_t.h"
 
 /**
  * This struct contains the information quadruple for a Call, which we need to
@@ -187,19 +181,19 @@ static void collect_irg_calls(ir_node *call, void *env) {
        if (is_Call(call)) {
                call_ptr = get_Call_ptr(call);
 
-               /* Call pointer must be a SymConst*/
-               if (op_SymConst != get_irn_op(call_ptr))
-                       return;
-               /* Call pointer must be the address of an entity.*/
-               if (get_SymConst_kind(call_ptr) != symconst_addr_ent)
+               if (! is_Global(call_ptr))
                        return;
 
-               callee = get_SymConst_entity(call_ptr);
+               callee = get_Global_entity(call_ptr);
 
                /* we can only clone calls to existing entities */
                if (get_entity_visibility(callee) == visibility_external_allocated)
                        return;
 
+               /* we cannot clone calls to weak functions */
+               if (get_entity_additional_properties(callee) & mtp_property_weak)
+                       return;
+
                process_call(call, callee, hmap);
        }
 }
@@ -218,7 +212,7 @@ static ident *get_clone_ident(ident *id, int pos, unsigned nr) {
 
        snprintf(clone_postfix, sizeof(clone_postfix), "_cl_%d_%u", pos, nr);
 
-       return mangle(id, new_id_from_str(clone_postfix));
+       return id_mangle(id, new_id_from_str(clone_postfix));
 }
 
 /**
@@ -269,6 +263,7 @@ static void set_preds(ir_node *irn, void *env) {
        irn_copy  = get_irn_link(irn);
 
        if (is_Block(irn)) {
+               set_Block_MacroBlock(irn_copy, get_irn_link(get_Block_MacroBlock(irn)));
                for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
                        pred = get_Block_cfgpred(irn, i);
                        /* "End" block must be handled extra, because it is not matured.*/
@@ -280,7 +275,7 @@ static void set_preds(ir_node *irn, void *env) {
        } else {
                /* First we set the block our copy if it is not a block.*/
                set_nodes_block(irn_copy, get_irn_link(get_nodes_block(irn)));
-               if (get_irn_op(irn) == op_End) {
+               if (is_End(irn)) {
                        /* Handle the keep-alives. This must be done separately, because
                           the End node was NOT copied */
                        for (i = 0; i < get_End_n_keepalives(irn); ++i)
@@ -317,7 +312,7 @@ static ir_node *get_irg_arg(ir_graph *irg, int pos) {
                                 * We rely on the fact the only one arg exists, so do
                                 * a cheap CSE in this case.
                                 */
-                               set_irn_out(irg_args, i, arg);
+                               set_irn_out(irg_args, i, arg, 0);
                                exchange(proj, arg);
                        } else
                                arg = proj;
@@ -346,7 +341,7 @@ static void create_clone_proc_irg(ir_entity *ent, quadruple_t *q) {
        arg        = get_irg_arg(get_entity_irg(q->ent), q->pos);
        /* we will replace the argument in position "q->pos" by this constant. */
        const_arg  = new_r_Const_type(
-               clone_irg, get_nodes_block(arg), get_irn_mode(arg), q->tv,
+               clone_irg, get_irn_mode(arg), q->tv,
                get_method_param_type(get_entity_type(q->ent), q->pos));
 
        /* args copy in the cloned graph will be the const. */
@@ -438,7 +433,7 @@ static ir_entity *clone_method(quadruple_t *q) {
        sym.entity_p = new_entity;
        rem = current_ir_graph;
        current_ir_graph =  get_const_code_irg();
-       new_entity->value = new_SymConst(sym, symconst_addr_ent);
+       new_entity->value = new_SymConst(mode_P_code, sym, symconst_addr_ent);
        current_ir_graph = rem;
 
        /* The "new_entity" don't have this information. */
@@ -465,7 +460,7 @@ static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, int pos) {
        ir_node *bl = get_nodes_block(call);
 
        sym.entity_p = new_entity;
-       callee = new_r_SymConst(irg, bl, sym, symconst_addr_ent);
+       callee = new_r_SymConst(irg, bl, mode_P_code, sym, symconst_addr_ent);
 
        mtp      = get_entity_type(new_entity);
        n_params = get_Call_n_params(call);
@@ -512,7 +507,7 @@ static void exchange_calls(quadruple_t *q, ir_entity *cloned_ent) {
  */
 static float calculate_weight(const entry_t *entry) {
        return ARR_LEN(entry->q.calls) *
-               (get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
+               (float)(get_method_param_weight(entry->q.ent, entry->q.pos) + 1);
 }
 
 /**
@@ -539,7 +534,7 @@ restart:
 
                /* we know, that a SymConst is here */
                ptr = get_Call_ptr(call);
-               assert(get_irn_op(ptr) == op_SymConst);
+               assert(is_SymConst(ptr));
 
                callee = get_SymConst_entity(ptr);
                if (callee != entry->q.ent) {