X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.h;h=8b7840652c9442a8a67a54918c6b5c55e4e0ecf7;hb=cb91bddc9cacdab7c28e4336847bd3dc248aa549;hp=38d111b76aa814f9a0e873998a0e4f5b30650ad2;hpb=a63d650a1f74912165414d954663284273c15098;p=libfirm

diff --git a/ir/ir/ircons.h b/ir/ir/ircons.h
index 38d111b76..8b7840652 100644
--- a/ir/ir/ircons.h
+++ b/ir/ir/ircons.h
@@ -84,7 +84,7 @@
  *
  *      *args        The ir_node that produces the arguments of the method as
  *               it's result.  This is a Proj node on the fourth output of
- *               the start node.  This output is tagged as pns_args.
+ *               the start node.  This output is tagged as pn_Start_T_args.
  *
  *      *bad             The bad node is an auxiliary node. It is needed only once,
  *                       so there is this globally reachable node.
@@ -95,7 +95,7 @@
  *
  *      *current_block   A pointer to the current block.  Any node created with
  *                       one of the node constructors (new_<opcode>) are assigned
- *                       to this block.  It can be set with switch_block(block).
+ *                       to this block.  It can be set with set_cur_block(block).
  *                       Only needed for ir construction.
  *
  *      params/n_loc     An int giving the number of local variables in this
@@ -182,7 +182,7 @@
  *      *link            A pointer to an ir_node.  With this pointer all Phi nodes
  *                       are attached to a Block, i.e., a Block points to it's
  *                       first Phi node, this node points to the second Phi node
- *                       in the Block and so fourth.  Used in mature_block
+ *                       in the Block and so fourth.  Used in mature_immBlock
  *                       to find all Phi nodes to be matured.  It's also used to
  *               annotate a node with a better, optimized version of it.
  *
@@ -227,7 +227,7 @@
  *      (new_<Node> constructurs and a set of additional routines.)
  *    * A less comfortable interface where all predecessors except the block
  *      an operation belongs to need to be specified.  SSA must be constructed
- *      by hand.  (new_<Node> constructors and switch_block()).  This interface
+ *      by hand.  (new_<Node> constructors and set_cur_block()).  This interface
  *      is called "block oriented".  It automatically calles the local optimizations
  *      for each new node.
  *    * An even less comfortable interface where the block needs to be specified
@@ -257,16 +257,16 @@
  *
  *    A global variable holds the current basic block.  All (non block) nodes
  *    generated are added to this block.  The current block can be set with
- *    switch_block(block).  If several blocks are constructed in parallel block
+ *    set_cur_block(block).  If several blocks are constructed in parallel block
  *    switches need to be performed constantly.
  *
  *    To generate a Block node (with the comfortable interface) it's predecessor
  *    control flow nodes need not be known.  In case of cyclic control flow these
