X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillremat.c;h=2d418f6374c3c7478fec1b7d9f2b95c430bf0787;hb=4d808298b72e72bd06c7466e837dd9dda4eb1070;hp=5ab9f4b0391786b7b9a653355ed3133256cad99e;hpb=c3e48b153136c5786da9aa903e34b551e798b74d;p=libfirm

diff --git a/ir/be/bespillremat.c b/ir/be/bespillremat.c
index 5ab9f4b03..2d418f637 100644
--- a/ir/be/bespillremat.c
+++ b/ir/be/bespillremat.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.
  *
@@ -51,6 +51,7 @@
 #include "execfreq.h"
 #include "irvrfy.h"
 #include "irbackedge_t.h"
+#include "irprofile.h"
 
 #include <lpp/lpp.h>
 #include <lpp/mps.h>
@@ -70,13 +71,12 @@
 #include "bespillremat.h"
 #include "bespill.h"
 #include "bepressurestat.h"
-#include "beprofile.h"
 #include "bespilloptions.h"
 #include "bechordal_t.h"
 #include "bemodule.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #define DUMP_PROBLEM       1
 #define DUMP_MPS           2
@@ -3247,6 +3247,9 @@ is_zero(double x)
 	return fabs(x) < 0.00001;
 }
 
+/**
+ * node attribute hook for changing colors
+ */
 static int mark_remat_nodes_hook(FILE *F, ir_node *n, ir_node *l)
 {
 	spill_ilp_t *si = get_irg_link(current_ir_graph);
@@ -3601,7 +3604,7 @@ new_r_PhiM_nokeep(ir_graph * irg, ir_node *block, int arity, ir_node **in)
 	assert( get_irn_arity(block) == arity );
 
 	res = new_ir_node(NULL, irg, block, op_Phi, mode_M, arity, in);
-	res->attr.phi_backedge = new_backedge_arr(irg->obst, arity);
+	res->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
 
 	return res;
 }