X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelistsched.c;h=e89b31d9d043c486bc96298ea2497f3c56097612;hb=418806b20f02139f4506528f7d33390fadc61909;hp=945a254a06d2364ee6fbd031b8cfd2631403e13a;hpb=ee240ce77c83b838059a5bca40e8a1d7cf35c0d5;p=libfirm

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 945a254a0..e89b31d9d 100644
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include "benode_t.h"
+#include "benode.h"
 #include "be_t.h"
 
 #include "obst.h"
@@ -49,22 +49,22 @@
 #include "irtools.h"
 
 #include "bemodule.h"
-#include "besched_t.h"
+#include "besched.h"
 #include "beutil.h"
 #include "belive_t.h"
 #include "belistsched.h"
 #include "beschedmris.h"
 #include "beschedrss.h"
-#include "bearch_t.h"
+#include "bearch.h"
 #include "bestat.h"
-#include "beirg_t.h"
+#include "beirg.h"
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
 
-#define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_RegParams(irn))
+#define BE_SCHED_NODE(irn) (be_is_Keep(irn) || be_is_CopyKeep(irn) || be_is_Start(irn))
 
 enum {
 	BE_SCHED_SELECT_TRIVIAL,
@@ -159,7 +159,7 @@ typedef struct _block_sched_env_t {
 /**
  * Returns non-zero if a node must be placed in the schedule.
  */
-static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
+static inline int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
 {
 	int res = -1;
 
@@ -177,7 +177,7 @@ static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void
 /**
  * Returns non-zero if the node is already scheduled
  */
-static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n)
+static inline int is_already_scheduled(block_sched_env_t *env, ir_node *n)
 {
 	int idx = get_irn_idx(n);
 
@@ -188,7 +188,7 @@ static INLINE int is_already_scheduled(block_sched_env_t *env, ir_node *n)
 /**
  * Mark a node as already scheduled
  */
-static INLINE void set_already_scheduled(block_sched_env_t *env, ir_node *n)
+static inline void set_already_scheduled(block_sched_env_t *env, ir_node *n)
 {
 	int idx = get_irn_idx(n);
 
@@ -205,7 +205,7 @@ static void add_to_sched(block_sched_env_t *env, ir_node *irn);
  * @param irn   The node to make ready.
  * @return 1, if the node could be made ready, 0 else.
  */
-static INLINE int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn)
+static inline int make_ready(block_sched_env_t *env, ir_node *pred, ir_node *irn)
 {
 	int i, n;
 
@@ -282,7 +282,7 @@ static void make_users_ready(block_sched_env_t *env, ir_node *irn)
 /**
  * Returns the number of not yet schedules users.
  */
-static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
+static inline int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
 	int idx = get_irn_idx(n);
 
 	assert(idx < ARR_LEN(env->sched_info));
@@ -292,7 +292,7 @@ static INLINE int get_irn_not_sched_user(block_sched_env_t *env, ir_node *n) {
 /**
  * Sets the number of not yet schedules users.
  */
-static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
+static inline void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
 	int idx = get_irn_idx(n);
 
 	assert(idx < ARR_LEN(env->sched_info));
@@ -302,7 +302,7 @@ static INLINE void set_irn_not_sched_user(block_sched_env_t *env, ir_node *n, in
 /**
  * Add @p num to the number of not yet schedules users and returns the result.
  */
-static INLINE int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
+static inline int add_irn_not_sched_user(block_sched_env_t *env, ir_node *n, int num) {
 	int idx = get_irn_idx(n);
 
 	assert(idx < ARR_LEN(env->sched_info));
@@ -562,7 +562,7 @@ void list_sched(be_irg_t *birg, be_options_t *be_opts)
 		case BE_SCHED_SELECT_HEUR:     sel = heuristic_selector;    break;
 		case BE_SCHED_SELECT_NORMAL:   sel = normal_selector;       break;
 		default:
-		case BE_SCHED_SELECT_HMUCHNIK: sel = trivial_selector;      break;
+		case BE_SCHED_SELECT_HMUCHNIK: sel = heuristic_selector;    break;
 	}
 
 #if 1