Fixed register allocation for fp != sp

[libfirm] / ir / be / bechordal_t.h

diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 08f0dca..206c5ac 100644 (file)
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -8,6 +8,9 @@
 #ifndef _BECHORDAL_T_H
 #define _BECHORDAL_T_H
 
+#include "firm_types.h"
+#include "firm_config.h"
+
 #include <stdlib.h>
 
 #include "bitset.h"
@@ -17,9 +20,6 @@
 #include "pmap.h"
 #include "set.h"
 
-#include "irnode.h"
-#include "irgraph.h"
-
 #include "be_t.h"
 #include "beifg.h"
 #include "bera.h"
@@ -54,14 +54,14 @@ typedef struct _border_t {
 struct _be_chordal_env_t {
        struct obstack obst;              /**< An obstack for temporary storage. */
        be_ra_chordal_opts_t *opts;       /**< A pointer to the chordal ra options. */
-       firm_dbg_module_t *dbg;           /**< Debug module for the chordal register allocator. */
-       const be_main_env_t *main_env;    /**< Environment with back-end data. */
+       const be_irg_t *birg;             /**< Back-end IRG session. */
        dom_front_info_t *dom_front;      /**< Dominance frontiers. */
        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. */
        void *data;                       /**< Some pointer, to which different phases can attach data to. */
+       DEBUG_ONLY(firm_dbg_module_t *dbg;) /**< Debug module for the chordal register allocator. */
 };
 
 static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *inf, ir_node *bl) {
@@ -75,12 +75,18 @@ static INLINE struct list_head *_get_block_border_head(const be_chordal_env_t *i
 #define border_prev(b)                      (list_entry((b)->list.prev, border_t, list))
 
 #define chordal_has_class(chordal_env, irn) \
-       arch_irn_has_reg_class(chordal_env->main_env->arch_env, irn, -1, chordal_env->cls)
+       arch_irn_consider_in_reg_alloc(chordal_env->birg->main_env->arch_env, chordal_env->cls, irn)
 
 int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b);
 
 void be_ra_chordal_color(be_chordal_env_t *chordal_env);
 
+/**
+ * Check a register allocation obtained with the chordal register allocator.
+ * @param chordal_env The chordal environment.
+ */
+void be_ra_chordal_check(be_chordal_env_t *chordal_env);
+
 enum {
        /* spill method */
        BE_CH_SPILL_BELADY    = 1,
@@ -106,9 +112,10 @@ enum {
        BE_CH_IFG_STD         = 1,
        BE_CH_IFG_FAST        = 2,
 
-       /* lower perm method */
-       BE_CH_LOWER_PERM_SWAP = 1,
-       BE_CH_LOWER_PERM_COPY = 2
+       /* lower perm options */
+       BE_CH_LOWER_PERM_SWAP   = (1 << 0),
+       BE_CH_LOWER_PERM_COPY   = (1 << 1),
+       BE_CH_LOWER_PERM_STAT   = (1 << 2)
 };
 
 struct _be_ra_chordal_opts_t {
@@ -116,7 +123,7 @@ struct _be_ra_chordal_opts_t {
        int spill_method;
        int copymin_method;
        int ifg_flavor;
-       int lower_perm_method;
+       int lower_perm_opt;
 
        char ilp_server[128];
        char ilp_solver[128];