Remove pointless local variables.

[libfirm] / ir / ir / irtypes.h

diff --git a/ir/ir/irtypes.h b/ir/ir/irtypes.h
index e767f1f..23e2cc0 100644 (file)
--- a/ir/ir/irtypes.h
+++ b/ir/ir/irtypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -148,7 +148,6 @@ typedef struct block_attr {
        ir_visited_t block_visited; /**< For the walker that walks over all blocks. */
        /* Attributes private to construction: */
        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 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 */
@@ -243,7 +242,7 @@ typedef struct cast_attr {
 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      aligned:1;      /**< The align attribute of this Load operation. */
+    unsigned      unaligned:1;    /**< The align attribute of this Load operation. */
        ir_mode       *mode;          /**< The mode of this Load operation. */
 } load_attr;
 
@@ -251,7 +250,7 @@ typedef struct load_attr {
 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      aligned:1;      /**< The align attribute of this Store operation. */
+       unsigned      unaligned:1;    /**< The align attribute of this Store operation. */
 } store_attr;
 
 typedef struct phi_attr {
@@ -267,10 +266,14 @@ typedef struct phi_attr {
        } u;
 } phi_attr;
 
+/**< Cmp attribute. */
+typedef struct cmp_attr {
+       ir_relation relation;         /**< comparison condition. */
+} cmp_attr;
 
 /**< Confirm attribute. */
 typedef struct confirm_attr {
-       pn_Cmp cmp;                   /**< The compare operation. */
+       ir_relation relation;         /**< relation between value and bound */
 } confirm_attr;
 
 /** CopyB attribute. */
@@ -323,6 +326,7 @@ typedef union ir_attr {
        bad_attr       bad;           /**< for Bads: irg reference */
        anchor_attr    anchor;        /**< for Anchor: irg reference */
        block_attr     block;         /**< For Block: Fields needed to construct it */
+       cmp_attr       cmp;           /**< For Cmp. */
        cond_attr      cond;          /**< For Cond. */
        const_attr     con;           /**< For Const: contains the value of the constant and a type */
        symconst_attr  symc;          /**< For SymConst. */
@@ -426,8 +430,6 @@ enum irg_anchors {
        anchor_start,            /**< start node of this ir_graph */
        anchor_initial_exec,     /**< methods initial control flow */
        anchor_frame,            /**< methods frame */
-       anchor_tls,              /**< pointer to the thread local storage containing all
-                                     thread local data. */
        anchor_initial_mem,      /**< initial memory of this graph */
        anchor_args,             /**< methods arguments */
        anchor_bad,              /**< bad node of this ir_graph, the one and
@@ -440,7 +442,7 @@ enum irg_anchors {
 typedef struct cg_callee_entry {
        ir_graph  *irg;        /**< The called irg. */
        ir_node  **call_list;  /**< The list of all calls to the irg. */
-       int        max_depth;  /**< Maximum depth of all Call nodes to irg. */
+       size_t     max_depth;  /**< Maximum depth of all Call nodes to irg. */
 } cg_callee_entry;
 
 /**
@@ -500,8 +502,8 @@ struct ir_graph {
        cg_callee_entry **callees;         /**< For callgraph analysis: list of callee calls */
        unsigned *callee_isbe;             /**< For callgraph analysis: raw bitset if backedge info calculated. */
        ir_loop   *l;                            /**< For callgraph analysis. */
-       int        callgraph_loop_depth;         /**< For callgraph analysis */
-       int        callgraph_recursion_depth;    /**< For callgraph analysis */
+       size_t     callgraph_loop_depth;         /**< For callgraph analysis */
+       size_t     callgraph_recursion_depth;    /**< For callgraph analysis */
        double     method_execution_frequency;   /**< For callgraph analysis */
 
 
@@ -519,7 +521,7 @@ struct ir_graph {
        irg_edges_info_t edge_info;        /**< edge info for automatic outs */
        ir_node **idx_irn_map;             /**< Array mapping node indexes to nodes. */
 
-       int index;                         /**< a unique number for each graph */
+       size_t index;                      /**< a unique number for each graph */
        ir_phase *phases[PHASE_LAST+1];    /**< Phase information. */
        void     *be_data;                 /**< backend can put in private data here */
 
@@ -583,8 +585,8 @@ struct ir_prog {
        irp_callgraph_state callgraph_state; /**< The state of the callgraph. */
        ir_loop *outermost_cg_loop;          /**< For callgraph analysis: entry point
                                                      to looptree over callgraph. */
-       int max_callgraph_loop_depth;        /**< needed in callgraph. */
-       int max_callgraph_recursion_depth;   /**< needed in callgraph. */
+       size_t max_callgraph_loop_depth;        /**< needed in callgraph. */
+       size_t max_callgraph_recursion_depth;   /**< needed in callgraph. */
        double max_method_execution_frequency;  /**< needed in callgraph. */
        irp_temperature_state temperature_state; /**< accumulated temperatures computed? */
        exec_freq_state execfreq_state;      /**< The state of execution frequency information */
@@ -594,7 +596,7 @@ struct ir_prog {
 
        ir_exc_region_t last_region_nr;      /**< The last exception region number that was assigned. */
        ir_label_t last_label_nr;            /**< The highest label number for generating unique labels. */
-       int  max_irg_idx;                    /**< highest unused irg index */
+       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 */
 #ifndef NDEBUG