Removed useless forward declaration of ir_phase.

[libfirm] / ir / ir / irtypes.h

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index 6122c8e..b78cdd9 100644 (file)
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -45,8 +45,7 @@
 #include "set.h"
 #include "list.h"
 #include "obst.h"
-
-struct ir_phase;
+#include "vrp.h"
 
 /** The type of an ir_op. */
 struct ir_op {
@@ -86,6 +85,7 @@ struct ir_op {
 struct ir_mode {
        firm_kind         kind;       /**< distinguishes this node from others */
        ident             *name;      /**< Name ident of this mode */
+       ir_type           *type;      /**< corresponding primitive type */
 
        /* ----------------------------------------------------------------------- */
        /* On changing this struct you have to evaluate the mode_are_equal function!*/
@@ -155,7 +155,6 @@ typedef struct {
 
 /** Cond attributes. */
 typedef struct {
-       cond_kind kind;              /**< flavor of Cond */
        long default_proj;           /**< only for non-binary Conds: biggest Proj number, i.e. the one used for default. */
        cond_jmp_predicate jmp_pred; /**< only for binary Conds: The jump predication. */
 } cond_attr;
@@ -339,7 +338,8 @@ typedef union {
  */
 typedef struct _irn_edge_kind_info_t {
        struct list_head outs_head;  /**< The list of all outs. */
-       int out_count;               /**< Number of outs in the list. */
+       unsigned edges_built : 1;    /**< Set edges where built for this node. */
+       unsigned out_count : 31;     /**< Number of outs in the list. */
 } irn_edge_info_t;
 
 typedef irn_edge_info_t irn_edges_info_t[EDGE_KIND_LAST];
@@ -381,6 +381,7 @@ struct ir_node {
        struct ir_node **deps;   /**< Additional dependencies induced by state. */
        void            *backend_info;
        irn_edges_info_t edge_info;  /**< Everlasting out edges. */
+
        /* ------- Opcode depending fields -------- */
        attr attr;               /**< The set of attributes of this node. Depends on opcode.
                                      Must be last field of struct ir_node. */
@@ -546,7 +547,7 @@ struct ir_prog {
                                             to allocate nodes the represent values
                                             of constant entities. It is not meant as
                                             a procedure.  */
-       ir_type   *segment_types[IR_SEGMENT_COUNT];
+       ir_type   *segment_types[IR_SEGMENT_LAST+1];
        ir_type  **types;               /**< A list of all types in the ir. */
        ir_mode  **modes;               /**< A list of all modes in the ir. */
        ir_op    **opcodes;             /**< A list of all opcodes in the ir. */