X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_t.h;h=e7cc1df457059aa00ab537e77ee615e54cef7a88;hb=2d83376719b1bd5fd45da73de41d0e3656bb52da;hp=a7dcb36abb45c0c9096775b21b33ab8fc42ad07a;hpb=ce6161a7e42a48f7422b7babcc64d8ace18e2687;p=libfirm

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index a7dcb36ab..e7cc1df45 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -22,7 +22,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 +34,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.
  */
@@ -71,20 +66,12 @@ struct be_chordal_env_t {
 	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 (list_head*)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->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 */
@@ -98,7 +85,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 */
@@ -112,12 +100,9 @@ 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 check_for_memory_operands(ir_graph *irg);