X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=38159e468cf6a6ca155d7df6e973496cb3430127;hb=6ee1fce95429dbf57fda4455ca5f2cf011ac8190;hp=b566cecd0795690d18bba0e2a2b3aff5a60049ca;hpb=d1de7107f847963fbce099597e6c42c2371b053c;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index b566cecd0..38159e468 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -1,20 +1,6 @@
 /*
- * 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.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,7 +8,6 @@
  * @brief       Internal data structures for the chordal register allocator.
  * @author      Sebastian Hack
  * @date        25.01.2005
- * @version     $Id$
  */
 #ifndef FIRM_BE_BECHORDAL_T_H
 #define FIRM_BE_BECHORDAL_T_H
@@ -35,12 +20,8 @@
 #include "debug.h"
 
 #include "bechordal.h"
-#include "beirg.h"
 #include "beifg.h"
 
-/** Defines an invalid register index. */
-#define NO_COLOR (-1)
-
 /**
  * A liveness interval border.
  */
@@ -62,30 +43,21 @@ struct border_t {
  * Environment for each of the chordal register allocator phases
  */
 struct be_chordal_env_t {
-	struct obstack       *obst;         /**< An obstack for temporary storage. */
+	struct obstack        obst;         /**< An obstack for temporary storage. */
 	be_ra_chordal_opts_t *opts;         /**< A pointer to the chordal ra options. */
-	be_irg_t             *birg;         /**< Back-end IRG session. */
 	ir_graph             *irg;          /**< The graph under examination. */
 	const arch_register_class_t *cls;   /**< The current register class. */
 	pmap                 *border_heads; /**< Maps blocks to border heads. */
 	be_ifg_t             *ifg;          /**< The interference graph. */
-	bitset_t             *ignore_colors;/**< A set of colors which shall be ignored in register allocation. */
+	bitset_t             *allocatable_regs; /**< set of allocatable registers */
 };
 
-static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *inf, ir_node *bl) {
-  return pmap_get(inf->border_heads, bl);
+static inline struct list_head *get_block_border_head(be_chordal_env_t const *const inf, ir_node *const bl)
+{
+  return pmap_get(list_head, inf->border_heads, bl);
 }
 
-#define get_block_border_head(info, bl)     _get_block_border_head(info, bl)
-
-#define foreach_border_head(head, pos)		list_for_each_entry_reverse(border_t, pos, head, list)
-#define border_next(b)                      (list_entry((b)->list.next, border_t, list))
-#define border_prev(b)                      (list_entry((b)->list.prev, border_t, list))
-
-#define chordal_has_class(chordal_env, irn) \
-	arch_irn_consider_in_reg_alloc(chordal_env->birg->main_env->arch_env, chordal_env->cls, irn)
-
-void be_ra_chordal_color(be_chordal_env_t *chordal_env);
+#define foreach_border_head(head, pos)      list_for_each_entry_reverse(border_t, pos, head, list)
 
 enum {
 	/* Dump flags */
@@ -99,7 +71,8 @@ enum {
 	BE_CH_DUMP_CONSTR     = (1 << 7),
 	BE_CH_DUMP_SPILLSLOTS = (1 << 8),
 	BE_CH_DUMP_LOWER      = (1 << 9),
-	BE_CH_DUMP_APPEL      = (1 << 10),
+	BE_CH_DUMP_SPLIT      = (1 << 10),
+	BE_CH_DUMP_APPEL      = (1 << 11),
 	BE_CH_DUMP_ALL        = 2 * BE_CH_DUMP_APPEL - 1,
 
 	/* lower perm options */
@@ -113,14 +86,11 @@ enum {
 };
 
 struct be_ra_chordal_opts_t {
-	int dump_flags;
-	int lower_perm_opt;
-	int vrfy_option;
-
-	char ilp_server[128];
-	char ilp_solver[128];
+	unsigned dump_flags;
+	int      lower_perm_opt;
+	int      vrfy_option;
 };
 
-void be_pre_spill_prepare_constr(be_chordal_env_t *cenv);
+void check_for_memory_operands(ir_graph *irg);
 
 #endif /* FIRM_BE_BECHORDAL_T_H */