updated

[libfirm] / ir / ir / irtypes.h

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index df8915b..585dd8d 100644 (file)
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -43,6 +43,7 @@
 #include "pset.h"
 #include "set.h"
 #include "list.h"
+#include "obst.h"
 
 struct ir_phase;
 
@@ -142,6 +143,7 @@ typedef struct {
        ir_region *region;          /**< The immediate structural region this block belongs to. */
        unsigned mb_depth;          /**< The macroblock depth: A distance from the macroblock header */
        ir_label_t label;           /**< The block label if assigned. */
+       ir_node  *phis;             /**< The list of Phi nodes in this block. */
 
        struct list_head succ_head; /**< A list head for all successor edges of a block. */
 } block_attr;
@@ -240,13 +242,18 @@ typedef struct {
 } store_attr;
 
 typedef struct {
-       int            pos;  /**< For Phi0. Used to remember the value defined by
-                                 this Phi node.  Needed when the Phi is completed
-                                 to call get_r_internal_value to find the
-                                 predecessors. If this attribute is set, the Phi
-                                 node takes the role of the obsolete Phi0 node,
-                                 therefore the name. */
-} phi0_attr;
+       ir_node        *next;         /**< Points to the next Phi in the Phi list of a block. */
+       union {
+               unsigned       *backedge;     /**< Raw Bitfield: bit n is set to true if pred n is backedge. */
+               int            pos;           /**< For Phi0. Used to remember the value defined by
+                                              this Phi node.  Needed when the Phi is completed
+                                              to call get_r_internal_value() to find the
+                                              predecessors. If this attribute is set, the Phi
+                                              node takes the role of the obsolete Phi0 node,
+                                              therefore the name. */
+       } u;
+} phi_attr;
+
 
 /**< Confirm attribute. */
 typedef struct {
@@ -273,6 +280,7 @@ typedef struct {
 typedef struct {
        except_attr    exc;           /**< The exception attribute. MUST be the first one. */
        ir_mode        *res_mode;     /**< Result mode for the division. */
+       char           no_remainder;  /**< Set, if known that a division can be done without a remainder. */
 } divmod_attr;
 
 /** Inline Assembler support attribute. */
@@ -300,9 +308,7 @@ typedef union {
        cast_attr      cast;          /**< For Cast. */
        load_attr      load;          /**< For Load. */
        store_attr     store;         /**< For Store. */
-       phi0_attr      phi0;          /**< for Phi0 nodes. */
-       unsigned       *phi_backedge; /**< For Phi after construction.
-                                          Raw Bitfield n set to true if pred n is backedge. */
+       phi_attr       phi;           /**< For Phi. */
        long           proj;          /**< For Proj: contains the result position to project */
        confirm_attr   confirm;       /**< For Confirm: compare operation and region. */
        filter_attr    filter;        /**< For Filter */
@@ -363,12 +369,20 @@ struct ir_node {
                                      Must be last field of struct ir_node. */
 };
 
+#include "iredgeset.h"
+
 /**
  * Edge info to put into an irg.
  */
 typedef struct _irg_edge_info_t {
+#if 0
          set      *edges;         /**< a set containing all edges of a graph. */
-         unsigned activated : 1;  /**< set if edges are activated for the graph. */
+#else
+       ir_edgeset_t    edges;
+       struct obstack  edges_obst;
+       unsigned        allocated : 1;
+#endif
+       unsigned     activated : 1;  /**< set if edges are activated for the graph. */
 } irg_edge_info_t;
 
 typedef irg_edge_info_t irg_edges_info_t[EDGE_KIND_LAST];
@@ -490,7 +504,7 @@ struct ir_graph {
 #endif
 
 #ifndef NDEBUG
-       unsigned using_visited       : 1;  /**< set to 1 if we are currently using the visited flag */
+       unsigned using_irn_visited   : 1;  /**< set to 1 if we are currently using the visited flag */
        unsigned using_block_visited : 1;  /**< set to 1 if we are currently using the block_visited flag */
        unsigned using_irn_link      : 1;  /**< set to 1 if we are currently using the irn_link fields */
 #endif