X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firtypes.h;h=e69392c037610c8a3ce61bc6c08adf4d741c00b0;hb=c32482bc042c9f0591bec432ccb6dfcadbad4cb7;hp=8c4dea4010a9cab3b380aec159ad66b797f115ac;hpb=0244a1f83828b6badac0cc9b4cbf94dc330189d0;p=libfirm

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index 8c4dea401..e69392c03 100644
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -34,7 +34,6 @@
 #include "irgraph.h"
 #include "iredgekinds.h"
 #include "irtypeinfo.h"
-#include "irextbb.h"
 #include "irmemory.h"
 #include "callgraph.h"
 #include "irprog.h"
@@ -205,23 +204,15 @@ typedef struct block_attr {
 	unsigned marked:1;          /**< Can be set/unset to temporary mark a block. */
 	ir_node **graph_arr;        /**< An array to store all parameters. */
 	/* Attributes holding analyses information */
-	ir_dom_info dom;            /**< Datastructure that holds information about dominators.
-	                                 @@@ @todo
-	                                 Eventually overlay with graph_arr as only valid
-	                                 in different phases.  Eventually inline the whole
-	                                 datastructure. */
+	ir_dom_info dom;            /**< Datastructure that holds information about dominators. */
 	ir_dom_info pdom;           /**< Datastructure that holds information about post-dominators. */
 	bitset_t *backedge;         /**< Bitfield n set to true if pred n is backedge.*/
-	ir_extblk *extblk;          /**< The extended basic block this block belongs to. */
 	ir_entity *entity;          /**< entitiy representing this block */
 	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;
 
 /** Cond attributes. */
 typedef struct cond_attr {
-	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;
 
@@ -292,16 +283,16 @@ typedef struct cast_attr {
 /** Load attributes. */
 typedef struct load_attr {
 	except_attr   exc;            /**< The exception attribute. MUST be the first one. */
-    unsigned      volatility:1;   /**< The volatility of this Load operation. */
-    unsigned      unaligned:1;    /**< The align attribute of this Load operation. */
+    ir_volatility volatility:1;   /**< The volatility of this Load operation. */
+    ir_align      unaligned:1;    /**< The align attribute of this Load operation. */
 	ir_mode       *mode;          /**< The mode of this Load operation. */
 } load_attr;
 
 /** Store attributes. */
 typedef struct store_attr {
 	except_attr   exc;            /**< the exception attribute. MUST be the first one. */
-	unsigned      volatility:1;   /**< The volatility of this Store operation. */
-	unsigned      unaligned:1;    /**< The align attribute of this Store operation. */
+	ir_volatility volatility:1;   /**< The volatility of this Store operation. */
+	ir_align      unaligned:1;    /**< The align attribute of this Store operation. */
 } store_attr;
 
 typedef struct phi_attr {
@@ -523,19 +514,19 @@ struct ir_graph {
 	ir_node *anchor;               /**< Pointer to the anchor node of this graph. */
 	struct obstack *obst;          /**< The obstack where all of the ir_nodes live. */
 	ir_node *current_block;        /**< Current block for newly gen_*()-erated ir_nodes. */
-	struct obstack *extbb_obst;    /**< The obstack for extended basic block info. */
 
 	/* -- Fields for graph properties -- */
 	irg_inline_property        inline_property;       /**< How to handle inlineing. */
 	mtp_additional_properties  additional_properties; /**< Additional graph properties. */
 
 	/* -- Fields indicating different states of irgraph -- */
-	ir_graph_state_t      state;
-	irg_phase_state       phase_state;       /**< Compiler phase. */
-	op_pin_state          irg_pinned_state;  /**< Flag for status of nodes. */
-	ir_typeinfo_state     typeinfo_state;    /**< Validity of type information. */
-	irg_callee_info_state callee_info_state; /**< Validity of callee information. */
-	ir_class_cast_state   class_cast_state;  /**< Kind of cast operations in code. */
+	ir_graph_properties_t  properties;
+	ir_graph_constraints_t constraints;
+	irg_phase_state        phase_state;       /**< Compiler phase. */
+	op_pin_state           irg_pinned_state;  /**< Flag for status of nodes. */
+	ir_typeinfo_state      typeinfo_state;    /**< Validity of type information. */
+	irg_callee_info_state  callee_info_state; /**< Validity of callee information. */
+	ir_class_cast_state    class_cast_state;  /**< Kind of cast operations in code. */
 	unsigned mem_disambig_opt;               /**< Options for the memory disambiguator. */
 	unsigned fp_model;                       /**< floating point model of the graph. */
 
@@ -551,6 +542,7 @@ struct ir_graph {
 	ir_vrp_info      vrp;              /**< vrp info */
 
 	ir_loop *loop;                     /**< The outermost loop for this graph. */
+	ir_dom_front_info_t domfront;      /**< dominance frontier analysis data */
 	void *link;                        /**< A void* field to link any information to
 	                                        the node. */
 
@@ -654,7 +646,6 @@ struct ir_prog {
 	size_t max_irg_idx;                  /**< highest unused irg index */
 	long max_node_nr;                    /**< to generate unique numbers for nodes. */
 	unsigned dump_nr;                    /**< number of program info dumps */
-	unsigned optimization_dumps :1;      /**< dump irg on each optimization */
 #ifndef NDEBUG
 	irp_resources_t reserved_resources;  /**< Bitset for tracking used global resources. */
 #endif