new name for register requirement

[libfirm] / ir / be / becopyopt.h

diff --git a/ir/be/becopyopt.h b/ir/be/becopyopt.h
index 1c3bea7..43b432a 100644 (file)
--- a/ir/be/becopyopt.h
+++ b/ir/be/becopyopt.h
@@ -37,6 +37,9 @@
 #define DEBUG_LVL_HEUR SET_LEVEL_0
 #define DEBUG_LVL_ILP  SET_LEVEL_0
 
+#define MIS_HEUR_TRIGGER 8
+
+
 typedef int(*cost_fct_t)(ir_node*, ir_node*, int);
 
 /**
@@ -70,12 +73,12 @@ typedef struct _unit_t {
 } unit_t;
 
 /* Helpers */
-#define get_arch_env(co) ((co)->chordal_env->session_env->main_env->arch_env)
-#define get_irg(co)      ((co)->chordal_env->session_env->irg)
+#define get_arch_env(co) ((co)->chordal_env->main_env->arch_env)
+#define get_irg(co)      ((co)->chordal_env->irg)
 #define get_irn_col(co, irn) \
-       arch_register_get_index(arch_get_irn_register(get_arch_env(co), irn, 0))
+       arch_register_get_index(arch_get_irn_register(get_arch_env(co), irn))
 #define set_irn_col(co, irn, col) \
-       arch_set_irn_register(get_arch_env(co), irn, 0, arch_register_for_index(co->chordal_env->cls, col))
+       arch_set_irn_register(get_arch_env(co), irn, arch_register_for_index(co->chordal_env->cls, col))
 
 
 #define list_entry_units(lh) list_entry(lh, unit_t, units)
@@ -107,7 +110,7 @@ void free_copy_opt(copy_opt_t *co);
 /**
  * Checks if a node is optimizable, viz. is a target of a 'copy-op'
  */
-#define is_optimizable(arch_env, irn) ((is_Phi(irn) && mode_is_datab(get_irn_mode(irn))) || is_Copy(arch_env, irn))
+#define is_optimizable(arch_env, irn) ((is_Phi(irn) && is_firm_be_mode(get_irn_mode(irn))) || is_Copy(arch_env, irn))
 
 /**
  * Checks if the irn is a non-interfering argument of a node which 'is_optimizable'
@@ -162,7 +165,7 @@ void co_heur_opt(copy_opt_t *co);
 
 /**
  * Solves the problem using mixed integer programming
- * @retruns 1 iff solution state was optimal
+ * @returns 1 iff solution state was optimal
  */
 int co_ilp_opt(copy_opt_t *co, double time_limit);