- *    can not be known when the block is constructed.  With add_in_edge(block,
+ *    can not be known when the block is constructed.  With add_immBlock_pred(block,
  *    cfnode) predecessors can be added to the block.  If all predecessors are
- *    added to the block mature_block(b) needs to be called.  Calling mature_block
+ *    added to the block mature_immBlock(b) needs to be called.  Calling mature_immBlock
  *    early improves the efficiency of the Phi node construction algorithm.
- *    But if several  blocks are constructed at once, mature_block must only
+ *    But if several  blocks are constructed at once, mature_immBlock must only
  *    be called after performing all set_values and set_stores in the block!
  *    (See documentation of new_immBlock constructor.)
  *
@@ -298,9 +298,9 @@
  *    ir_node *this_block, *cf_pred1, *cf_pred2, *a_val, *mem, *div, *res, *cf_op;
  *
  *    this_block = new_immBlock();
- *    add_in_edge(this_block, cf_pred1);
- *    add_in_edge(this_block, cf_pred2);
- *    mature_block(this_block);
+ *    add_immBlock_pred(this_block, cf_pred1);
+ *    add_immBlock_pred(this_block, cf_pred2);
+ *    mature_immBlock(this_block);
  *    a_val = get_value(42, mode_Iu);
  *    mem = get_store();
  *    div = new_Div(mem, a_val, a_val);
@@ -352,52 +352,19 @@
  *    ir_node *new_Cmp    (ir_node *op1, ir_node *op2);
  *    ir_node *new_Conv   (ir_node *op, ir_mode *mode);
  *    ir_node *new_Cast   (ir_node *op, type *to_tp);
- *    ir_node *new_Load   (ir_node *store, ir_node *addr);
+ *    ir_node *new_Load   (ir_node *store, ir_node *addr, ir_mode *mode);
  *    ir_node *new_Store  (ir_node *store, ir_node *addr, ir_node *val);
  *    ir_node *new_Alloc  (ir_node *store, ir_node *size, type *alloc_type,
  *                         where_alloc where);
  *    ir_node *new_Free   (ir_node *store, ir_node *ptr, ir_node *size,
  *               type *free_type);
  *    ir_node *new_Proj   (ir_node *arg, ir_mode *mode, long proj);
-=======
- *    ir_node *new_simpleSel(ir_node *store, ir_node *objptr, entity *ent);
- *    ir_node *new_Sel      (ir_node *store, ir_node *objptr, int arity,
- *                           ir_node **in, entity *ent);
- *    ir_node *new_Call     (ir_node *store, ir_node *callee, int arity,
- *                       ir_node **in, type_method *type);
- *    ir_node *new_Add      (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Sub      (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Minus    (ir_node *op,  ir_mode *mode);
- *    ir_node *new_Mul      (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Quot     (ir_node *memop, ir_node *op1, ir_node *op2);
- *    ir_node *new_DivMod   (ir_node *memop, ir_node *op1, ir_node *op2);
- *    ir_node *new_Div      (ir_node *memop, ir_node *op1, ir_node *op2);
- *    ir_node *new_Mod      (ir_node *memop, ir_node *op1, ir_node *op2);
- *    ir_node *new_Abs      (ir_node *op,                ir_mode *mode);
- *    ir_node *new_And      (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Or       (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Eor      (ir_node *op1, ir_node *op2, ir_mode *mode);
- *    ir_node *new_Not      (ir_node *op,                ir_mode *mode);
- *    ir_node *new_Shl      (ir_node *op,  ir_node *k,   ir_mode *mode);
- *    ir_node *new_Shr      (ir_node *op,  ir_node *k,   ir_mode *mode);
- *    ir_node *new_Shrs     (ir_node *op,  ir_node *k,   ir_mode *mode);
- *    ir_node *new_Rot      (ir_node *op,  ir_node *k,   ir_mode *mode);
- *    ir_node *new_Cmp      (ir_node *op1, ir_node *op2);
- *    ir_node *new_Conv     (ir_node *op, ir_mode *mode);
- *    ir_node *new_Cast     (ir_node *op, type *to_tp);
- *    ir_node *new_Load     (ir_node *store, ir_node *addr);
- *    ir_node *new_Store    (ir_node *store, ir_node *addr, ir_node *val);
- *    ir_node *new_Alloc    (ir_node *store, ir_node *size, type *alloc_type,
- *                           where_alloc where);
- *    ir_node *new_Free     (ir_node *store, ir_node *ptr, ir_node *size,
- *                       type *free_type);
- *    ir_node *new_Proj     (ir_node *arg, ir_mode *mode, long proj);
  *    ir_node *new_FuncCall (ir_node *store, ir_node *callee, int arity,
  *                       ir_node **in, type_method *type);
  *
- *    void add_in_edge (ir_node *block, ir_node *jmp);
- *    void mature_block (ir_node *block);
- *    void switch_block (ir_node *target);
+ *    void add_immBlock_pred (ir_node *block, ir_node *jmp);
+ *    void mature_immBlock (ir_node *block);
+ *    void set_cur_block (ir_node *target);
  *    ir_node *get_value (int pos, ir_mode *mode);
  *    void set_value (int pos, ir_node *value);
  *    ir_node *get_store (void);
@@ -433,15 +400,14 @@
  *    Creates a new block.  Sets current_block to itself.  When a new block is
  *    created it cannot be known how many predecessors this block will have in the
  *    control flow graph. Therefore the list of inputs can not be fixed at
- *    creation.  Predecessors can be added with add_in_edge (block, control flow
+ *    creation.  Predecessors can be added with add_immBlock_pred (block, control flow
  *    operation).  With every added predecessor the number of inputs to Phi nodes
  *    also changes.
  *
- *    The block can be completed by mature_block(block) if all predecessors are
- *    known.  If several blocks are built at once, mature_block can only be called
+ *    The block can be completed by mature_immBlock(block) if all predecessors are
+ *    known.  If several blocks are built at once, mature_immBlock can only be called
  *    after set_value has been called for all values that are life at the end
- *    of the block.  This is necessary so that Phi nodes created by mature_block
- *    get the right predecessors in case of cyclic dependencies.  If all set_values
+ *    of the block.  This is necessary so that Phi nodes created mature_immBlock *    get the right predecessors in case of cyclic dependencies.  If all set_values
  *    of this block are called after maturing it and before calling get_value
  *    in some block that is control flow dependent on this block, the construction
  *    is correct.
@@ -451,7 +417,7 @@
  *
  *      block_before_loop = new_block();
  *      set_value(x);
- *      mature_block(block_before_loop);
+ *      mature_immBlock(block_before_loop);
  *      before2header = new_Jmp;
  *
  *      loop_header = new_block ();
@@ -460,18 +426,18 @@
  *      loop_body = new_block ();
  *      body2header = new_Jmp();
  *
- *      add_in_edge(loop_header, before2header);
- *      add_in_edge(loop_header, body2header);
- *      add_in_edge(loop_body, header2body);
+ *      add_immBlock_pred(loop_header, before2header);
+ *      add_immBlock_pred(loop_header, body2header);
+ *      add_immBlock_pred(loop_body, header2body);
  *
- *      mature_block(loop_header);
- *      mature_block(loop_body);
+ *      mature_immBlock(loop_header);
+ *      mature_immBlock(loop_body);
  *
  *      get_value(loop_body, x);   //  gets the Phi in loop_header
  *      set_value(loop_header, x); //  sets the value the above get_value should
  *                                 //  have returned!!!
  *
- *    Mature_block also fixes the number of inputs to the Phi nodes.  Mature_block
+ *    Mature_immBlock also fixes the number of inputs to the Phi nodes.  Mature_immBlock
  *    should be called as early as possible, as afterwards the generation of Phi
  *   nodes is more efficient.
  *
@@ -523,16 +489,12 @@
  *      No inputs except the block it belogns to.
  *    Output:
  *      A tuple of 4 (5, 6) distinct values. These are labeled by the following
- *      projection numbers (pns_number):
- *      * pns_initial_exec
- *                       mode X, points to the first block to be executed.
- *      * pns_global_store
- *                       mode M, the global store
- *      * pns_frame_base mode P, a pointer to the base of the procedures
- *                       stack frame.
- *      * pns_globals    mode P, a pointer to the part of the memory containing
- *                               _all_ global things.
- *      * pns_args       mode T, a tuple containing all arguments of the procedure.
+ *      projection numbers (pn_Start):
+ *      * pn_Start_X_initial_exec    mode X, points to the first block to be exe *                                   cuted.
+ *      * pn_Start_M                 mode M, the global store
+ *      * pn_Start_P_frame_base      mode P, a pointer to the base of the proce  *                                   dures stack frame.
+ *      * pn_Start_P_globals         mode P, a pointer to the part of the memory *                                   containing_all_ global things.
+ *      * pn_Start_T_args            mode T, a tuple containing all arguments of *                                   the procedure.
  *
  *
  *    ir_node *new_End (void)
@@ -932,7 +894,7 @@
  *    OPERATIONS TO MANAGE MEMORY EXPLICITLY
  *    --------------------------------------
  *
- *    ir_node *new_Load (ir_node *store, ir_node *addr)
+ *    ir_node *new_Load (ir_node *store, ir_node *addr, ir_mode *mode)
  *    ----------------------------------------------------------------
  *
  *    The Load operation reads a value from memory.
@@ -940,6 +902,7 @@
  *    Parameters:
  *    *store        The current memory.
  *    *addr         A pointer to the variable to be read in this memory.
+ *    *mode         The mode of the value to be loaded.
  *
  *    Inputs:
  *      The memory and a pointer to a variable in this memory.
@@ -1674,9 +1637,10 @@ ir_node *new_rd_Phi    (dbg_info *db, ir_graph *irg, ir_node *block, int arity,
  * @param *block The ir block the node belongs to.
  * @param *store The current memory
  * @param *adr   A pointer to the variable to be read in this memory.
+ * @param *mode  The mode of the value to be loaded.
  */
 ir_node *new_rd_Load   (dbg_info *db, ir_graph *irg, ir_node *block,
-			ir_node *store, ir_node *adr);
+			ir_node *store, ir_node *adr, ir_mode *mode);
 
 /** Constructor for a Store node.
  *
@@ -1977,7 +1941,7 @@ ir_node *new_r_Raise  (ir_graph *irg, ir_node *block,
  * @param *con   Points to an entry in the constant table.
  */
 ir_node *new_r_Const  (ir_graph *irg, ir_node *block,
-               ir_mode *mode, tarval *con);
+		       ir_mode *mode, tarval *con);
 
 /** Constructor for a SymConst node.
  *
@@ -2040,7 +2004,6 @@ ir_node *new_r_Sel    (ir_graph *irg, ir_node *block, ir_node *store,
  * @param   *x
  * @param   *y
  * @param   *z
- *
  */
 ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *x, ir_node *y, type *z);
 
@@ -2055,7 +2018,6 @@ ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *x, ir_node *y, ty
  * @param   arity   The number of procedure parameters.
  * @param   *in[]   An array with the pointers to the parameters. The constructor copies this array.
  * @param   *tp     Type information of the procedure called.
- *
  */
 ir_node *new_r_Call   (ir_graph *irg, ir_node *block, ir_node *store,
                ir_node *callee, int arity, ir_node *in[],
@@ -2068,7 +2030,6 @@ ir_node *new_r_Call   (ir_graph *irg, ir_node *block, ir_node *store,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_r_Add    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2081,7 +2042,6 @@ ir_node *new_r_Add    (ir_graph *irg, ir_node *block,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the results.
- *
  */
 ir_node *new_r_Sub    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2092,7 +2052,6 @@ ir_node *new_r_Sub    (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op   The operand.
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_r_Minus  (ir_graph *irg, ir_node *block,
                ir_node *op,  ir_mode *mode);
@@ -2103,7 +2062,6 @@ ir_node *new_r_Minus  (ir_graph *irg, ir_node *block,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_r_Mul    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2115,7 +2073,6 @@ ir_node *new_r_Mul    (ir_graph *irg, ir_node *block,
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_r_Quot   (ir_graph *irg, ir_node *block,
                ir_node *memop, ir_node *op1, ir_node *op2);
@@ -2127,7 +2084,6 @@ ir_node *new_r_Quot   (ir_graph *irg, ir_node *block,
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_r_DivMod (ir_graph *irg, ir_node *block,
                ir_node *memop, ir_node *op1, ir_node *op2);
@@ -2139,7 +2095,6 @@ ir_node *new_r_DivMod (ir_graph *irg, ir_node *block,
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_r_Div    (ir_graph *irg, ir_node *block,
                ir_node *memop, ir_node *op1, ir_node *op2);
@@ -2151,7 +2106,6 @@ ir_node *new_r_Div    (ir_graph *irg, ir_node *block,
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_r_Mod    (ir_graph *irg, ir_node *block,
                ir_node *memop, ir_node *op1, ir_node *op2);
@@ -2162,7 +2116,6 @@ ir_node *new_r_Mod    (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op    The operand
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_r_Abs    (ir_graph *irg, ir_node *block,
                        ir_node *op, ir_mode *mode);
@@ -2174,7 +2127,6 @@ ir_node *new_r_Abs    (ir_graph *irg, ir_node *block,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_r_And    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2186,7 +2138,6 @@ ir_node *new_r_And    (ir_graph *irg, ir_node *block,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_r_Or     (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2198,7 +2149,6 @@ ir_node *new_r_Or     (ir_graph *irg, ir_node *block,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the results.
- *
  */
 ir_node *new_r_Eor    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2209,7 +2159,6 @@ ir_node *new_r_Eor    (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op    The operand.
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_r_Not    (ir_graph *irg, ir_node *block,
                ir_node *op, ir_mode *mode);
@@ -2220,7 +2169,6 @@ ir_node *new_r_Not    (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_r_Cmp    (ir_graph *irg, ir_node *block,
                ir_node *op1, ir_node *op2);
@@ -2232,7 +2180,6 @@ ir_node *new_r_Cmp    (ir_graph *irg, ir_node *block,
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_r_Shl    (ir_graph *irg, ir_node *block,
                ir_node *op, ir_node *k, ir_mode *mode);
@@ -2244,7 +2191,6 @@ ir_node *new_r_Shl    (ir_graph *irg, ir_node *block,
  * @param   *op    The operand.
  * @param   *k     The number of bits to shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_r_Shr    (ir_graph *irg, ir_node *block,
                ir_node *op, ir_node *k, ir_mode *mode);
@@ -2257,7 +2203,6 @@ ir_node *new_r_Shr    (ir_graph *irg, ir_node *block,
  * @param   *op    The operand.
  * @param   *k     The number of bits to shift the operand.
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_r_Shrs   (ir_graph *irg, ir_node *block,
                ir_node *op, ir_node *k, ir_mode *mode);
@@ -2269,7 +2214,6 @@ ir_node *new_r_Shrs   (ir_graph *irg, ir_node *block,
  * @param   *op    The operand.
  * @param   *k     The number of bits to rotate the operand.
  * @param   *mode  The mode of the operand.
- *
  */
 ir_node *new_r_Rot    (ir_graph *irg, ir_node *block,
                ir_node *op, ir_node *k, ir_mode *mode);
@@ -2280,7 +2224,6 @@ ir_node *new_r_Rot    (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op    The operand.
  * @param   *mode  The mode of this the operand muss be converted .
- *
  */
 ir_node *new_r_Conv   (ir_graph *irg, ir_node *block,
                ir_node *op, ir_mode *mode);
@@ -2293,7 +2236,6 @@ ir_node *new_r_Conv   (ir_graph *irg, ir_node *block,
  * @param   *block The ir block the node belongs to.
  * @param   *op    The operand.
  * @param   *to_tp The type of this the operand muss be casted .
- *
  */
 ir_node *new_r_Cast   (ir_graph *irg, ir_node *block,
                ir_node *op, type *to_tp);
@@ -2305,7 +2247,6 @@ ir_node *new_r_Cast   (ir_graph *irg, ir_node *block,
  * @param arity  The number of predecessors
  * @param *in[]    Array with predecessors. The constructor copies this array.
  * @param *mode  The mode of it's inputs and output.
- *
  */
 ir_node *new_r_Phi    (ir_graph *irg, ir_node *block, int arity,
 		       ir_node *in[], ir_mode *mode);
@@ -2316,10 +2257,11 @@ ir_node *new_r_Phi    (ir_graph *irg, ir_node *block, int arity,
  * @param *block The ir block the node belongs to.
  * @param *store The current memory
  * @param *adr   A pointer to the variable to be read in this memory.
- *
+ * @param *mode  The mode of the value to be loaded.
  */
 ir_node *new_r_Load   (ir_graph *irg, ir_node *block,
-               ir_node *store, ir_node *adr);
+               ir_node *store, ir_node *adr, ir_mode *mode);
+
 /** Constructor for a Store node.
  *
  * @param *irg   The ir graph the node  belongs to.
@@ -2341,7 +2283,6 @@ ir_node *new_r_Store  (ir_graph *irg, ir_node *block,
  * @param *size       The number of bytes to allocate.
  * @param *alloc_type The type of the allocated variable.
  * @param where       Where to allocate the variable, either heap_alloc or stack_alloc.
- *
  */
 ir_node *new_r_Alloc  (ir_graph *irg, ir_node *block, ir_node *store,
                ir_node *size, type *alloc_type, where_alloc where);
@@ -2357,7 +2298,6 @@ ir_node *new_r_Alloc  (ir_graph *irg, ir_node *block, ir_node *store,
  * @param *ptr        The pointer to the object to free.
  * @param *size       The number of objects of type free_type to free in a sequence.
  * @param *free_type  The type of the freed variable.
- *
  */
 ir_node *new_r_Free   (ir_graph *irg, ir_node *block, ir_node *store,
                ir_node *ptr, ir_node *size, type *free_type);
@@ -2373,7 +2313,6 @@ ir_node *new_r_Free   (ir_graph *irg, ir_node *block, ir_node *store,
  * @param  arity    The number of memories to syncronize.
  * @param  *in[]    An array of pointers to nodes that produce an output of  type memory.
  *                  The constructor copies this array.
- *
  */
 ir_node *new_r_Sync   (ir_graph *irg, ir_node *block, int arity, ir_node *in[]);
 
@@ -2387,7 +2326,6 @@ ir_node *new_r_Sync   (ir_graph *irg, ir_node *block, int arity, ir_node *in[]);
  * @param arg    A node producing a tuple.
  * @param *mode  The mode of the value to project.
  * @param proj   The position of the value in the tuple.
- *
  */
 ir_node *new_r_Proj   (ir_graph *irg, ir_node *block, ir_node *arg,
 		       ir_mode *mode, long proj);
@@ -2400,7 +2338,6 @@ ir_node *new_r_Proj   (ir_graph *irg, ir_node *block, ir_node *arg,
  * @param *block    The ir block the node belongs to.
  * @param arg       A node producing a tuple.
  * @param max_ proj The end  position of the value in the tuple.
- *
  */
 ir_node *new_r_defaultProj (ir_graph *irg, ir_node *block, ir_node *arg, long max_proj);
 
@@ -2427,7 +2364,6 @@ ir_node *new_r_Tuple  (ir_graph *irg, ir_node *block, int arity, ir_node *in[]);
  * @param *block  The ir block the node belongs to.
  * @param *val    The operand to Id.
  * @param *mode   The mode of *val.
- *
  */
 ir_node *new_r_Id     (ir_graph *irg, ir_node *block,
                ir_node *val, ir_mode *mode);
@@ -2481,7 +2417,6 @@ ir_node *new_r_Unknown(ir_graph *irg, ir_mode *m);
  * @param *irg    The ir graph the node belong to.
  * @param *block  The block the node belong to.
  * @param *callee The call node bisible in the  intra procedural view.
- *
  */
 ir_node *new_r_CallBegin(ir_graph *irg, ir_node *block, ir_node *callee);
 
@@ -2491,7 +2426,6 @@ ir_node *new_r_CallBegin(ir_graph *irg, ir_node *block, ir_node *callee);
  *
  * @param *irg    The ir graph the node belong to.
  * @param *block  The block the node belong to.
- *
  */
 ir_node *new_r_EndReg (ir_graph *irg, ir_node *block);
 
@@ -2501,7 +2435,6 @@ ir_node *new_r_EndReg (ir_graph *irg, ir_node *block);
  *
  * @param *irg    The ir graph the node belong to.
  * @param *block  The block the node belong to.
- *
  */
 ir_node *new_r_EndExcept(ir_graph *irg, ir_node *block);
 
@@ -2514,7 +2447,6 @@ ir_node *new_r_EndExcept(ir_graph *irg, ir_node *block);
  *
  * @param *irg    The ir graph the node belong to.
  * @param *block  The block the node belong to.
- *
  */
 ir_node *new_r_Break  (ir_graph *irg, ir_node *block);
 
@@ -2534,7 +2466,6 @@ ir_node *new_r_Break  (ir_graph *irg, ir_node *block);
  * @param *arg  The tuple value to project from.
  * @param *mode The mode of the projected value.
  * @param proj  The position in the tuple to project from.
- *
  */
 ir_node *new_r_Filter (ir_graph *irg, ir_node *block, ir_node *arg,
                ir_mode *mode, long proj);
@@ -2551,7 +2482,6 @@ ir_node *new_r_Filter (ir_graph *irg, ir_node *block, ir_node *arg,
  * @param *in[]   An array with the pointers to the parameters.
  *                The constructor copies this array.
  * @param *type   Type information of the procedure called.
- *
  */
 ir_node *new_r_FuncCall (ir_graph *irg, ir_node *block,
 			 ir_node *callee, int arity, ir_node *in[],
@@ -2566,7 +2496,7 @@ ir_node *new_r_FuncCall (ir_graph *irg, ir_node *block,
  *
  *  @param target  The new current block.
  */
-void     switch_block (ir_node *target);
+void     set_cur_block (ir_node *target);
 
 /** Returns the current block of the current graph. */
 ir_node *get_cur_block(void);
@@ -2595,7 +2525,6 @@ ir_node *new_d_Block(dbg_info* db, int arity, ir_node *in[]);
  * Adds the node to the block in current_ir_block.
  *
  * @param *db    A pointer for debug information.
- *
  */
 ir_node *new_d_Start  (dbg_info* db);
 
@@ -2604,7 +2533,6 @@ ir_node *new_d_Start  (dbg_info* db);
  * Adds the node to the block in current_ir_block.
  *
  * @param *db     A pointer for debug information.
- *
  */
 ir_node *new_d_End    (dbg_info* db);
 
@@ -2615,7 +2543,6 @@ ir_node *new_d_End    (dbg_info* db);
  * Jmp represents control flow to a single control successor.
  *
  * @param *db     A pointer for debug information.
- *
  */
 
 ir_node *new_d_Jmp    (dbg_info* db);
@@ -2633,7 +2560,6 @@ ir_node *new_d_Jmp    (dbg_info* db);
  *
  * @param *db    A pointer for debug information.
  * @param *c     The conditions parameter.Can be of mode b or I_u.
- *
  */
 
 ir_node *new_d_Cond   (dbg_info* db, ir_node *c);
@@ -2649,7 +2575,6 @@ ir_node *new_d_Cond   (dbg_info* db, ir_node *c);
  * @param *store The state of memory.
  * @param arity  Number of array indexes.
  * @param *in    Array with index inputs to the node.
- *
  */
 
 ir_node *new_d_Return (dbg_info* db, ir_node *store, int arity, ir_node *in[]);
@@ -2661,7 +2586,6 @@ ir_node *new_d_Return (dbg_info* db, ir_node *store, int arity, ir_node *in[]);
  * @param *db    A pointer for debug information.
  * @param *store The current memory.
  * @param *obj   A pointer to the Except variable.
- *
  */
 
 ir_node *new_d_Raise  (dbg_info* db, ir_node *store, ir_node *obj);
@@ -2678,7 +2602,6 @@ ir_node *new_d_Raise  (dbg_info* db, ir_node *store, ir_node *obj);
  * @param *con   Points to an entry in the constant table. This pointer is
                  added to the attributes of the node.
  * @param *tp    The type of the constante.
- *
  */
 
 ir_node *new_d_Const_type (dbg_info* db, ir_mode *mode, tarval *con, type *tp);
@@ -2695,7 +2618,6 @@ ir_node *new_d_Const_type (dbg_info* db, ir_mode *mode, tarval *con, type *tp);
  * @param *mode  The mode of the operands and redults.
  * @param *con   Points to an entry in the constant table. This pointer is added
  *               to the attributes of the node.
- *
  */
 ir_node *new_d_Const  (dbg_info* db, ir_mode *mode, tarval *con);
 
@@ -2747,7 +2669,6 @@ ir_node *new_d_SymConst (dbg_info* db, union symconst_symbol value, symconst_kin
  * @param   *objptr    The object from that the Sel operation selects a
  *                     single attribute out.
  * @param   *ent       The entity to select.
- *
  */
 ir_node *new_d_simpleSel(dbg_info* db, ir_node *store, ir_node *objptr, entity *ent);
 
@@ -2783,7 +2704,6 @@ ir_node *new_d_Sel    (dbg_info* db, ir_node *store, ir_node *objptr, int arity,
  * @param   *store
  * @param   *objptr
  * @param   *ent
- *
  */
 ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent);
 
@@ -2798,7 +2718,6 @@ ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent)
  * @param   arity   The number of procedure parameters.
  * @param   *in[]   An array with the pointers to the parameters. The constructor copies this array.
  * @param   *tp     Type information of the procedure called.
- *
  */
 
 ir_node *new_d_Call   (dbg_info* db, ir_node *store, ir_node *callee, int arity, ir_node *in[],
@@ -2812,7 +2731,6 @@ ir_node *new_d_Call   (dbg_info* db, ir_node *store, ir_node *callee, int arity,
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_d_Add    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -2824,7 +2742,6 @@ ir_node *new_d_Add    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 
 ir_node *new_d_Sub    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
@@ -2836,7 +2753,6 @@ ir_node *new_d_Sub    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *db    A pointer for debug information.
  * @param   *op    The operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_d_Minus  (dbg_info* db, ir_node *op,  ir_mode *mode);
 
@@ -2848,7 +2764,6 @@ ir_node *new_d_Minus  (dbg_info* db, ir_node *op,  ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_d_Mul    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -2860,7 +2775,6 @@ ir_node *new_d_Mul    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_d_Quot   (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -2872,7 +2786,6 @@ ir_node *new_d_Quot   (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2)
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_d_DivMod (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -2884,7 +2797,6 @@ ir_node *new_d_DivMod (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2)
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_d_Div    (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -2896,7 +2808,6 @@ ir_node *new_d_Div    (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2)
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_d_Mod    (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -2907,7 +2818,6 @@ ir_node *new_d_Mod    (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2)
  * @param   *db    A pointer for debug information.
  * @param   *op    The operand
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_d_Abs    (dbg_info* db, ir_node *op,                ir_mode *mode);
 
@@ -2921,7 +2831,6 @@ ir_node *new_d_Abs    (dbg_info* db, ir_node *op,                ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_d_And    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -2933,7 +2842,6 @@ ir_node *new_d_And    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_d_Or     (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -2945,7 +2853,6 @@ ir_node *new_d_Or     (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the results.
- *
  */
 ir_node *new_d_Eor    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -2956,7 +2863,6 @@ ir_node *new_d_Eor    (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *db    A pointer for debug information.
  * @param   *op    The operand.
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_d_Not    (dbg_info* db, ir_node *op,                ir_mode *mode);
 
@@ -2968,7 +2874,6 @@ ir_node *new_d_Not    (dbg_info* db, ir_node *op,                ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_d_Shl    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -2980,7 +2885,6 @@ ir_node *new_d_Shl    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_d_Shr    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -2992,7 +2896,6 @@ ir_node *new_d_Shr    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_d_Shrs   (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3004,7 +2907,6 @@ ir_node *new_d_Shrs   (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to rotate the operand.
  * @param   *mode  The mode of the operand.
- *
  */
 ir_node *new_d_Rot    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3015,7 +2917,6 @@ ir_node *new_d_Rot    (dbg_info* db, ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *db    A pointer for debug information.
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_d_Cmp    (dbg_info* db, ir_node *op1, ir_node *op2);
 
@@ -3026,7 +2927,6 @@ ir_node *new_d_Cmp    (dbg_info* db, ir_node *op1, ir_node *op2);
  * @param   *db    A pointer for debug information.
  * @param   *op    The operand.
  * @param   *mode  The mode of this the operand muss be converted .
- *
  */
 ir_node *new_d_Conv   (dbg_info* db, ir_node *op, ir_mode *mode);
 
@@ -3038,7 +2938,6 @@ ir_node *new_d_Conv   (dbg_info* db, ir_node *op, ir_mode *mode);
  * @param   *db    A pointer for debug information.
  * @param   *op    The operand.
  * @param   *to_tp The type of this the operand muss be casted .
- *
  */
 ir_node *new_d_Cast   (dbg_info* db, ir_node *op, type *to_tp);
 
@@ -3050,7 +2949,6 @@ ir_node *new_d_Cast   (dbg_info* db, ir_node *op, type *to_tp);
  * @param arity  The number of predecessors
  * @param *in    Array with predecessors
  * @param *mode  The mode of it's inputs and output.
- *
  */
 ir_node *new_d_Phi    (dbg_info* db, int arity, ir_node *in[], ir_mode *mode);
 
@@ -3061,9 +2959,9 @@ ir_node *new_d_Phi    (dbg_info* db, int arity, ir_node *in[], ir_mode *mode);
  * @param *db    A pointer for debug information.
  * @param *store The current memory
  * @param *adr   A pointer to the variable to be read in this memory.
- *
+ * @param *mode  The mode of the value to be loaded.
  */
-ir_node *new_d_Load   (dbg_info* db, ir_node *store, ir_node *addr);
+ir_node *new_d_Load   (dbg_info* db, ir_node *store, ir_node *addr, ir_mode *mode);
 
 /** Constructor for a Store node.
  *
@@ -3086,7 +2984,6 @@ ir_node *new_d_Store  (dbg_info* db, ir_node *store, ir_node *addr, ir_node *val
  * @param *size       The number of bytes to allocate.
  * @param *alloc_type The type of the allocated variable.
  * @param where       Where to allocate the variable, either heap_alloc or stack_alloc.
- *
  */
 ir_node *new_d_Alloc  (dbg_info* db, ir_node *store, ir_node *size, type *alloc_type,
                      where_alloc where);
@@ -3102,7 +2999,6 @@ ir_node *new_d_Alloc  (dbg_info* db, ir_node *store, ir_node *size, type *alloc_
  * @param *ptr        The pointer to the object to free.
  * @param *size       The number of objects of type free_type to free in a sequence.
  * @param *free_type  The type of the freed variable.
- *
  */
 ir_node *new_d_Free   (dbg_info* db, ir_node *store, ir_node *ptr, ir_node *size,
              type *free_type);
@@ -3118,7 +3014,6 @@ ir_node *new_d_Free   (dbg_info* db, ir_node *store, ir_node *ptr, ir_node *size
  * @param  arity    The number of memories to syncronize.
  * @param  **in     An array of pointers to nodes that produce an output of type
  *                  memory.  The constructor copies this array.
- *
  */
 ir_node *new_d_Sync   (dbg_info* db, int arity, ir_node *in[]);
 
@@ -3133,7 +3028,6 @@ ir_node *new_d_Sync   (dbg_info* db, int arity, ir_node *in[]);
  * @param arg    A node producing a tuple.
  * @param *mode  The mode of the value to project.
  * @param proj   The position of the value in the tuple.
- *
  */
 ir_node *new_d_Proj   (dbg_info* db, ir_node *arg, ir_mode *mode, long proj);
 
@@ -3146,7 +3040,6 @@ ir_node *new_d_Proj   (dbg_info* db, ir_node *arg, ir_mode *mode, long proj);
  * @param *db       A pointer for debug information.
  * @param arg       A node producing a tuple.
  * @param max_ proj The end  position of the value in the tuple.
- *
  */
 ir_node *new_d_defaultProj (dbg_info* db, ir_node *arg, long max_proj);
 
@@ -3159,7 +3052,6 @@ ir_node *new_d_defaultProj (dbg_info* db, ir_node *arg, long max_proj);
  * @param *db     A pointer for debug information.
  * @param arity   The number of tuple elements.
  * @param **in    An array containing pointers to the nodes producing the tuple elements.
- *
  */
 ir_node *new_d_Tuple  (dbg_info* db, int arity, ir_node *in[]);
 
@@ -3172,7 +3064,6 @@ ir_node *new_d_Tuple  (dbg_info* db, int arity, ir_node *in[]);
  * @param *db     A pointer for debug information.
  * @param *val    The operand to Id.
  * @param *mode   The mode of *val.
- *
  */
 ir_node *new_d_Id     (dbg_info* db, ir_node *val, ir_mode *mode);
 
@@ -3180,7 +3071,6 @@ ir_node *new_d_Id     (dbg_info* db, ir_node *val, ir_mode *mode);
  *
  * Returns the unique Bad node of the graph.  The same as
  * get_irg_bad().
- *
  */
 ir_node *new_d_Bad    (void);
 
@@ -3196,7 +3086,6 @@ ir_node *new_d_Bad    (void);
  * @param *val    The value we express a constraint for
  * @param *bound  The value to compare against. Must be a firm node, typically a constant.
  * @param cmp     The compare operation.
- *
  */
 ir_node *new_d_Confirm (dbg_info* db, ir_node *val, ir_node *bound, pn_Cmp cmp);
 
@@ -3207,7 +3096,6 @@ ir_node *new_d_Confirm (dbg_info* db, ir_node *val, ir_node *bound, pn_Cmp cmp);
  * the start block.
  *
  * @param *m      The mode of the unknown value.
- *
  */
 ir_node *new_d_Unknown(ir_mode *m);
 
@@ -3220,7 +3108,6 @@ ir_node *new_d_Unknown(ir_mode *m);
  *
  * @param *db     A pointer for debug information.
  * @param *callee The call node bisible in the  intra procedural view.
- *
  */
 ir_node *new_d_CallBegin(dbg_info *db, ir_node *callee);
 
@@ -3229,7 +3116,6 @@ ir_node *new_d_CallBegin(dbg_info *db, ir_node *callee);
  *Adds the node to the block in current_ir_block.
  *
  * @param *db     A pointer for debug information.
- *
  */
 ir_node *new_d_EndReg (dbg_info *db);
 
@@ -3239,7 +3125,6 @@ ir_node *new_d_EndReg (dbg_info *db);
  * Adds the node to the block in current_ir_block.
  *
  * @param *db     A pointer for debug information.
- *
  */
 ir_node *new_d_EndExcept(dbg_info *db);
 
@@ -3254,7 +3139,6 @@ ir_node *new_d_EndExcept(dbg_info *db);
  * behind Call nodes to represent the control flow to called procedures.
  *
  * @param *db     A pointer for debug information.
- *
  */
 ir_node *new_d_Break (dbg_info *db);
 
@@ -3274,7 +3158,6 @@ ir_node *new_d_Break (dbg_info *db);
  * @param *arg  The tuple value to project from.
  * @param *mode The mode of the projected value.
  * @param proj  The position in the tuple to project from.
- *
  */
 ir_node *new_d_Filter (dbg_info *db, ir_node *arg, ir_mode *mode, long proj);
 
@@ -3290,7 +3173,6 @@ ir_node *new_d_Filter (dbg_info *db, ir_node *arg, ir_mode *mode, long proj);
  * @param **in    An array with the pointers to the parameters.
  *                The constructor copies this array.
  * @param *tp     Type information of the procedure called.
- *
  */
 ir_node *new_d_FuncCall (dbg_info* db, ir_node *callee, int arity, ir_node *in[],
 			 type *tp);
@@ -3300,7 +3182,7 @@ ir_node *new_d_FuncCall (dbg_info* db, ir_node *callee, int arity, ir_node *in[]
 /*-----------------------------------------------------------------------*/
 
 /* Needed from the interfase with debug support:
-void switch_block (ir_node *target);   */
+void set_cur_block (ir_node *target);   */
 
 /** Constructor for a Block node.
  *
@@ -3325,7 +3207,6 @@ ir_node *new_Start  (void);
 /** Constructor for an End node.
  *
  * Adds the node to the block in current_ir_block.
- *
  */
 ir_node *new_End    (void);
 
@@ -3333,7 +3214,6 @@ ir_node *new_End    (void);
  *
  * Used to represent regular procedure end in interprocedual view.
  * Adds the node to the block in current_ir_block.
- *
  */
 ir_node *new_EndReg (void);
 
@@ -3341,18 +3221,14 @@ ir_node *new_EndReg (void);
  *
  *  Used to represent exceptional procedure end in interprocedural view.
  *  Adds the node to the block in current_ir_block.
- *
- *
- *
  */
 ir_node *new_EndExcept(void);
 
-/**
+/** Constructor for a Jump node.
  *
- * Constructor for a Jump node. Adds the node to the block in current_ir_block.
+ * Adds the node to the block in current_ir_block.
  *
  * Jmp represents control flow to a single control successor.
- *
  */
 ir_node *new_Jmp    (void);
 
@@ -3361,8 +3237,7 @@ ir_node *new_Jmp    (void);
  * The blocks separated by a break may not be concatenated by an optimization.
  * It is used for the interprocedural representation where blocks are parted
  * behind Call nodes to represent the control flow to called procedures.
- *Adds the node to the block in current_ir_block.
- *
+ * Adds the node to the block in current_ir_block.
  */
 ir_node *new_Break  (void);
 
@@ -3377,7 +3252,6 @@ ir_node *new_Break  (void);
  *
  *
  * @param *c     The conditions parameter.Can be of mode b or I_u.
- *
  */
 ir_node *new_Cond   (ir_node *c);
 
@@ -3389,7 +3263,6 @@ ir_node *new_Cond   (ir_node *c);
  * @param *store The state of memory.
  * @param arity  Number of array indexes.
  * @param *in    Array with index inputs to the node.
- *
  */
 ir_node *new_Return (ir_node *store, int arity, ir_node *in[]);
 
@@ -3399,7 +3272,6 @@ ir_node *new_Return (ir_node *store, int arity, ir_node *in[]);
  *
  * @param *store The current memory.
  * @param *obj   A pointer to the Except variable.
- *
  */
 ir_node *new_Raise  (ir_node *store, ir_node *obj);
 
@@ -3413,7 +3285,6 @@ ir_node *new_Raise  (ir_node *store, ir_node *obj);
  * @param *mode  The mode of the operands and redults.
  * @param *con   Points to an entry in the constant table. This pointer is
  *               added to the attributes of  the node.
- *
  */
 ir_node *new_Const  (ir_mode *mode, tarval *con);
 
@@ -3441,7 +3312,6 @@ ir_node *new_Const  (ir_mode *mode, tarval *con);
  *
  * @param value   A type or a ident depending on the SymConst kind.
  * @param symkind The kind of the symbolic constant: symconst_type_tag, symconst_size or symconst_addr_name.
- *
  */
 ir_node *new_SymConst (union symconst_symbol value, symconst_kind kind);
 
@@ -3454,7 +3324,6 @@ ir_node *new_SymConst (union symconst_symbol value, symconst_kind kind);
  * @param   *store     The memory in which the object the entity should be selected from is allocated.
  * @param   *objptr    The object from that the Sel operation selects a single attribute out.
  * @param   *ent       The entity to select.
- *
  */
 ir_node *new_simpleSel(ir_node *store, ir_node *objptr, entity *ent);
 
@@ -3487,7 +3356,6 @@ ir_node *new_Sel    (ir_node *store, ir_node *objptr, int arity, ir_node *in[],
  * @param   *store
  * @param   *objptr
  * @param   *ent
- *
  */
 ir_node *new_InstOf (ir_node *store, ir_node *obj,  type *ent);
 
@@ -3501,7 +3369,6 @@ ir_node *new_InstOf (ir_node *store, ir_node *obj,  type *ent);
  * @param   arity   The number of procedure parameters.
  * @param   *in[]   An array with the pointers to the parameters. The constructor copies this array.
  * @param   *tp     Type information of the procedure called.
- *
  */
 ir_node *new_Call   (ir_node *store, ir_node *callee, int arity, ir_node *in[],
 		     type *tp);
@@ -3511,7 +3378,6 @@ ir_node *new_Call   (ir_node *store, ir_node *callee, int arity, ir_node *in[],
  * Adds the node to the block in current_ir_block.
  *
  * @param   *callee A pointer to the called procedure.
- *
  */
 ir_node *new_CallBegin(ir_node *callee);
 
@@ -3525,7 +3391,6 @@ ir_node *new_CallBegin(ir_node *callee);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_Add    (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3536,7 +3401,6 @@ ir_node *new_Add    (ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_Sub    (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3546,7 +3410,6 @@ ir_node *new_Sub    (ir_node *op1, ir_node *op2, ir_mode *mode);
  *
  * @param   *op    The operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_Minus  (ir_node *op,  ir_mode *mode);
 
@@ -3556,7 +3419,6 @@ ir_node *new_Minus  (ir_node *op,  ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_Mul    (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3567,7 +3429,6 @@ ir_node *new_Mul    (ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_Quot   (ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -3578,7 +3439,6 @@ ir_node *new_Quot   (ir_node *memop, ir_node *op1, ir_node *op2);
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_DivMod (ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -3589,7 +3449,6 @@ ir_node *new_DivMod (ir_node *memop, ir_node *op1, ir_node *op2);
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_Div    (ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -3600,7 +3459,6 @@ ir_node *new_Div    (ir_node *memop, ir_node *op1, ir_node *op2);
  * @param   *memop The store needed to model exceptions
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_Mod    (ir_node *memop, ir_node *op1, ir_node *op2);
 
@@ -3610,7 +3468,6 @@ ir_node *new_Mod    (ir_node *memop, ir_node *op1, ir_node *op2);
  *
  * @param   *op    The operand
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_Abs    (ir_node *op,                ir_mode *mode);
 
@@ -3621,7 +3478,6 @@ ir_node *new_Abs    (ir_node *op,                ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_And    (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3631,7 +3487,6 @@ ir_node *new_And    (ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the result.
- *
  */
 ir_node *new_Or     (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3641,7 +3496,6 @@ ir_node *new_Or     (ir_node *op1, ir_node *op2, ir_mode *mode);
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
  * @param   *mode  The mode of the operands and the results.
- *
  */
 ir_node *new_Eor    (ir_node *op1, ir_node *op2, ir_mode *mode);
 
@@ -3651,7 +3505,6 @@ ir_node *new_Eor    (ir_node *op1, ir_node *op2, ir_mode *mode);
  *
  * @param   *op    The operand.
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_Not    (ir_node *op,                ir_mode *mode);
 
@@ -3662,7 +3515,6 @@ ir_node *new_Not    (ir_node *op,                ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_Shl    (ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3672,7 +3524,6 @@ ir_node *new_Shl    (ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_Shr    (ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3683,7 +3534,6 @@ ir_node *new_Shr    (ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to  shift the operand .
  * @param   *mode  The mode of the operand and the result.
- *
  */
 ir_node *new_Shrs   (ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3694,7 +3544,6 @@ ir_node *new_Shrs   (ir_node *op,  ir_node *k,   ir_mode *mode);
  * @param   *op    The operand.
  * @param   *k     The number of bits to rotate the operand.
  * @param   *mode  The mode of the operand.
- *
  */
 ir_node *new_Rot    (ir_node *op,  ir_node *k,   ir_mode *mode);
 
@@ -3704,7 +3553,6 @@ ir_node *new_Rot    (ir_node *op,  ir_node *k,   ir_mode *mode);
  *
  * @param   *op1   The operand 1.
  * @param   *op2   The operand 2.
- *
  */
 ir_node *new_Cmp    (ir_node *op1, ir_node *op2);
 
@@ -3714,7 +3562,6 @@ ir_node *new_Cmp    (ir_node *op1, ir_node *op2);
  *
  * @param   *op    The operand.
  * @param   *mode  The mode of this the operand muss be converted .
- *
  */
 ir_node *new_Conv   (ir_node *op, ir_mode *mode);
 
@@ -3725,7 +3572,6 @@ ir_node *new_Conv   (ir_node *op, ir_mode *mode);
  *
  * @param   *op    The operand.
  * @param   *to_tp The type of this the operand muss be casted .
- *
  */
 ir_node *new_Cast   (ir_node *op, type *to_tp);
 
@@ -3733,26 +3579,25 @@ ir_node *new_Cast   (ir_node *op, type *to_tp);
  *
  * Adds the node to the block in current_ir_block.
  *
- * @param arity  The number of predecessors
- * @param *in    Array with predecessors
+ * @param arity  The number of predecessors.
+ * @param *in    Array with predecessors.
  * @param *mode  The mode of it's inputs and output.
- *
  */
 ir_node *new_Phi    (int arity, ir_node *in[], ir_mode *mode);
 
 /** Constructor for a Load node.
  *
- * @param *store The current memory
+ * @param *store  The current memory.
  * @param *addr   A pointer to the variable to be read in this memory.
- *
+ * @param *mode   The mode of the value to be loaded.
  */
-ir_node *new_Load   (ir_node *store, ir_node *addr);
+ir_node *new_Load   (ir_node *store, ir_node *addr, ir_mode *mode);
 
 /** Constructor for a Store node.
  *
- * @param *store The current memory
+ * @param *store  The current memory.
  * @param *addr   A pointer to the variable to be read in this memory.
- * @param *val   The value to write to this variable.
+ * @param *val    The value to write to this variable.
  */
 ir_node *new_Store  (ir_node *store, ir_node *addr, ir_node *val);
 
@@ -3765,7 +3610,6 @@ ir_node *new_Store  (ir_node *store, ir_node *addr, ir_node *val);
  * @param *size       The number of bytes to allocate.
  * @param *alloc_type The type of the allocated variable.
  * @param where       Where to allocate the variable, either heap_alloc or stack_alloc.
- *
  */
 ir_node *new_Alloc  (ir_node *store, ir_node *size, type *alloc_type,
                      where_alloc where);
@@ -3781,7 +3625,6 @@ ir_node *new_Alloc  (ir_node *store, ir_node *size, type *alloc_type,
  * @param *ptr        The pointer to the object to free.
  * @param *size       The number of objects of type free_type to free in a sequence.
  * @param *free_type  The type of the freed variable.
- *
  */
 ir_node *new_Free   (ir_node *store, ir_node *ptr, ir_node *size,
 		     type *free_type);
@@ -3796,7 +3639,6 @@ ir_node *new_Free   (ir_node *store, ir_node *ptr, ir_node *size,
  * @param  arity    The number of memories to syncronize.
  * @param  **in     An array of pointers to nodes that produce an output of type
  *                  memory.  The constructor copies this array.
- *
  */
 ir_node *new_Sync   (int arity, ir_node *in[]);
 
@@ -3809,7 +3651,6 @@ ir_node *new_Sync   (int arity, ir_node *in[]);
  * @param arg    A node producing a tuple.
  * @param *mode  The mode of the value to project.
  * @param proj   The position of the value in the tuple.
- *
  */
 ir_node *new_Proj   (ir_node *arg, ir_mode *mode, long proj);
 
@@ -3827,7 +3668,6 @@ ir_node *new_Proj   (ir_node *arg, ir_mode *mode, long proj);
  * @param *arg  The tuple value to project from.
  * @param *mode The mode of the projected value.
  * @param proj  The position in the tuple to project from.
- *
  */
 ir_node *new_Filter (ir_node *arg, ir_mode *mode, long proj);
 
@@ -3838,7 +3678,6 @@ ir_node *new_Filter (ir_node *arg, ir_mode *mode, long proj);
  *
  * @param arg       A node producing a tuple.
  * @param max_ proj The end  position of the value in the tuple.
- *
  */
 ir_node *new_defaultProj (ir_node *arg, long max_proj);
 
@@ -3850,7 +3689,6 @@ ir_node *new_defaultProj (ir_node *arg, long max_proj);
  *
  * @param arity   The number of tuple elements.
  * @param **in    An array containing pointers to the nodes producing the tuple elements.
- *
  */
 ir_node *new_Tuple  (int arity, ir_node *in[]);
 
@@ -3861,7 +3699,6 @@ ir_node *new_Tuple  (int arity, ir_node *in[]);
  *
  * @param *val    The operand to Id.
  * @param *mode   The mode of *val.
- *
  */
 ir_node *new_Id     (ir_node *val, ir_mode *mode);
 
@@ -3869,7 +3706,6 @@ ir_node *new_Id     (ir_node *val, ir_mode *mode);
  *
  * Returns the unique Bad node of the graph.  The same as
  * get_irg_bad().
- *
  */
 
 ir_node *new_Bad    (void);
@@ -3885,7 +3721,6 @@ ir_node *new_Bad    (void);
  * @param *val    The value we express a constraint for
  * @param *bound  The value to compare against. Must be a firm node, typically a constant.
  * @param cmp     The compare operation.
- *
  */
 ir_node *new_Confirm (ir_node *val, ir_node *bound, pn_Cmp cmp);
 
@@ -3895,7 +3730,6 @@ ir_node *new_Confirm (ir_node *val, ir_node *bound, pn_Cmp cmp);
  * the start block.
  *
  * @param *m      The mode of the unknown value.
- *
  */
 ir_node *new_Unknown(ir_mode *m);
 
@@ -3909,7 +3743,6 @@ ir_node *new_Unknown(ir_mode *m);
  * @param **in    An array with the pointers to the parameters.
  *                The constructor copies this array.
  * @param *tp     Type information of the procedure called.
- *
  */
 ir_node *new_FuncCall (ir_node *callee, int arity, ir_node *in[],
 		       type *tp);
@@ -3936,10 +3769,11 @@ ir_node *new_d_immBlock (dbg_info* db);
 ir_node *new_immBlock (void);
 
 /** Add a control flow edge to an immature block. */
-void add_in_edge (ir_node *immblock, ir_node *jmp);
+void add_immBlock_pred (ir_node *immblock, ir_node *jmp);
 
 /** Fix the number of predecessors of an immature block. */
-void mature_block (ir_node *block);
+void mature_immBlock (ir_node *block);
+#define mature_cur_block() mature_immBlock(get_cur_block());
 
 
 /** Get the current value of a local variable.
@@ -3964,7 +3798,7 @@ ir_node *get_value (int pos, ir_mode *mode);
  *
  * @param  pos   The position/id of the local variable.
  * @param *value The new value written to the local variable.
-*/
+ */
 void set_value (int pos, ir_node *value);
 
 /** Get the current memory state.
@@ -3972,7 +3806,6 @@ void set_value (int pos, ir_node *value);
  * Use this function to obtain the last definition of the memory
  * state.  This call automatically inserts Phi nodes for the memory
  * state value.
- *
  */
 ir_node *get_store (void);
 
@@ -3982,7 +3815,7 @@ ir_node *get_store (void);
  * This call is needed to automatically inserts Phi nodes.
  *
  * @param *store The new memory state.
-*/
+ */
 void set_store (ir_node *store);
 
 /** keep this node alive even if End is not control-reachable from it
@@ -4016,11 +3849,5 @@ void finalize_cons (ir_graph *irg);
  */
 typedef ir_node *default_initialize_local_variable_func_t(ir_mode *mode, int pos);
 
-/**
- * Initializes the graph construction.
- *
- * @param func  @see default_initialize_local_variable_func_t
- */
-void init_cons (default_initialize_local_variable_func_t *func);
 
 # endif /* _IRCONS_H_ */