X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firtypes.h;h=f94017ac60b6c1dc58d6468fb16577e4463ae1fb;hb=03a0b8a1e06fb7837b2a99ec64eefeddeeddfa7a;hp=8cc590d5ad8153998f1ab9f84cb283d50a0031d8;hpb=1b092e5efbe2f3ae70b83bf89b20144002728569;p=libfirm

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index 8cc590d5a..f94017ac6 100644
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -128,7 +128,6 @@ typedef struct {
 	unsigned is_matured:1;      /**< If set, all in-nodes of the block are fixed. */
 	unsigned is_dead:1;         /**< If set, the block is dead (and could be replace by a Bad. */
 	unsigned is_mb_head:1;      /**< Set if this block is a macroblock head. */
-	unsigned has_label:1;       /**< Set if this block has a label assigned. */
 	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 */
@@ -146,7 +145,7 @@ typedef struct {
 	ir_extblk *extblk;          /**< The extended basic block this block belongs to. */
 	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_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. */
@@ -190,7 +189,7 @@ typedef struct {
 /** Call attributes. */
 typedef struct {
 	except_attr    exc;           /**< the exception attribute. MUST be the first one. */
-	ir_type *cld_tp;              /**< type of called procedure */
+	ir_type *type;                /**< type of called procedure */
 	ir_entity ** callee_arr;      /**< result of callee analysis */
 } call_attr;
 
@@ -198,7 +197,7 @@ typedef struct {
 typedef struct {
 	except_attr     exc;           /**< the exception attribute. MUST be the first one. */
 	ir_builtin_kind kind;          /**< kind of the called builtin procedure */
-	ir_type         *builtin_tp;   /**< type of called builtin procedure */
+	ir_type         *type;         /**< type of called builtin procedure */
 } builtin_attr;
 
 /** Alloc attributes. */
@@ -234,7 +233,7 @@ typedef struct {
 
 /** Cast attributes. */
 typedef struct {
-	ir_type *totype;              /**< Type of the casted node. */
+	ir_type *type;                /**< Type of the casted node. */
 } cast_attr;
 
 /** Load attributes. */
@@ -274,7 +273,7 @@ typedef struct {
 /** CopyB attribute. */
 typedef struct {
 	except_attr    exc;           /**< The exception attribute. MUST be the first one. */
-	ir_type        *data_type;    /**< Type of the copied entity. */
+	ir_type        *type;         /**< Type of the copied entity. */
 } copyb_attr;
 
 /** Bound attribute. */
@@ -290,7 +289,7 @@ typedef struct {
 /** Div/Mod/DivMod/Quot attribute. */
 typedef struct {
 	except_attr    exc;           /**< The exception attribute. MUST be the first one. */
-	ir_mode        *res_mode;     /**< Result mode for the division. */
+	ir_mode        *resmode;      /**< Result mode for the division. */
 	char           no_remainder;  /**< Set, if known that a division can be done without a remainder. */
 } divmod_attr;
 
@@ -451,6 +450,7 @@ struct ir_graph {
 	unsigned additional_properties;          /**< Additional graph properties. */
 
 	/* -- Fields indicating different states of irgraph -- */
+	unsigned        state;
 	irg_phase_state phase_state;       /**< Compiler phase. */
 	op_pin_state irg_pinned_state;     /**< Flag for status of nodes. */
 	irg_outs_state outs_state;         /**< Out edges. */