enabled non-ia32 backends again: undo change 14191

[libfirm] / ir / be / bessadestr.c

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 39f4480..41c11d3 100644 (file)
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -1,10 +1,28 @@
-/**
- * Author:      Daniel Grund
- * Date:               25.05.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
  *
- * Performs SSA-Destruction.
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Performs SSA-Destruction.
+ * @author      Daniel Grund
+ * @date        25.05.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,12 +42,14 @@
 #include "be_t.h"
 #include "beutil.h"
 #include "bechordal_t.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "belive_t.h"
 #include "benode_t.h"
 #include "besched_t.h"
 #include "benodesets.h"
 #include "bestatevent.h"
+#include "beirg_t.h"
+#include "beintlive_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -53,7 +73,7 @@ static void clear_link(ir_node *irn, void *data) {
  */
 static void collect_phis_walker(ir_node *irn, void *data) {
        be_chordal_env_t *env = data;
-       if(is_Phi(irn) && chordal_has_class(env, irn)) {
+       if (is_Phi(irn) && chordal_has_class(env, irn)) {
                ir_node *bl = get_nodes_block(irn);
                set_irn_link(irn, get_irn_link(bl));
                set_irn_link(bl, irn);
@@ -201,7 +221,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
  */
 static void    set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
        be_chordal_env_t *chordal_env = data;
-       be_lv_t *lv = chordal_env->birg->lv;
        ir_node *phi;
 
        /* Consider all phis of this block */
@@ -227,7 +246,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(lv, phi, arg)) {
+                       if (values_interfere(chordal_env->birg, phi, arg)) {
                                /*
                                        Insert a duplicate in arguments block,
                                        make it the new phi arg,