X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=3191c4887914530f9e3509228ed622513396326b;hb=ce470efc35a72852c338aa15623b2a661dec1b34;hp=f5352be1edade10cf4d2e60b6c4e7e70d3dfe843;hpb=e1397b01aceb38b6bb62c319007146af3b922f39;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index f5352be1e..3191c4887 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -40,12 +40,12 @@
 #include "be_t.h"
 #include "beutil.h"
 #include "bechordal_t.h"
-#include "bearch_t.h"
+#include "bearch.h"
 #include "belive_t.h"
-#include "benode_t.h"
-#include "besched_t.h"
+#include "benode.h"
+#include "besched.h"
 #include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beintlive_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -147,7 +147,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			 * create one. The only restriction is, that the phi argument
 			 * may not be live in at the current block, since this argument
 			 * interferes with the phi and must thus not be member of a
-			 * Perm. A copy will be inserted for this argument alter on.
+			 * Perm. A copy will be inserted for this argument later on.
 			 */
 			if(!pp && !be_is_live_in(lv, bl, arg)) {
 				templ.pos = n_projs++;
@@ -258,7 +258,7 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 
 			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
 
-			if (values_interfere(chordal_env->birg, phi, arg)) {
+			if (be_values_interfere(lv, phi, arg)) {
 				/*
 					Insert a duplicate in arguments block,
 					make it the new phi arg,
@@ -405,7 +405,7 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) {
 	DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
 	irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
 
-	/* TODO: unfortunaltely updating doesn't work yet. */
+	/* TODO: unfortunately updating doesn't work yet. */
 	be_liveness_invalidate(lv);
 
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)