X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firtypes.h;h=f400d5a36c3e6180ab1c41e7ec77214c4a32079a;hb=b597c7fd473086ca6374b2abbdf129f595c156d0;hp=e69ae2114605407d3d2fc5692094a5f77638a7c6;hpb=597ea3c3a0834c66e26e705f68d65941497ae696;p=libfirm

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index e69ae2114..f400d5a36 100644
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -37,6 +37,7 @@
 #include "execution_frequency.h"
 #include "irmemory.h"
 #include "callgraph.h"
+#include "irprog.h"
 #include "field_temperature.h"
 #include "irphases_t.h"
 
@@ -56,7 +57,7 @@ struct ir_op {
 	op_arity opar;          /**< The arity of operator. */
 	int op_index;           /**< The index of the first data operand, 0 for most cases, 1 for Div etc. */
 	unsigned flags;         /**< Flags describing the behavior of the ir_op, a bitmasks of irop_flags. */
-	void *tag;              /**< Some custom pointer the op's creator can attach stuff to. */
+	unsigned tag;           /**< Some custom TAG value the op's creator set to. */
 	void *attr;             /**< custom pointer where op's creator can attach attribute stuff to. */
 
 	ir_op_ops ops;          /**< The operations of the this op. */
@@ -70,9 +71,9 @@ struct ir_op {
  * and comparisons of values of a such described mode.
  *
  * ATTRIBUTES:
- *  -  modecode code:           An unambiguous int (enum) for the mode
+ *  -  ir_modecode code:        An unambiguous int (enum) for the mode
  *  -  ident *name:             Name of this mode. Two modes are different if the name is different.
- *  -  mode_sort sort:          sort of mode specifying possible usage categories
+ *  -  ir_mode_sort sort:       sort of mode specifying possible usage categories
  *  -  int    size:             size of the mode in Bits.
  *  -  unsigned sign:1:         signedness of this mode
  *  -  ... more to come
@@ -85,15 +86,16 @@ struct ir_op {
  */
 struct ir_mode {
 	firm_kind         kind;       /**< distinguishes this node from others */
-	modecode          code;       /**< unambiguous identifier of a mode */
+	ir_modecode       code;       /**< unambiguous identifier of a mode */
 	ident             *name;      /**< Name ident of this mode */
 
 	/* ----------------------------------------------------------------------- */
 	/* On changing this struct you have to evaluate the mode_are_equal function!*/
-	mode_sort         sort;          /**< coarse classification of this mode:
+	ir_mode_sort      sort;          /**< coarse classification of this mode:
                                           int, float, reference ...
                                           (see irmode.h) */
-	mode_arithmetic   arithmetic;    /**< different arithmetic operations possible with a mode */
+	ir_mode_arithmetic
+	                  arithmetic;    /**< different arithmetic operations possible with a mode */
 	unsigned          size;          /**< size of the mode in Bits. */
 	unsigned          sign:1;        /**< signedness of this mode */
 	unsigned int      modulo_shift;  /**< number of bits a values of this mode will be shifted */
@@ -126,6 +128,7 @@ typedef struct {
 	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 */
 	ir_dom_info dom;            /**< Datastructure that holds information about dominators.
@@ -285,11 +288,12 @@ typedef struct {
 
 /** Inline Assembler support attribute. */
 typedef struct {
+	/* BEWARE: pin state MUST be the first attribute */
+	op_pin_state      pin_state;  /**< the pin state for operations that might generate a exception */
 	ident             *asm_text;  /**< The inline assembler text. */
 	ir_asm_constraint *inputs;    /**< Input constraints. */
 	ir_asm_constraint *outputs;   /**< Output constraints. */
 	ident             **clobber;  /**< List of clobbered registers. */
-    op_pin_state      pin_state;  /**< the pin state for operations that might generate a exception */
 } asm_attr;
 
 /** Some IR-nodes just have one attribute, these are stored here,
@@ -330,6 +334,14 @@ typedef struct _irn_edge_kind_info_t {
 
 typedef irn_edge_info_t irn_edges_info_t[EDGE_KIND_LAST];
 
+/**
+ * A Def-Use edge.
+ */
+typedef struct _ir_def_use_edge {
+	ir_node *use;            /** The use node of that edge. */
+	int     pos;             /** The position of this edge in use's input array. */
+} ir_def_use_edge;
+
 /**
  * The common structure of an irnode.
  * If the node has some attributes, they are stored in the attr field.
@@ -347,7 +359,7 @@ struct ir_node {
 	                              during optimization to link to nodes that
 	                              shall replace a node. */
 	/* ------- Fields for optimizations / analysis information ------- */
-	struct ir_node **out;    /**< @deprecated array of out edges. */
+	ir_def_use_edge *out;    /**< array of def-use edges. */
 	struct dbg_info *dbi;    /**< A pointer to information for debug support. */
 	/* ------- For debugging ------- */
 #ifdef DEBUG_libfirm
@@ -461,7 +473,7 @@ struct ir_graph {
 	/* -- Fields for optimizations / analysis information -- */
 	pset *value_table;                 /**< Hash table for global value numbering (cse)
 	                                        for optimizing use in iropt.c */
-	ir_node **outs;                    /**< Space for the out arrays. */
+	ir_def_use_edge *outs;             /**< Space for the Def-Use arrays. */
 
 	ir_loop *loop;                     /**< The outermost loop for this graph. */
 	void *link;                        /**< A void* field to link any information to
@@ -498,9 +510,7 @@ struct ir_graph {
 #endif
 
 #ifndef NDEBUG
-	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 */
+	ir_resources_t  reserved_resources;
 #endif
 };
 
@@ -516,15 +526,11 @@ struct ir_prog {
 	                                     to allocate nodes the represent values
 	                                     of constant entities. It is not meant as
 	                                     a procedure.  */
-	ir_type   *glob_type;           /**< The global type.  Must be a class as it can
-	                                     have fields and procedures.  */
-	ir_type   *tls_type;            /**< The thread local storage type.  Must be a struct as it can
-	                                     only have fields.  */
-	ir_type   *constructors_type;   /**< contains links to module constructor
-	                                     functions. Must be a struct */
+	ir_type   *segment_types[IR_SEGMENT_COUNT];
 	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. */
+	ident    **global_asms;         /**< An array of global ASM insertions. */
 
 	/* -- states of and access to generated information -- */
 	irg_phase_state phase_state;    /**< The state of construction. */