X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeilpsched.c;h=43815947c24f2c64c3866c067ac6e8776373c813;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=3ef562e4a14cc7d37fb53d8408c6d5ac06b39563;hpb=3654c4bea0fb78519945a6fcc053efcccf15258f;p=libfirm

diff --git a/ir/be/beilpsched.c b/ir/be/beilpsched.c
index 3ef562e4a..43815947c 100644
--- a/ir/be/beilpsched.c
+++ b/ir/be/beilpsched.c
@@ -29,9 +29,7 @@
  * by Daniel Kaestner and Sebastian Winkel
  * extended with register pressure constraints by Christian Wuerdig
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef WITH_ILP
 
@@ -220,7 +218,7 @@ static heights_t *glob_heights;
  * Check if irn is a Proj, which has no execution units assigned.
  * @return 1 if irn is a Proj having no execution units assigned, 0 otherwise
  */
-static INLINE int is_normal_Proj(const arch_env_t *env, const ir_node *irn) {
+static inline int is_normal_Proj(const arch_env_t *env, const ir_node *irn) {
 	return is_Proj(irn) && (arch_env_get_allowed_execution_units(env, irn) == NULL);
 }
 
@@ -228,13 +226,13 @@ static INLINE int is_normal_Proj(const arch_env_t *env, const ir_node *irn) {
  * Skips normal Projs.
  * @return predecessor if irn is a normal Proj, otherwise irn.
  */
-static INLINE ir_node *skip_normal_Proj(const arch_env_t *env, ir_node *irn) {
+static inline ir_node *skip_normal_Proj(const arch_env_t *env, ir_node *irn) {
 	if (is_normal_Proj(env, irn))
 		return get_Proj_pred(irn);
 	return irn;
 }
 
-static INLINE int fixed_latency(const ilp_sched_selector_t *sel, ir_node *irn, void *env) {
+static inline int fixed_latency(const ilp_sched_selector_t *sel, ir_node *irn, void *env) {
 	unsigned lat = be_ilp_sched_latency(sel, irn, env);
 	if (lat == 0 && ! is_Proj(irn) && ! be_is_Keep(irn))
 		lat = 1;
@@ -683,7 +681,7 @@ static void refine_asap_alap_times(ir_node *irn, void *walk_env) {
  *
  *******************************************/
 
-static INLINE void check_for_keeps(waitq *keeps, const ir_node *block, const ir_node *irn) {
+static inline void check_for_keeps(waitq *keeps, const ir_node *block, const ir_node *irn) {
 	const ir_edge_t *edge;
         (void) block;
 
@@ -700,11 +698,11 @@ static INLINE void check_for_keeps(waitq *keeps, const ir_node *block, const ir_
 /**
  * Inserts @p irn before @p before into schedule and notifies backend.
  */
-static INLINE void notified_sched_add_before(be_ilpsched_env_t *env,
+static inline void notified_sched_add_before(be_ilpsched_env_t *env,
 	const ir_node *before, const ir_node *irn, unsigned cycle)
 {
 	be_ilp_sched_node_scheduled(env->sel, irn, cycle, env->block_env);
-	sched_add_before(before, irn);
+	sched_add_before((ir_node*) before, (ir_node*) irn);
 }
 
 /**
@@ -756,15 +754,13 @@ static void add_to_sched(be_ilpsched_env_t *env, const ir_node *block, const ir_
 static void apply_solution(be_ilpsched_env_t *env, lpp_t *lpp, ir_node *block) {
 	be_ilpsched_irn_t     *block_node = get_ilpsched_irn(env, block);
 	ilpsched_block_attr_t *ba         = get_ilpsched_block_attr(block_node);
-	sched_info_t          *info       = get_irn_sched_info(block);
 	be_ilpsched_irn_t     **sched_nodes;
 	unsigned              i, l;
 	ir_node               *cfop, *irn;
 	const ir_edge_t       *edge;
 
 	/* init block schedule list */
-	INIT_LIST_HEAD(&info->list);
-	info->scheduled = 1;
+	sched_init_block(block);
 
 	/* collect nodes and their scheduling time step */
 	sched_nodes = NEW_ARR_F(be_ilpsched_irn_t *, 0);
@@ -877,7 +873,7 @@ static void apply_solution(be_ilpsched_env_t *env, lpp_t *lpp, ir_node *block) {
 /**
  * Check if node can be executed on given unit type.
  */
-static INLINE int is_valid_unit_type_for_node(const be_execution_unit_type_t *tp, be_ilpsched_irn_t *node) {
+static inline int is_valid_unit_type_for_node(const be_execution_unit_type_t *tp, be_ilpsched_irn_t *node) {
 	int                  i;
 	ilpsched_node_attr_t *na = get_ilpsched_node_attr(node);
 
@@ -2087,7 +2083,7 @@ void be_init_ilpsched(void)
 
 #else /* WITH_ILP */
 
-static INLINE void some_picky_compiler_do_not_allow_empty_files(void)
+static inline void some_picky_compiler_do_not_allow_empty_files(void)
 {}
 
 #endif /* WITH_ILP */