simplify begnuas.c by not sorting entities into sections

[libfirm] / ir / opt / proc_cloning.c

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 1e29e6a..82cbebb 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.
  *
@@ -35,22 +35,18 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
 
+#include "iroptimize.h"
 #include "tv.h"
 #include "set.h"
-#include "entity.h"
 #include "irprog_t.h"
 #include "hashptr.h"
 #include "irgwalk.h"
-#include "proc_cloning.h"
 #include "analyze_irg_args.h"
 #include "irprintf.h"
 #include "ircons.h"
 #include "irouts.h"
-#include "mangle.h"
 #include "irnode_t.h"
 #include "irtools.h"
 #include "irgmod.h"
@@ -191,11 +187,7 @@ 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_SymConst_addr_ent(call_ptr))
                        return;
 
                callee = get_SymConst_entity(call_ptr);
@@ -273,6 +265,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.*/
@@ -442,7 +435,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. */
@@ -469,7 +462,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);