X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched_t.h;h=abefd2d6484c2abd2994e1168245369639e9ecb4;hb=f804d333c7b5459c3c1a6bfc188ecdc54346be73;hp=f5a2e18ac9732b0339aabb220a18a0e78bb18d32;hpb=5c4c889a99e6bd23a35e108b4b4e9a6cbd9e695b;p=libfirm

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index f5a2e18ac..abefd2d64 100644
--- a/ir/be/besched_t.h
+++ b/ir/be/besched_t.h
@@ -8,6 +8,7 @@
 #include "irnode_t.h"
 #include "irgraph_t.h"
 
+#include "beutil.h"
 #include "besched.h"
 
 typedef unsigned int sched_timestep_t;
@@ -52,17 +53,12 @@ static INLINE int _sched_get_time_step(const ir_node *irn)
  * @param irn The node to check for.
  * @return 1, if the node consumes/produces data, false if not.
  */
-static INLINE int to_appear_in_schedule(ir_node *irn)
+static INLINE int to_appear_in_schedule(const ir_node *irn)
 {
-  int i, n;
+  if(get_irn_opcode(irn) == iro_Start)
+  	return 1;
 
-  for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-    ir_node *op = get_irn_n(irn, i);
-    if(mode_is_datab(get_irn_mode(op)))
-      return 1;
-  }
-
-  return mode_is_datab(get_irn_mode(irn));
+  return is_data_node(irn);
 }
 
 /**
@@ -179,10 +175,10 @@ static INLINE void _sched_set_time_stamp(ir_node *irn)
  */
 static INLINE ir_node *_sched_add_before(ir_node *before, ir_node *irn)
 {
-  sched_info_t *info = get_irn_sched_info(irn);
+	sched_info_t *info = get_irn_sched_info(irn);
 	list_add_tail(&info->list, &get_irn_sched_info(before)->list);
-  _sched_set_time_stamp(irn);
-  info->scheduled = 1;
+	_sched_set_time_stamp(irn);
+	info->scheduled = 1;
 	return irn;
 }
 
@@ -194,10 +190,10 @@ static INLINE ir_node *_sched_add_before(ir_node *before, ir_node *irn)
  */
 static INLINE ir_node *_sched_add_after(ir_node *after, ir_node *irn)
 {
-  sched_info_t *info = get_irn_sched_info(irn);
+	sched_info_t *info = get_irn_sched_info(irn);
 	list_add(&info->list, &get_irn_sched_info(after)->list);
-  _sched_set_time_stamp(irn);
-  info->scheduled = 1;
+	_sched_set_time_stamp(irn);
+	info->scheduled = 1;
 	return irn;
 }
 
@@ -209,11 +205,12 @@ static INLINE void _sched_remove(ir_node *irn)
 {
   sched_info_t *info = get_irn_sched_info(irn);
   list_del(&info->list);
+	INIT_LIST_HEAD(&info->list);
   info->scheduled = 0;
 }
 
 /**
- * Check, if thenode is scheduled.
+ * Check, if the node is scheduled.
  * @param irn The node.
  * @return 1, if the node is scheduled, 0 if not.
  */
@@ -251,14 +248,33 @@ extern int sched_verify(const ir_node *block);
  */
 extern int sched_verify_irg(ir_graph *irg);
 
+/**
+ * Checks, if one node is scheduled before another.
+ * @param n1   A node.
+ * @param n2   Another node.
+ * @return     1, if n1 is in front of n2 in the schedule, 0 else.
+ * @note       Both nodes must be in the same block.
+ */
+static INLINE int _sched_comes_after(const ir_node *n1, const ir_node *n2)
+{
+	assert(_sched_is_scheduled(n1));
+	assert(_sched_is_scheduled(n2));
+	assert(get_nodes_block(n1) == get_nodes_block(n2));
+	return _sched_get_time_step(n1) < _sched_get_time_step(n2);
+}
+
 /**
  * A predicate for a node.
  * @param irn The node.
  * @param data The custom data.
- * @return 1 or 0, depending on your criteria.
+ * @return 1 if irn should be skipped. Else 0.
  */
 typedef int (sched_predicator_t)(const ir_node *irn, void *data);
 
+
+int sched_skip_cf_predicator(const ir_node *irn, void *data);
+int sched_skip_phi_predicator(const ir_node *irn, void *data);
+
 /**
  * Skip nodes in a schedule.
  * @param from The node to start from.
@@ -272,16 +288,17 @@ extern ir_node *sched_skip(ir_node *from, int forward,
     sched_predicator_t *predicator, void *data);
 
 #define sched_get_time_step(irn)	    _sched_get_time_step(irn)
-#define sched_has_succ(irn) 				  _sched_has_succ(irn)
-#define sched_has_prev(irn) 				  _sched_has_prev(irn)
-#define sched_succ(irn) 						  _sched_succ(irn)
-#define sched_prev(irn) 						  _sched_prev(irn)
-#define sched_first(irn) 						  _sched_first(irn)
-#define sched_last(irn) 						  _sched_last(irn)
+#define sched_has_succ(irn) 			_sched_has_succ(irn)
+#define sched_has_prev(irn) 			_sched_has_prev(irn)
+#define sched_succ(irn) 				_sched_succ(irn)
+#define sched_prev(irn) 				_sched_prev(irn)
+#define sched_first(irn) 				_sched_first(irn)
+#define sched_last(irn) 				_sched_last(irn)
 #define sched_add_before(before, irn)	_sched_add_before(before, irn)
 #define sched_add_after(after, irn) 	_sched_add_after(after, irn)
 #define sched_remove(irn)            	_sched_remove(irn)
-#define sched_is_scheduled(irn)       _sched_is_scheduled(irn)
-#define sched_cmp(a, b)               _sched_cmp(a, b)
+#define sched_is_scheduled(irn)         _sched_is_scheduled(irn)
+#define sched_comes_after(n1, n2)       _sched_comes_after(n1, n1)
+#define sched_cmp(a, b)                 _sched_cmp(a, b)
 
 #endif