X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firloop_t.h;h=4c224695bd0988bf4357cb981e51f3631993c4dd;hb=2bf74f898dd67f0004d7d5d1e9c41f4aa3a28bde;hp=81828ca573d8d67dbce82f075c4d787dcad7789e;hpb=0887d4a59b29ff9c398d2961dce95977fd7efe9c;p=libfirm

diff --git a/ir/ana/irloop_t.h b/ir/ana/irloop_t.h
index 81828ca57..4c224695b 100644
--- a/ir/ana/irloop_t.h
+++ b/ir/ana/irloop_t.h
@@ -22,7 +22,6 @@
  * @brief    Loop datastructure and access functions -- private stuff.
  * @author   Goetz Lindenmaier
  * @date     7.2002
- * @version  $Id$
  */
 #ifndef FIRM_ANA_IRLOOP_T_H
 #define FIRM_ANA_IRLOOP_T_H
@@ -43,7 +42,8 @@ typedef enum loop_flags {
 	loop_wrap_around   = 0x00000010,  /**< this loop is NOT endless, because of wrap around */
 	loop_end_false     = 0x00000020,  /**< this loop end can't be computed "from compute_loop_info.c" */
 	do_loop            = 0x00000040,  /**< this is a do loop */
-	once               = 0x00000080,  /**< this is a do loop, with a false condition.It itarate once */
+	once               = 0x00000080,  /**< this is a do loop, with a false condition. It iterate exactly once. */
+	loop_outer_loop    = 0x00000100   /**< if set, this loop has child loops (is a no leaf). */
 } loop_flags_t;
 
 /**
@@ -58,22 +58,17 @@ typedef enum loop_flags {
  * the loop within the nesting.  Further it contains a list of the
  * loops with nesting depth -1.  Finally it contains a list of all
  * nodes in the loop.
- *
- * @todo We could add a field pointing from a node to the containing loop,
- * this would cost a lot of memory, though.
  */
 struct ir_loop {
-	firm_kind kind;                   /**< A type tag, set to k_ir_loop. */
-	int depth;                        /**< Nesting depth */
-	int n_sons;                       /**< Number of ir_nodes in array "children" */
-	int n_nodes;                      /**< Number of loop_nodes in array "children" */
-	unsigned flags;                   /**< a set of loop_flags_t */
+	firm_kind       kind;             /**< A type tag, set to k_ir_loop. */
+	unsigned        depth;            /**< Nesting depth */
+	unsigned        flags;            /**< a set of loop_flags_t */
 	struct ir_loop *outer_loop;       /**< The outer loop */
 	loop_element   *children;         /**< Mixed flexible array: Contains sons and loop_nodes */
-	tarval  *loop_iter_start;         /**< counting loop: the start value */
-	tarval  *loop_iter_end;           /**< counting loop: the last value reached */
-	tarval  *loop_iter_increment;     /**< counting loop: the increment */
-	ir_node *loop_iter_variable;      /**< The iteration variable of counting loop.*/
+	ir_tarval      *loop_iter_start;  /**< counting loop: the start value */
+	ir_tarval      *loop_iter_end;    /**< counting loop: the last value reached */
+	ir_tarval      *loop_iter_increment; /**< counting loop: the increment */
+	ir_node        *loop_iter_variable;  /**< The iteration variable of counting loop.*/
 
 	void *link;                       /**< link field. */
 #ifdef DEBUG_libfirm
@@ -106,46 +101,40 @@ void set_irn_loop(ir_node *n, ir_loop *loop);
  */
 void mature_loops(ir_loop *loop, struct obstack *obst);
 
-/* -------- INLINE functions -------- */
+/* -------- inline functions -------- */
 
-static INLINE int
-_is_ir_loop(const void *thing) {
+static inline int _is_ir_loop(const void *thing)
+{
 	return get_kind(thing) == k_ir_loop;
 }
 
-static INLINE void
-_set_irg_loop(ir_graph *irg, ir_loop *loop) {
+static inline void _set_irg_loop(ir_graph *irg, ir_loop *loop)
+{
 	assert(irg);
 	irg->loop = loop;
 }
 
-static INLINE ir_loop *
-_get_irg_loop(ir_graph *irg) {
+static inline ir_loop *_get_irg_loop(const ir_graph *irg)
+{
 	assert(irg);
 	return irg->loop;
 }
 
-static INLINE ir_loop *
-_get_loop_outer_loop(const ir_loop *loop) {
+static inline ir_loop *_get_loop_outer_loop(const ir_loop *loop)
+{
 	assert(_is_ir_loop(loop));
 	return loop->outer_loop;
 }
 
-static INLINE int
-_get_loop_depth(const ir_loop *loop) {
+static inline unsigned _get_loop_depth(const ir_loop *loop)
+{
 	assert(_is_ir_loop(loop));
 	return loop->depth;
 }
 
-static INLINE int
-_get_loop_n_sons(const ir_loop *loop) {
-	assert(_is_ir_loop(loop));
-	return loop->n_sons;
-}
-
 /* Uses temporary information to get the loop */
-static INLINE ir_loop *
-_get_irn_loop(const ir_node *n) {
+static inline ir_loop *_get_irn_loop(const ir_node *n)
+{
 	return n->loop;
 }
 
@@ -154,7 +143,6 @@ _get_irn_loop(const ir_node *n) {
 #define get_irg_loop(irg)         _get_irg_loop(irg)
 #define get_loop_outer_loop(loop) _get_loop_outer_loop(loop)
 #define get_loop_depth(loop)      _get_loop_depth(loop)
-#define get_loop_n_sons(loop)     _get_loop_n_sons(loop)
 #define get_irn_loop(n)           _get_irn_loop(n)
 
 #endif