X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched_t.h;h=144b7d31617dc1f508720bbd71d37d49e7b7d3b0;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=9d972ca6514d3d9ce8860a252f9e77e23a66008b;hpb=22e1dae4b74199ec476e3efb1b48d9f07b721aac;p=libfirm

diff --git a/ir/be/besched_t.h b/ir/be/besched_t.h
index 9d972ca65..144b7d316 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,13 +17,15 @@ 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. */
 	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. */
+	unsigned 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))
@@ -36,6 +39,16 @@ typedef struct _sched_info_t {
  */
 void be_sched_init(void);
 
+/**
+ * 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(const ir_node *irn)
+{
+  return get_irn_sched_info(irn)->scheduled;
+}
+
 /**
  * Get the time step of an irn in a schedule.
  * @param irn The node.
@@ -43,6 +56,7 @@ void be_sched_init(void);
  */
 static INLINE int _sched_get_time_step(const ir_node *irn)
 {
+	assert(_sched_is_scheduled(irn));
 	return get_irn_sched_info(irn)->time_step;
 }
 
@@ -52,20 +66,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;
-
-  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));
+	switch(get_irn_opcode(irn)) {
+		case iro_Start:
+		case iro_Jmp:
+		case iro_Break:
+			return 1;
+		default:
+			return is_data_node(irn);
+	}
 }
 
 /**
@@ -197,10 +207,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;
 }
 
@@ -212,19 +222,10 @@ 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.
- * @param irn The node.
- * @return 1, if the node is scheduled, 0 if not.
- */
-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.
@@ -254,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.
@@ -278,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, n2)
+#define sched_cmp(a, b)                 _sched_cmp(a, b)
 
 #endif