X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched_t.h;h=b1d98d514931df6645b4ceb3301b3173c05d5747;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=3e701a3c0282eccf56538dac672273c887d93519;hpb=fd36bead18e3a2d5d6d5b9129c15c1c959e8c8a7;p=libfirm

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index 3e701a3c0..b1d98d514 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;
@@ -16,6 +17,9 @@ extern size_t sched_irn_data_offset;
 
 /**
  * The schedule structure which is present at each ir node.
+ *
+ * Currently, only basic blocks are scheduled. The list head of
+ * every block schedule list is the Block list.
  */
 typedef struct _sched_info_t {
 	struct list_head list;         /**< The list head to list the nodes in a schedule. */
@@ -52,17 +56,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;
-
-  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));
+	switch(get_irn_opcode(irn)) {
+		case iro_Start:
+		case iro_Jmp:
+		case iro_Break:
+			return 1;
+		default:
+			return is_data_node(irn);
+	}
 }
 
 /**
@@ -179,10 +182,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 +197,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 +212,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,6 +255,21 @@ 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.
@@ -275,17 +294,18 @@ int sched_skip_phi_predicator(const ir_node *irn, void *data);
 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_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_get_time_step(irn)        _sched_get_time_step(irn)
+#define sched_has_next(irn)             _sched_has_next(irn)
+#define sched_has_prev(irn)             _sched_has_prev(irn)
+#define sched_next(irn)                 _sched_next(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