X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched_t.h;h=6538d4f0e7d0a645505a15ab893f9be82a53bd2d;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=5f9bbb42ed3594a33c55339d59de7045534fa844;hpb=9b24fe0ec0f4412c790ee4a7c6fc022fd28064a1;p=libfirm

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index 5f9bbb42e..6538d4f0e 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;
@@ -22,7 +23,7 @@ typedef struct _sched_info_t {
 	sched_timestep_t time_step;    /**< If a is after b in a schedule, its time step is
                                         larger than b's. */
 
-    int scheduled : 1;             /**< 1, if the node is in the schedule of the block, 0 else. */
+  int scheduled : 1;             /**< 1, if the node is in the schedule of the block, 0 else. */
 } sched_info_t;
 
 #define _sched_entry(list_head) (list_entry(list_head, sched_info_t, list))
@@ -52,17 +53,16 @@ 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;
+	switch(get_irn_opcode(irn)) {
+		case iro_Start:
+		case iro_Jmp:
+			return 1;
+		default:
+			return is_data_node(irn);
+	}
 
-  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));
 }
 
 /**
@@ -117,7 +117,8 @@ static INLINE ir_node *_sched_prev(const ir_node *irn)
 /**
  * Get the first node in a block schedule.
  * @param block The block of which to get the schedule.
- * @return The first node in the schedule or the block itself if there is node in the schedule.
+ * @return The first node in the schedule or the block itself
+ *         if there is no node in the schedule.
  */
 static INLINE ir_node *_sched_first(const ir_node *block)
 {
@@ -127,9 +128,9 @@ static INLINE ir_node *_sched_first(const ir_node *block)
 
 /**
  * Get the last node in a schedule.
- * @param block The block to get the schedule for.
- * @return The last ir node in a schedule, or the block itself, if there is node in the schedule.
- * or it is empty.
+ * @param  block The block to get the schedule for.
+ * @return The last ir node in a schedule, or the block itself
+ *         if there is no node in the schedule.
  */
 static INLINE ir_node *_sched_last(const ir_node *block)
 {
@@ -154,7 +155,7 @@ static INLINE void _sched_set_time_stamp(ir_node *irn)
    * else we have to compute our time step from our
    * neighbours.
    */
-  if(after_ts == 0)
+  if(before_ts >= after_ts)
     inf->time_step = before_ts + SCHED_INITIAL_GRANULARITY;
   else {
     sched_timestep_t ts = (before_ts + after_ts) / 2;
@@ -165,6 +166,8 @@ static INLINE void _sched_set_time_stamp(ir_node *irn)
      */
     if(ts == before_ts || ts == after_ts)
       sched_renumber(get_nodes_block(irn));
+    else
+      inf->time_step = ts;
   }
 }
 
@@ -176,10 +179,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;
 }
 
@@ -191,23 +194,50 @@ 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;
 }
 
 /**
- * Check, if thenode is scheduled.
+ * Remove a node from the scheduled.
+ * @param irn The node.
+ */
+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 the node is scheduled.
  * @param irn The node.
  * @return 1, if the node is scheduled, 0 if not.
  */
-static INLINE int _sched_is_scheduled(ir_node *irn)
+static INLINE int _sched_is_scheduled(const ir_node *irn)
 {
   return get_irn_sched_info(irn)->scheduled;
 }
 
+/**
+ * Compare two nodes according to their position in the schedule.
+ * @param a The first node.
+ * @param b The second node.
+ * @return A number smaller, equals to or larger than 0, if a is
+ *         before, the same, or after b in the schedule.
+ */
+static INLINE int _sched_cmp(const ir_node *a, const ir_node *b)
+{
+  assert(_sched_is_scheduled(a) && _sched_is_scheduled(b));
+  assert(get_nodes_block(a) == get_nodes_block(b));
+
+  return get_irn_sched_info(a)->time_step - get_irn_sched_info(b)->time_step;
+}
+
 /**
  * Verify a schedule.
  * @param block The block whose schedule to verify.
@@ -222,16 +252,57 @@ 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 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.
+ * @param forward The direction (1 for forward, 0 for backward).
+ * @param predicator The one who decides what is skipped.
+ * @param data Food for the predicator.
+ * @return The first node rejected by the predicator or the block
+ * itself if none was rejected.
+ */
+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_comes_after(n1, n2)       _sched_comes_after(n1, n1)
+#define sched_cmp(a, b)                 _sched_cmp(a, b)
 
 #endif