X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.h;h=c665f569f0ede919ea1aeaa936a81907ddb8c906;hb=b78bdd4d94de46de4156272e6dbfe44e97933a5b;hp=38ae196fd05751e36c4f7a49873c6467bc9b6196;hpb=c7f92b19d9eb6777c6d98f35e7e8b0c08faeffc9;p=libfirm diff --git a/ir/ir/ircons.h b/ir/ir/ircons.h index 38ae196fd..c665f569f 100644 --- a/ir/ir/ircons.h +++ b/ir/ir/ircons.h @@ -253,13 +253,11 @@ * ir_node *new_IJmp (ir_node *tgt); * ir_node *new_Cond (ir_node *c); * ir_node *new_Return (ir_node *store, int arity, ir_node **in); - * ir_node *new_Raise (ir_node *store, ir_node *obj); * ir_node *new_Const (ir_mode *mode, tarval *con); * ir_node *new_SymConst (symconst_symbol value, symconst_kind kind); * 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_InstOf (ir_node *store, ir_node obj, type *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); @@ -281,17 +279,22 @@ * 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_Cast (ir_node *op, ir_type *to_tp); + * ir_node *new_Carry (ir_node *op1, ir_node *op2, ir_mode *mode); + * ir_node *new_Borrow (ir_node *op1, ir_node *op2, ir_mode *mode); * 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, + * ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type, * where_alloc where); * ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size, - * type *free_type, where_alloc where); + * ir_type *free_type, where_alloc where); * ir_node *new_Proj (ir_node *arg, ir_mode *mode, long proj); * ir_node *new_NoMem (void); * ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode); - * ir_node *new_CopyB (ir_node *store, ir_node *dst, ir_node *src, type *data_type); + * ir_node *new_Psi (int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode); + * ir_node *new_CopyB (ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); + * ir_node *new_InstOf (ir_node *store, ir_node obj, ir_type *ent); + * ir_node *new_Raise (ir_node *store, ir_node *obj); * ir_node *new_Bound (ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper); * * void add_immBlock_pred (ir_node *block, ir_node *jmp); @@ -494,22 +497,6 @@ * Output * Control flow to the end block. * - * ir_node *new_Raise (ir_node *store, ir_node *obj) - * ------------------------------------------------- - * - * Raises an exception. Unconditional change of control flow. Writes - * an explicit Except variable to memory to pass it to the exception - * handler. See TechReport 1999-14, chapter Exceptions. - * - * Inputs: - * The memory state. - * A pointer to the Except variable. - * Output: - * A tuple of control flow and the changed memory state. The control flow - * points to the exception handler if it is definied in this procedure, - * else it points to the end_block. - * - * * --------- * * ir_node *new_Const (ir_mode *mode, tarval *con) @@ -535,15 +522,18 @@ * --------------------------------------------------------------------------- * * There are three kinds of symbolic constants: - * symconst_type_tag The symbolic constant represents a type tag. - * symconst_size The symbolic constant represents the size of a class. - * symconst_addr_name Information for the linker, e.g. the name of a global - * variable. + * symconst_type_tag The symbolic constant represents a type tag. + * symconst_type_size The symbolic constant represents the size of a type. + * symconst_type_align The symbolic constant represents the alignment of a type. + * symconst_addr_name Information for the linker, e.g. the name of a global + * variable. + * symconst_addr_name The symbolic constant represents the address of an entity. + * * To represent a pointer to an entity that is represented by an entity * datastructure don't use * new_SymConst((type_or_id*)get_entity_ld_ident(ent), symconst_addr_name);. * Use a real const instead: - * new_SymConst(mode_P_mach, tarval_p_from_entity(ent)); + * new_SymConst(ent, symconst_addr_ent); * This makes the Constant independent of name changes of the entity due to * mangling. * @@ -561,9 +551,13 @@ * Attributes: * attr.i.num The symconst_addr_ent, i.e. one of * -symconst_type_tag - * -symconst_size - * - symconst_addr_name - * If the attr.i.num is symconst_type_tag or symconst_size, the node contains an attribute + * -symconst_type_size + * -symconst_type_align + * -symconst_addr_name + * + * If the attr.i.num is symconst_type_tag, symconst_type_size or symconst_type_align, + * the node contains an attribute: + * * attr.i.*type, a pointer to a type_class. The mode of the node is mode_Is. * if it is linkage_ptr_info it contains * attr.i.*ptrinfo, an ident holding information for the linker. The mode @@ -751,6 +745,18 @@ * * Rotates the operand to the (right??) by k bits. * + * ir_node *new_Carry (ir_node *op1, ir_node *op2, ir_mode *mode) + * ------------------------------------------------------------ + * + * Calculates the Carry value for integer addition. Used only + * in lowering code. + * + * ir_node *new_Borrow (ir_node *op1, ir_node *op2, ir_mode *mode) + * ------------------------------------------------------------ + * + * Calculates the Borrow value for integer substraction. Used only + * in lowering code. + * * ir_node *new_Conv (ir_node *op, ir_mode *mode) * --------------------------------------------- * @@ -822,6 +828,13 @@ * ir_true, else ir_false; * * + * ir_node *new_Psi (int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode) + * ----------------------------------------------------------------------------- + * + * Creates a Psi node. This node implements the following semantic: + * Enter it here!!! + * + * * OPERATIONS TO MANAGE MEMORY EXPLICITLY * -------------------------------------- * @@ -853,8 +866,8 @@ * A tuple of the changed memory and a control flow to be taken in * case of an exception. * - * ir_node *new_Alloc (ir_node *store, ir_node *size, type *alloc_type, - * -------------------------------------------------------------------- + * ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type, + * ----------------------------------------------------------------------- * where_alloc where) * ------------------ * @@ -880,8 +893,8 @@ * a.*type A pointer to the class the allocated data object * belongs to. * - * ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size, type *free_type, - * -------------------------------------------------------------------------------- + * ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size, ir_type *free_type, + * ----------------------------------------------------------------------------------- * where_alloc where) * ------------------ * @@ -938,22 +951,10 @@ * This node is used as input for operations that need a Memory, but do not * change it like Div by const != 0, analyzed calls etc. * - * ir_node *new_CopyB (ir_node *store, ir_node *dst, ir_node *src, type *data_type) - * ----------------------------------------------------------------------------------- - * - * Describes a high level block copy of a compound type form address src to - * address dst. Must be lowered to a Call to a runtime memory copy function. - * - * ir_node *new_Bound (ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper); - * ----------------------------------------------------------------------------------- - * - * Describes a high level bounds check. Must be lowered to a Call to a runtime check - * function. - * * ir_node *new_Proj (ir_node *arg, ir_mode *mode, long proj) * ---------------------------------------------------------- * - * Selects one entry of a tuple. This is a hidden `fat edge'. + * Selects one entry of a tuple. This is a hidden edge with attributes. * * Parameters * *arg A node producing a tuple. @@ -972,7 +973,7 @@ * replaced by the Tuple operation so that the following Proj nodes have not to * be changed. (They are hard to find due to the implementation with pointers * in only one direction.) The Tuple node is smaller than any other - * node, so that a node can be changed into a Tuple by just changing it's + * node, so that a node can be changed into a Tuple by just changing it's * opcode and giving it a new in array. * * Parameters @@ -987,6 +988,49 @@ * for optimizations. * * + * HIGH LEVEL OPERATIONS + * --------------------- + * + * ir_node *new_CopyB (ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type) + * ----------------------------------------------------------------------------------- + * + * Describes a high level block copy of a compound type from address src to + * address dst. Must be lowered to a Call to a runtime memory copy function. + * + * + * HIGH LEVEL OPERATIONS: Exception Support + * ---------------------------------------- + * See TechReport 1999-14, chapter Exceptions. + * + * ir_node *new_InstOf(ir_node *store, ir_node *ptr, ir_type *type); + * ----------------------------------------------------------------------------------- + * + * Describes a high level type check. Must be lowered to a Call to a runtime check + * function. + * + * ir_node *new_Raise (ir_node *store, ir_node *obj) + * ------------------------------------------------- + * + * Raises an exception. Unconditional change of control flow. Writes + * an explicit Except variable to memory to pass it to the exception + * handler. Must be lowered to a Call to a runtime check + * function. + * + * Inputs: + * The memory state. + * A pointer to the Except variable. + * Output: + * A tuple of control flow and the changed memory state. The control flow + * points to the exception handler if it is definied in this procedure, + * else it points to the end_block. + * + * ir_node *new_Bound (ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper); + * ----------------------------------------------------------------------------------- + * + * Describes a high level bounds check. Must be lowered to a Call to a runtime check + * function. + * + * * COPING WITH DATA OBJECTS * ======================== * @@ -1050,19 +1094,13 @@ * node. * */ +#ifndef _FIRM_IR_IRCONS_H_ +#define _FIRM_IR_IRCONS_H_ - -# ifndef _IRCONS_H_ -# define _IRCONS_H_ - -# include "firm_common.h" -# include "irgraph.h" -# include "irnode.h" -# include "irmode.h" -# include "entity.h" -# include "tv.h" -# include "type.h" -# include "dbginfo.h" +#include "firm_common.h" +#include "irnode.h" +#include "irgraph.h" +#include "dbginfo.h" /*-------------------------------------------------------------------------*/ /* The raw interface */ @@ -1166,17 +1204,6 @@ ir_node *new_rd_Cond (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *c) ir_node *new_rd_Return (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, int arity, ir_node *in[]); -/** Constructor for a Raise node. - * - * @param *db A pointer for debug information. - * @param *irg The ir graph the node belongs to. - * @param *block The ir block the node belongs to. - * @param *store The current memory. - * @param *obj A pointer to the Except variable. - */ -ir_node *new_rd_Raise (dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *store, ir_node *obj); - /** Constructor for a Const_type node. * * The constant represents a target value. This constructor sets high @@ -1189,8 +1216,8 @@ ir_node *new_rd_Raise (dbg_info *db, ir_graph *irg, ir_node *block, * @param *con Points to an entry in the constant table. * @param *tp The type of the constant. */ -ir_node *new_rd_Const_type (dbg_info* db, ir_graph *irg, ir_node *block, - ir_mode *mode, tarval *con, type *tp); +ir_node *new_rd_Const_type (dbg_info *db, ir_graph *irg, ir_node *block, + ir_mode *mode, tarval *con, ir_type *tp); /** Constructor for a Const node. * @@ -1211,17 +1238,20 @@ ir_node *new_rd_Const (dbg_info *db, ir_graph *irg, ir_node *block, * * This is the constructor for a symbolic constant. * There are four kinds of symbolic constants: - * - type_tag The symbolic constant represents a type tag. The type the - * tag stands for is given explicitly. - * - size The symbolic constant represents the size of a type. The - * type of which the constant represents the size is given - * explicitly. - * - addr_name The symbolic constant represents the address of an entity - * (variable or method). The variable is indicated by a name - * that is valid for linking. + * - type_tag The symbolic constant represents a type tag. The type the + * tag stands for is given explicitly. + * - type_size The symbolic constant represents the size of a type. The + * type of which the constant represents the size is given + * explicitly. + * - type_align The symbolic constant represents the alignment of a type. The + * type of which the constant represents the size is given + * explicitly. + * - addr_name The symbolic constant represents the address of an entity + * (variable or method). The variable is indicated by a name + * that is valid for linking. * - addr_ent The symbolic constant represents the address of an entity - * (variable or method). The variable is given explicitly by - * a firm entity. + * (variable or method). The variable is given explicitly by + * a firm entity. * * Inputs to the node: * No inputs except the block it belongs to. @@ -1238,8 +1268,8 @@ ir_node *new_rd_Const (dbg_info *db, ir_graph *irg, ir_node *block, * @param value A type, entity or a ident depending on the SymConst kind. * @param tp The source type of the constant. */ -ir_node *new_rd_SymConst_type (dbg_info* db, ir_graph *irg, ir_node *block, union symconst_symbol value, - symconst_kind symkind, type *tp); +ir_node *new_rd_SymConst_type (dbg_info *db, ir_graph *irg, ir_node *block, union symconst_symbol value, + symconst_kind symkind, ir_type *tp); /** Constructor for a SymConst node. * @@ -1252,28 +1282,35 @@ ir_node *new_rd_SymConst (dbg_info *db, ir_graph *irg, ir_node *block, * Same as new_rd_SymConst_type, except that the constructor is tailored for * symconst_addr_ent. * Adds the SymConst to the start block of irg. */ -ir_node *new_rd_SymConst_addr_ent (dbg_info *db, ir_graph *irg, entity *symbol, type *tp); +ir_node *new_rd_SymConst_addr_ent (dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp); /** Constructor for a SymConst addr_name node. * * Same as new_rd_SymConst_type, except that the constructor is tailored for * symconst_addr_ent. * Adds the SymConst to the start block of irg. */ -ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, type *tp); +ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, ir_type *tp); /** Constructor for a SymConst type_tag node. * * Same as new_rd_SymConst_type, except that the constructor is tailored for * symconst_addr_ent. * Adds the SymConst to the start block of irg. */ -ir_node *new_rd_SymConst_type_tag (dbg_info *db, ir_graph *irg, type *symbol, type *tp); +ir_node *new_rd_SymConst_type_tag (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp); /** Constructor for a SymConst size node. * * Same as new_rd_SymConst_type, except that the constructor is tailored for - * symconst_addr_ent. + * symconst_type_size. + * Adds the SymConst to the start block of irg. */ +ir_node *new_rd_SymConst_size (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp); + +/** Constructor for a SymConst size node. + * + * Same as new_rd_SymConst_type, except that the constructor is tailored for + * symconst_type_align. * Adds the SymConst to the start block of irg. */ -ir_node *new_rd_SymConst_size (dbg_info *db, ir_graph *irg, type *symbol, type *tp); +ir_node *new_rd_SymConst_align (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp); /** Constructor for a simpleSel node. * @@ -1316,20 +1353,6 @@ ir_node *new_rd_simpleSel (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *new_rd_Sel (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, ir_node *objptr, int n_index, ir_node *index[], entity *ent); -/** Constructor for a InstOf node. - * - * For translating Java. Not supported as standard firm node. - * - * @param *db A pointer for debug information. - * @param *irg The ir graph the node belongs to. - * @param *block The ir block the node belongs to. - * @param *store - * @param *objptr - * @param *ent - */ -ir_node *new_rd_InstOf (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - ir_node *objptr, type *ent); - /** Constructor for a Call node. * * Represents all kinds of method and function calls. @@ -1344,7 +1367,7 @@ ir_node *new_rd_InstOf (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *st * @param *tp Type information of the procedure called. */ ir_node *new_rd_Call (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - ir_node *callee, int arity, ir_node *in[], type *tp); + ir_node *callee, int arity, ir_node *in[], ir_type *tp); /** Constructor for a Add node. * @@ -1580,8 +1603,32 @@ ir_node *new_rd_Conv (dbg_info *db, ir_graph *irg, ir_node *block, * @param *op The operand. * @param *to_tp The type of this the operand muss be casted . */ -ir_node *new_rd_Cast (dbg_info* db, ir_graph *irg, ir_node *block, - ir_node *op, type *to_tp); +ir_node *new_rd_Cast (dbg_info *db, ir_graph *irg, ir_node *block, + ir_node *op, ir_type *to_tp); + +/** Constructor for a Carry node. + * + * @param *db A pointer for debug information. + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_rd_Carry (dbg_info *db, ir_graph *irg, ir_node *block, + ir_node *op1, ir_node *op2, ir_mode *mode); + +/** Constructor for a Borrow node. + * + * @param *db A pointer for debug information. + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_rd_Borrow (dbg_info *db, ir_graph *irg, ir_node *block, + ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Phi node. * @@ -1632,7 +1679,7 @@ ir_node *new_rd_Store (dbg_info *db, ir_graph *irg, ir_node *block, * @param where Where to allocate the variable, either heap_alloc or stack_alloc. */ ir_node *new_rd_Alloc (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - ir_node *size, type *alloc_type, where_alloc where); + ir_node *size, ir_type *alloc_type, where_alloc where); /** Constructor for a Free node. * @@ -1649,7 +1696,7 @@ ir_node *new_rd_Alloc (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *st * @param where Where the variable was allocated, either heap_alloc or stack_alloc. */ ir_node *new_rd_Free (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - ir_node *ptr, ir_node *size, type *free_type, where_alloc where); + ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where); /** Constructor for a Sync node. * @@ -1835,6 +1882,19 @@ ir_node *new_rd_NoMem (ir_graph *irg); ir_node *new_rd_Mux (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode); +/** Constructor for a Psi node. + * + * @param *db A pointer for debug information. + * @param *irg The ir graph the node belong to. + * @param *block The block the node belong to. + * @param *arity The arity of the conditions + * @param *conds The array of mode_b conditions, length must be equal arity + * @param *vals The array of mode values, length must be equal arity + 1 + * @param *mode The mode of the node (must be the mode of all vals). + */ +ir_node *new_rd_Psi (dbg_info *db, ir_graph *irg, ir_node *block, + int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode); + /** Constructor for a CopyB node. * * @param *db A pointer for debug information. @@ -1846,10 +1906,39 @@ ir_node *new_rd_Mux (dbg_info *db, ir_graph *irg, ir_node *block, * @param *data_type The type of the copied data */ ir_node *new_rd_CopyB(dbg_info *db, ir_graph *irg, ir_node *block, - ir_node *store, ir_node *dst, ir_node *src, type *data_type); + ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); + +/** Constructor for a InstOf node. + * + * A High-Level Type check. + * + * @param *db A pointer for debug information. + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *store The memory in which the object the entity should be selected + * from is allocated. + * @param *objptr A pointer to a object of a class type. + * @param *type The type of which objptr must be. + */ +ir_node *new_rd_InstOf (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, + ir_node *objptr, ir_type *type); + +/** Constructor for a Raise node. + * + * A High-Level Exception throw. + * + * @param *db A pointer for debug information. + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *store The current memory. + * @param *obj A pointer to the Except variable. + */ +ir_node *new_rd_Raise (dbg_info *db, ir_graph *irg, ir_node *block, + ir_node *store, ir_node *obj); /** Constructor for a Bound node. - * Checks whether lower <= idx && idx < upper. + * + * A High-Level bounds check. Checks whether lower <= idx && idx < upper. * * @param *db A pointer for debug information. * @param *irg The ir graph the node belong to. @@ -1945,16 +2034,6 @@ ir_node *new_r_Cond (ir_graph *irg, ir_node *block, ir_node *c); ir_node *new_r_Return (ir_graph *irg, ir_node *block, ir_node *store, int arity, ir_node *in[]); -/** Constructor for a Raise node. - * - * @param *irg The ir graph the node belongs to. - * @param *block The ir block the node belongs to. - * @param *store The current memory. - * @param *obj A pointer to the Except variable. - */ -ir_node *new_r_Raise (ir_graph *irg, ir_node *block, - ir_node *store, ir_node *obj); - /** Constructor for a Const node. * * Constructor for a Const node. The constant represents a target @@ -1995,7 +2074,7 @@ ir_node *new_r_Const_long(ir_graph *irg, ir_node *block, * @param *tp The type of the constant. */ ir_node *new_r_Const_type(ir_graph *irg, ir_node *block, - ir_mode *mode, tarval *con, type *tp); + ir_mode *mode, tarval *con, ir_type *tp); /** Constructor for a SymConst node. * @@ -2026,6 +2105,23 @@ ir_node *new_r_Const_type(ir_graph *irg, ir_node *block, ir_node *new_r_SymConst (ir_graph *irg, ir_node *block, union symconst_symbol value, symconst_kind symkind); +/** Constructor for a simpleSel node. + * + * This is a shortcut for the new_d_Sel() constructor. To be used for + * Sel nodes that do not select from an array, i.e., have no index + * inputs. It adds the two parameters 0, NULL. + * + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @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_r_simpleSel(ir_graph *irg, ir_node *block, ir_node *store, + ir_node *objptr, entity *ent); + /** Constructor for a Sel node. * * The select node selects an entity (field or method) from an entity @@ -2049,18 +2145,6 @@ ir_node *new_r_Sel (ir_graph *irg, ir_node *block, ir_node *store, ir_node *objptr, int n_index, ir_node *index[], entity *ent); -/** Constructor for a InstOf node. - * - * For translating Java. Not supported as standard firm node. - * - * @param *irg The ir graph the node belongs to. - * @param *block The ir block the node belongs to. - * @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); - /** Constructor for a Call node. * * Represents all kinds of method and function calls. @@ -2075,7 +2159,7 @@ ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *x, ir_node *y, ty */ ir_node *new_r_Call (ir_graph *irg, ir_node *block, ir_node *store, ir_node *callee, int arity, ir_node *in[], - type *tp); + ir_type *tp); /** Constructor for a Add node. * @@ -2292,7 +2376,30 @@ ir_node *new_r_Conv (ir_graph *irg, ir_node *block, * @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); + ir_node *op, ir_type *to_tp); + +/** Constructor for a Carry node. + * + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_r_Carry (ir_graph *irg, ir_node *block, + ir_node *op1, ir_node *op2, ir_mode *mode); + +/** + * Constructor for a Borrow node. + * + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the results. + */ +ir_node *new_r_Borrow (ir_graph *irg, ir_node *block, + ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Phi node. * @@ -2339,7 +2446,7 @@ ir_node *new_r_Store (ir_graph *irg, ir_node *block, * @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); + ir_node *size, ir_type *alloc_type, where_alloc where); /** Constructor for a Free node. * @@ -2355,9 +2462,9 @@ ir_node *new_r_Alloc (ir_graph *irg, ir_node *block, ir_node *store, * @param where Where the variable was allocated, either heap_alloc or stack_alloc. */ ir_node *new_r_Free (ir_graph *irg, ir_node *block, ir_node *store, - ir_node *ptr, ir_node *size, type *free_type, where_alloc where); + ir_node *ptr, ir_node *size, ir_type *free_type, where_alloc where); -/** Constructor for a Sync node. +/** Constructor for a Sync node. * * Merges several memory values. The node assumes that a variable * either occurs only in one of the memories, or it contains the same @@ -2369,7 +2476,7 @@ ir_node *new_r_Free (ir_graph *irg, ir_node *block, ir_node *store, * @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[]); +ir_node *new_r_Sync (ir_graph *irg, ir_node *block, int arity, ir_node *in[]); /** Constructor for a Proj node. * @@ -2431,7 +2538,6 @@ ir_node *new_r_Id (ir_graph *irg, ir_node *block, * @param *irg The ir graph the node belongs to. * */ - ir_node *new_r_Bad (ir_graph *irg); /** Constructor for a Confirm node. @@ -2446,7 +2552,6 @@ ir_node *new_r_Bad (ir_graph *irg); * @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_r_Confirm (ir_graph *irg, ir_node *block, ir_node *val, ir_node *bound, pn_Cmp cmp); @@ -2545,6 +2650,18 @@ ir_node *new_r_NoMem (ir_graph *irg); ir_node *new_r_Mux (ir_graph *irg, ir_node *block, ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode); +/** Constructor for a Psi node. + * + * @param *irg The ir graph the node belong to. + * @param *block The block the node belong to. + * @param *arity The arity of the conditions + * @param *conds The array of mode_b conditions, length must be equal arity + * @param *vals The array of mode values, length must be equal arity + 1 + * @param *mode The mode of the node (must be the mode of all vals). + */ +ir_node *new_r_Psi (ir_graph *irg, ir_node *block, + int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode); + /** Constructor for a CopyB node. * * @param *irg The ir graph the node belong to. @@ -2555,10 +2672,37 @@ ir_node *new_r_Mux (ir_graph *irg, ir_node *block, * @param *data_type The type of the copied data */ ir_node *new_r_CopyB(ir_graph *irg, ir_node *block, - ir_node *store, ir_node *dst, ir_node *src, type *data_type); + ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); + +/** Constructor for a InstOf node. + * + * A High-Level Type check. + * + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *store The memory in which the object the entity should be selected + * from is allocated. + * @param *objptr A pointer to a object of a class type. + * @param *type The type of which objptr must be. + */ +ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *store, + ir_node *objptr, ir_type *type); + +/** Constructor for a Raise node. + * + * A High-Level Exception throw. + * + * @param *irg The ir graph the node belongs to. + * @param *block The ir block the node belongs to. + * @param *store The current memory. + * @param *obj A pointer to the Except variable. + */ +ir_node *new_r_Raise (ir_graph *irg, ir_node *block, + ir_node *store, ir_node *obj); /** Constructor for a Bound node. - * Checks whether lower <= idx && idx < upper. + * + * A High-Level bounds check. Checks whether lower <= idx && idx < upper. * * @param *irg The ir graph the node belong to. * @param *block The block the node belong to. @@ -2601,7 +2745,7 @@ ir_node *get_cur_block(void); * @param in[] An array of control predecessors. The length of * the array must be 'arity'. */ -ir_node *new_d_Block(dbg_info* db, int arity, ir_node *in[]); +ir_node *new_d_Block(dbg_info *db, int arity, ir_node *in[]); /** Constructor for a Start node. * @@ -2609,7 +2753,7 @@ ir_node *new_d_Block(dbg_info* db, int arity, ir_node *in[]); * * @param *db A pointer for debug information. */ -ir_node *new_d_Start (dbg_info* db); +ir_node *new_d_Start (dbg_info *db); /** Constructor for a End node. * @@ -2617,7 +2761,7 @@ ir_node *new_d_Start (dbg_info* db); * * @param *db A pointer for debug information. */ -ir_node *new_d_End (dbg_info* db); +ir_node *new_d_End (dbg_info *db); /** Constructor for a Jmp node. * @@ -2627,7 +2771,7 @@ ir_node *new_d_End (dbg_info* db); * * @param *db A pointer for debug information. */ -ir_node *new_d_Jmp (dbg_info* db); +ir_node *new_d_Jmp (dbg_info *db); /** Constructor for an IJmp node. * @@ -2653,8 +2797,7 @@ ir_node *new_d_IJmp (dbg_info *db, ir_node *tgt); * @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); +ir_node *new_d_Cond (dbg_info *db, ir_node *c); /** Constructor for a Return node. * @@ -2668,19 +2811,7 @@ ir_node *new_d_Cond (dbg_info* db, ir_node *c); * @param arity Number of array indices. * @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[]); - -/** Constructor for a Raise node. - * - * Adds the node to the block in current_ir_block. - * - * @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); +ir_node *new_d_Return (dbg_info *db, ir_node *store, int arity, ir_node *in[]); /** Constructor for a Const_type node. * @@ -2695,7 +2826,7 @@ ir_node *new_d_Raise (dbg_info* db, ir_node *store, ir_node *obj); added to the attributes of the node. * @param *tp The type of the constant. */ -ir_node *new_d_Const_type (dbg_info* db, ir_mode *mode, tarval *con, type *tp); +ir_node *new_d_Const_type (dbg_info *db, ir_mode *mode, tarval *con, ir_type *tp); /** Constructor for a Const node. * @@ -2710,7 +2841,7 @@ ir_node *new_d_Const_type (dbg_info* db, ir_mode *mode, tarval *con, type *tp); * @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); +ir_node *new_d_Const (dbg_info *db, ir_mode *mode, tarval *con); /** Constructor for a SymConst_type node. * @@ -2736,16 +2867,16 @@ ir_node *new_d_Const (dbg_info* db, ir_mode *mode, tarval *con); * * @param *db A pointer for debug information. * @param value A type, entity or ident depending on the SymConst kind. - * @param kind The kind of the symbolic constant: symconst_type_tag, symconst_size - * or symconst_addr_name. + * @param kind The kind of the symbolic constant: symconst_type_tag, symconst_type_size, + * symconst_type_align, symconst_addr_name or symconst_addr_ent. * @param tp The source type of the constant. */ -ir_node *new_d_SymConst_type (dbg_info* db, union symconst_symbol value, symconst_kind kind, type* tp); +ir_node *new_d_SymConst_type (dbg_info *db, union symconst_symbol value, symconst_kind kind, ir_type *tp); /** Constructor for a SymConst node. * * Same as new_d_SymConst_type, except that it sets the type to type_unknown. */ -ir_node *new_d_SymConst (dbg_info* db, union symconst_symbol value, symconst_kind kind); +ir_node *new_d_SymConst (dbg_info *db, union symconst_symbol value, symconst_kind kind); /** Constructor for a simpleSel node. * @@ -2760,7 +2891,7 @@ ir_node *new_d_SymConst (dbg_info* db, union symconst_symbol value, symconst_kin * 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); +ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, entity *ent); /** Constructor for a Sel node. * @@ -2781,22 +2912,9 @@ ir_node *new_d_simpleSel(dbg_info* db, ir_node *store, ir_node *objptr, entity * * element entity. The constructor copies this array. * @param *ent The entity to select. */ -ir_node *new_d_Sel (dbg_info* db, ir_node *store, ir_node *objptr, int arity, ir_node *in[], +ir_node *new_d_Sel (dbg_info *db, ir_node *store, ir_node *objptr, int arity, ir_node *in[], entity *ent); -/** Constructor for a InstOf node. - * - * Adds the node to the block in current_ir_block. - * - * For translating Java. Not supported as standard firm node. - * - * @param *db A pointer for debug information. - * @param *store - * @param *objptr - * @param *ent - */ -ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent); - /** Constructor for a Call node. * * Represents all kinds of method and function calls. @@ -2809,9 +2927,8 @@ ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent) * @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[], - type *tp); +ir_node *new_d_Call (dbg_info *db, ir_node *store, ir_node *callee, int arity, ir_node *in[], + ir_type *tp); /** Constructor for a Add node. * @@ -2822,7 +2939,7 @@ ir_node *new_d_Call (dbg_info* db, ir_node *store, ir_node *callee, int arity, * @param *op2 The second operand. * @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); +ir_node *new_d_Add (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Sub node. * @@ -2833,8 +2950,7 @@ ir_node *new_d_Add (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode); * @param *op2 The second operand. * @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); +ir_node *new_d_Sub (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Minus node. * @@ -2844,7 +2960,7 @@ ir_node *new_d_Sub (dbg_info* db, 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_d_Minus (dbg_info* db, ir_node *op, ir_mode *mode); +ir_node *new_d_Minus (dbg_info *db, ir_node *op, ir_mode *mode); /** Constructor for a Mul node. * @@ -2855,7 +2971,7 @@ ir_node *new_d_Minus (dbg_info* db, ir_node *op, ir_mode *mode); * @param *op2 The second operand. * @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); +ir_node *new_d_Mul (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Quot node. * @@ -2866,7 +2982,7 @@ ir_node *new_d_Mul (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode); * @param *op1 The first operand. * @param *op2 The second operand. */ -ir_node *new_d_Quot (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2); +ir_node *new_d_Quot (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2); /** Constructor for a DivMod node. * @@ -2877,7 +2993,7 @@ ir_node *new_d_Quot (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2) * @param *op1 The first operand. * @param *op2 The second operand. */ -ir_node *new_d_DivMod (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2); +ir_node *new_d_DivMod (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2); /** Constructor for a Div node. * @@ -2888,7 +3004,7 @@ ir_node *new_d_DivMod (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2) * @param *op1 The first operand. * @param *op2 The second operand. */ -ir_node *new_d_Div (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2); +ir_node *new_d_Div (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2); /** Constructor for a Mod node. * @@ -2899,7 +3015,7 @@ ir_node *new_d_Div (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2) * @param *op1 The first operand. * @param *op2 The second operand. */ -ir_node *new_d_Mod (dbg_info* db, ir_node *memop, ir_node *op1, ir_node *op2); +ir_node *new_d_Mod (dbg_info *db, ir_node *memop, ir_node *op1, ir_node *op2); /** Constructor for a Abs node. * @@ -2909,7 +3025,7 @@ ir_node *new_d_Mod (dbg_info* db, 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_d_Abs (dbg_info* db, ir_node *op, ir_mode *mode); +ir_node *new_d_Abs (dbg_info *db, ir_node *op, ir_mode *mode); /** Constructor for a And node. * @@ -2920,7 +3036,7 @@ ir_node *new_d_Abs (dbg_info* db, ir_node *op, ir_mode *mode); * @param *op2 The second operand. * @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); +ir_node *new_d_And (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Or node. * @@ -2931,7 +3047,7 @@ ir_node *new_d_And (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode); * @param *op2 The second operand. * @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); +ir_node *new_d_Or (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Eor node. * @@ -2942,7 +3058,7 @@ ir_node *new_d_Or (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode); * @param *op2 The second operand. * @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); +ir_node *new_d_Eor (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Not node. * @@ -2952,7 +3068,7 @@ ir_node *new_d_Eor (dbg_info* db, 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_d_Not (dbg_info* db, ir_node *op, ir_mode *mode); +ir_node *new_d_Not (dbg_info *db, ir_node *op, ir_mode *mode); /** Constructor for a Shl node. * @@ -2963,7 +3079,7 @@ ir_node *new_d_Not (dbg_info* db, ir_node *op, ir_mode *mode); * @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); +ir_node *new_d_Shl (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode); /** Constructor for a Shr node. * @@ -2974,7 +3090,7 @@ ir_node *new_d_Shl (dbg_info* db, ir_node *op, ir_node *k, ir_mode *mode); * @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); +ir_node *new_d_Shr (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode); /** Constructor for a Shrs node. * @@ -2985,7 +3101,7 @@ ir_node *new_d_Shr (dbg_info* db, ir_node *op, ir_node *k, ir_mode *mode); * @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); +ir_node *new_d_Shrs (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode); /** Constructor for a Rot node. * @@ -2996,7 +3112,7 @@ ir_node *new_d_Shrs (dbg_info* db, ir_node *op, ir_node *k, ir_mode *mode); * @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); +ir_node *new_d_Rot (dbg_info *db, ir_node *op, ir_node *k, ir_mode *mode); /** Constructor for a Cmp node. * @@ -3006,7 +3122,7 @@ ir_node *new_d_Rot (dbg_info* db, ir_node *op, ir_node *k, ir_mode *mode); * @param *op1 The first operand. * @param *op2 The second operand. */ -ir_node *new_d_Cmp (dbg_info* db, ir_node *op1, ir_node *op2); +ir_node *new_d_Cmp (dbg_info *db, ir_node *op1, ir_node *op2); /** Constructor for a Conv node. * @@ -3016,9 +3132,9 @@ ir_node *new_d_Cmp (dbg_info* db, ir_node *op1, ir_node *op2); * @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); +ir_node *new_d_Conv (dbg_info *db, ir_node *op, ir_mode *mode); -/**Constructor for a Cast node. +/** Constructor for a Cast node. * * High level type cast * Adds the node to the block in current_ir_block. @@ -3027,9 +3143,31 @@ ir_node *new_d_Conv (dbg_info* db, 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_d_Cast (dbg_info* db, ir_node *op, type *to_tp); +ir_node *new_d_Cast (dbg_info *db, ir_node *op, ir_type *to_tp); + +/** Constructor for a Carry node. + * + * Adds the node to the block in current_ir_block. + * + * @param *db A pointer for debug information. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_d_Carry (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); -/**Constructor for a Phi node. +/** Constructor for a Borrow node. + * + * Adds the node to the block in current_ir_block. + * + * @param *db A pointer for debug information. + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_d_Borrow (dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode); + +/** Constructor for a Phi node. * * Adds the node to the block in current_ir_block. * @@ -3038,7 +3176,7 @@ ir_node *new_d_Cast (dbg_info* db, ir_node *op, type *to_tp); * @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); +ir_node *new_d_Phi (dbg_info *db, int arity, ir_node *in[], ir_mode *mode); /** Constructor for a Load node. * @@ -3049,7 +3187,7 @@ ir_node *new_d_Phi (dbg_info* db, int arity, ir_node *in[], ir_mode *mode); * @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_d_Load (dbg_info* db, ir_node *store, ir_node *addr, ir_mode *mode); +ir_node *new_d_Load (dbg_info *db, ir_node *store, ir_node *addr, ir_mode *mode); /** Constructor for a Store node. * @@ -3060,7 +3198,7 @@ ir_node *new_d_Load (dbg_info* db, ir_node *store, ir_node *addr, ir_mode *mod * @param *addr A pointer to the variable to be read in this memory. * @param *val The value to write to this variable. */ -ir_node *new_d_Store (dbg_info* db, ir_node *store, ir_node *addr, ir_node *val); +ir_node *new_d_Store (dbg_info *db, ir_node *store, ir_node *addr, ir_node *val); /** Constructor for a Alloc node. * @@ -3073,7 +3211,7 @@ ir_node *new_d_Store (dbg_info* db, ir_node *store, ir_node *addr, ir_node *val * @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, +ir_node *new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, ir_type *alloc_type, where_alloc where); /** Constructor for a Free node. @@ -3089,8 +3227,8 @@ ir_node *new_d_Alloc (dbg_info* db, ir_node *store, ir_node *size, type *alloc_ * @param *free_type The type of the freed variable. * @param where Where the variable was allocated, either heap_alloc or stack_alloc. */ -ir_node *new_d_Free (dbg_info* db, ir_node *store, ir_node *ptr, ir_node *size, - type *free_type, where_alloc where); +ir_node *new_d_Free (dbg_info *db, ir_node *store, ir_node *ptr, ir_node *size, + ir_type *free_type, where_alloc where); /** Constructor for a Sync node. * @@ -3104,8 +3242,7 @@ ir_node *new_d_Free (dbg_info* db, ir_node *store, ir_node *ptr, ir_node *size * @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[]); - +ir_node *new_d_Sync (dbg_info *db, int arity, ir_node *in[]); /** Constructor for a Proj node. * @@ -3118,8 +3255,7 @@ ir_node *new_d_Sync (dbg_info* db, int arity, ir_node *in[]); * @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); - +ir_node *new_d_Proj (dbg_info *db, ir_node *arg, ir_mode *mode, long proj); /** Constructor for a defaultProj node. * @@ -3130,7 +3266,7 @@ ir_node *new_d_Proj (dbg_info* db, 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_d_defaultProj (dbg_info* db, ir_node *arg, long max_proj); +ir_node *new_d_defaultProj (dbg_info *db, ir_node *arg, long max_proj); /** Constructor for a Tuple node. * @@ -3142,8 +3278,7 @@ ir_node *new_d_defaultProj (dbg_info* db, 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_d_Tuple (dbg_info* db, int arity, ir_node *in[]); - +ir_node *new_d_Tuple (dbg_info *db, int arity, ir_node *in[]); /** Constructor for a Id node. * @@ -3154,7 +3289,7 @@ ir_node *new_d_Tuple (dbg_info* db, int arity, ir_node *in[]); * @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); +ir_node *new_d_Id (dbg_info *db, ir_node *val, ir_mode *mode); /** Constructor for a Bad node. * @@ -3176,8 +3311,7 @@ ir_node *new_d_Bad (void); * @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); - +ir_node *new_d_Confirm (dbg_info *db, ir_node *val, ir_node *bound, pn_Cmp cmp); /** Constructor for an Unknown node. * @@ -3269,6 +3403,17 @@ ir_node *new_d_NoMem (void); ir_node *new_d_Mux (dbg_info *db, ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode); +/** Constructor for a Psi node. + * + * @param *db A pointer for debug information. + * @param *arity The arity of the conditions + * @param *conds The array of mode_b conditions, length must be equal arity + * @param *vals The array of mode values, length must be equal arity + 1 + * @param *mode The mode of the node (must be the mode of all vals). + */ +ir_node *new_d_Psi (dbg_info *db, + int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode); + /** Constructor for a CopyB node. * * @param *db A pointer for debug information. @@ -3277,10 +3422,33 @@ ir_node *new_d_Mux (dbg_info *db, ir_node *sel, * @param *src The ir_node that represents the source address. * @param *data_type The type of the copied data */ -ir_node *new_d_CopyB(dbg_info *db, ir_node *store, ir_node *dst, ir_node *src, type *data_type); +ir_node *new_d_CopyB(dbg_info *db, ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); + +/** Constructor for a InstOf node. + * + * A High-Level Type check. + * + * @param *db A pointer for debug information. + * @param *store The memory in which the object the entity should be selected + * from is allocated. + * @param *objptr A pointer to a object of a class type. + * @param *type The type of which objptr must be. + */ +ir_node *new_d_InstOf (dbg_info *db, ir_node *store, ir_node *objptr, ir_type *type); + +/** Constructor for a Raise node. + * + * A High-Level Exception throw. + * + * @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); /** Constructor for a Bound node. - * Checks whether lower <= idx && idx < upper. + * + * A High-Level bounds check. Checks whether lower <= idx && idx < upper. * * @param *db A pointer for debug information. * @param *store The current memory @@ -3388,15 +3556,6 @@ ir_node *new_Cond (ir_node *c); */ ir_node *new_Return (ir_node *store, int arity, ir_node *in[]); -/**Constructor for a Raise node. - * - * Adds the node to the block in current_ir_block. - * - * @param *store The current memory. - * @param *obj A pointer to the Except variable. - */ -ir_node *new_Raise (ir_node *store, ir_node *obj); - /** Constructor for a Const node. * * Constructor for a Const node. The constant represents a target @@ -3426,7 +3585,7 @@ ir_node *new_Const_long(ir_mode *mode, long value); /** Constructor for a Const node. * * Derives mode from passed type. */ -ir_node *new_Const_type(tarval *con, type *tp); +ir_node *new_Const_type(tarval *con, ir_type *tp); /** Constructor for a SymConst node. * @@ -3438,6 +3597,9 @@ ir_node *new_Const_type(tarval *con, type *tp); * -# size The symbolic constant represents the size of a type. The * type of which the constant represents the size is given * explicitly. + * -# align The symbolic constant represents the alignment of a type. The + * type of which the constant represents the size is given + * explicitly. * -# addr_name The symbolic constant represents the address of an entity * (variable or method). The variable is indicated by a name * that is valid for linking. @@ -3451,7 +3613,8 @@ ir_node *new_Const_type(tarval *con, type *tp); * An unsigned integer (I_u) or a pointer (P). * * @param value A type or a ident depending on the SymConst kind. - * @param kind The kind of the symbolic constant: symconst_type_tag, symconst_size or symconst_addr_name. + * @param kind The kind of the symbolic constant: symconst_type_tag, symconst_type_size + * symconst_type_align, symconst_addr_name or symconst_addr_ent. */ ir_node *new_SymConst (union symconst_symbol value, symconst_kind kind); @@ -3488,17 +3651,6 @@ 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); -/** Constructor for an InstOf node. - * - * Adds the node to the block in current_ir_block. - * For translating Java. Not supported as standard firm node. - * - * @param *store The actual store. - * @param *obj - * @param *ent - */ -ir_node *new_InstOf (ir_node *store, ir_node *obj, type *ent); - /** Constructor for a Call node. * * Adds the node to the block in current_ir_block. @@ -3511,22 +3663,22 @@ ir_node *new_InstOf (ir_node *store, ir_node *obj, type *ent); * @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); + ir_type *tp); /** Constructor for a CallBegin node. * - * Adds the node to the block in current_ir_block. + * CallBegin represents control flow depending of the pointer value + * representing the called method to the called methods. The + * constructor copies the method pointer input from the passed Call + * node. 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); -/**Constructor for a Add node. +/** Constructor for a Add node. * - * CallBegin represents control flow depending of the pointer value - * representing the called method to the called methods. The - * constructor copies the method pointer input from the passed Call - * node.Adds the node to the block in current_ir_block. + * Adds the node to the block in current_ir_block. * * @param *op1 The first operand. * @param *op2 The second operand. @@ -3705,7 +3857,7 @@ ir_node *new_Cmp (ir_node *op1, ir_node *op2); */ ir_node *new_Conv (ir_node *op, ir_mode *mode); -/**Constructor for a Cast node. +/** Constructor for a Cast node. * * Adds the node to the block in current_ir_block. * High level type cast @@ -3713,7 +3865,27 @@ 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); +ir_node *new_Cast (ir_node *op, ir_type *to_tp); + +/** Constructor for a Carry node. + * + * Adds the node to the block in current_ir_block. + * + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_Carry (ir_node *op1, ir_node *op2, ir_mode *mode); + +/** Constructor for a Borrow node. + * + * Adds the node to the block in current_ir_block. + * + * @param *op1 The first operand. + * @param *op2 The second operand. + * @param *mode The mode of the operands and the result. + */ +ir_node *new_Borrow (ir_node *op1, ir_node *op2, ir_mode *mode); /** Constructor for a Phi node. * @@ -3741,7 +3913,7 @@ 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); -/**Constructor for a Alloc node. +/** Constructor for a Alloc node. * * The Alloc node extends the memory by space for an entity of type alloc_type. * Adds the node to the block in current_ir_block. @@ -3751,11 +3923,10 @@ ir_node *new_Store (ir_node *store, ir_node *addr, ir_node *val); * @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, +ir_node *new_Alloc (ir_node *store, ir_node *size, ir_type *alloc_type, where_alloc where); - -/**Constructor for a Free node. +/** Constructor for a Free node. * * Frees the memory occupied by the entity pointed to by the pointer * arg. Type indicates the type of the entity the argument points to. @@ -3768,9 +3939,9 @@ ir_node *new_Alloc (ir_node *store, ir_node *size, type *alloc_type, * @param where Where the variable was allocated, either heap_alloc or stack_alloc. */ ir_node *new_Free (ir_node *store, ir_node *ptr, ir_node *size, - type *free_type, where_alloc where); + ir_type *free_type, where_alloc where); -/** Constructor for a Sync node. +/** Constructor for a Sync node. * * Merges several memory values. The node assumes that a variable * either occurs only in one of the memories, or it contains the same @@ -3795,7 +3966,7 @@ ir_node *new_Sync (int arity, ir_node *in[]); */ ir_node *new_Proj (ir_node *arg, ir_mode *mode, long proj); -/** Costructor for a Filter node. +/** Constructor for a Filter node. * * Constructor for a Filter node. Adds the node to the block in current_ir_block. * Filter is a node with two views used to construct the interprocedural view. @@ -3891,6 +4062,15 @@ ir_node *new_NoMem (void); */ ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode); +/** Constructor for a Psi node. + * + * @param *arity The arity of the conditions + * @param *conds The array of mode_b conditions, length must be equal arity + * @param *vals The array of mode values, length must be equal arity + 1 + * @param *mode The mode of the node (must be the mode of all vals). + */ +ir_node *new_Psi (int arity, ir_node *conds[], ir_node *vals[], ir_mode *mode); + /** Constructor for a CopyB node. * * Adds the node to the block in current_ir_block. @@ -3900,10 +4080,31 @@ ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *m * @param *src The ir_node that represents the source address. * @param *data_type The type of the copied data */ -ir_node *new_CopyB(ir_node *store, ir_node *dst, ir_node *src, type *data_type); +ir_node *new_CopyB(ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); + +/** Constructor for a InstOf node. + * + * A High-Level Type check. + * + * @param *store The memory in which the object the entity should be selected + * from is allocated. + * @param *objptr A pointer to a object of a class type. + * @param *type The type of which objptr must be. + */ +ir_node *new_InstOf (ir_node *store, ir_node *objptr, ir_type *type); + +/**Constructor for a Raise node. + * + * A High-Level Exception throw. + * + * @param *store The current memory. + * @param *obj A pointer to the Except variable. + */ +ir_node *new_Raise (ir_node *store, ir_node *obj); /** Constructor for a Bound node. - * Checks whether lower <= idx && idx < upper. + * + * A High-Level bounds check. Checks whether lower <= idx && idx < upper. * * Adds the node to the block in current_ir_block. * @@ -3932,7 +4133,7 @@ ir_node *new_Bound(ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper) * This constructor can only be used if the graph is in * state_building. */ -ir_node *new_d_immBlock (dbg_info* db); +ir_node *new_d_immBlock (dbg_info *db); ir_node *new_immBlock (void); /** Add a control flow edge to an immature block. */ @@ -3992,13 +4193,13 @@ void set_store (ir_node *store); void keep_alive (ir_node *ka); /** Returns the frame type of the current graph */ -type *get_cur_frame_type(void); +ir_type *get_cur_frame_type(void); /* --- initialize and finalize ir construction --- */ /** Puts the graph into state "phase_high" */ -void irg_finalize_cons (ir_graph *irg); +#define irg_finalize_cons(irg) set_irg_phase_state(irg, phase_high) /** Puts the program and all graphs into state phase_high. * @@ -4025,4 +4226,4 @@ void irp_finalize_cons(void); */ typedef ir_node *uninitialized_local_variable_func_t(ir_graph *irg, ir_mode *mode, int pos); -# endif /* _IRCONS_H_ */ +#endif /* _FIRM_IR_IRCONS_H_ */