From b26fc16313f70f168f4f89aef4c4bc091d5ce34d Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Fri, 13 Jan 2006 22:39:33 +0000 Subject: [PATCH] removed unneeded includes renamed all types 'type' to 'ir_type' [r7234] --- ir/ir/ircons.h | 199 +++++++++++++++++++++++------------------------ ir/tr/typegmod.h | 14 ++-- 2 files changed, 102 insertions(+), 111 deletions(-) diff --git a/ir/ir/ircons.h b/ir/ir/ircons.h index 38ae196fd..65cea0f69 100644 --- a/ir/ir/ircons.h +++ b/ir/ir/ircons.h @@ -259,7 +259,7 @@ * 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_InstOf (ir_node *store, ir_node obj, ir_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 +281,17 @@ * 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_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_CopyB (ir_node *store, ir_node *dst, ir_node *src, ir_type *data_type); * 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); @@ -853,8 +853,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 +880,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,7 +938,7 @@ * 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) + * 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 form address src to @@ -1050,19 +1050,12 @@ * node. * */ +#ifndef _IRCONS_H_ +#define _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 "dbginfo.h" /*-------------------------------------------------------------------------*/ /* The raw interface */ @@ -1189,8 +1182,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. * @@ -1238,8 +1231,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 +1245,28 @@ 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. * 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_size (dbg_info *db, ir_graph *irg, ir_type *symbol, ir_type *tp); /** Constructor for a simpleSel node. * @@ -1328,7 +1321,7 @@ ir_node *new_rd_Sel (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *st * @param *ent */ ir_node *new_rd_InstOf (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, - ir_node *objptr, type *ent); + ir_node *objptr, ir_type *ent); /** Constructor for a Call node. * @@ -1344,7 +1337,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 +1573,8 @@ 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 Phi node. * @@ -1632,7 +1625,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 +1642,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. * @@ -1846,7 +1839,7 @@ 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 Bound node. * Checks whether lower <= idx && idx < upper. @@ -1995,7 +1988,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. * @@ -2059,7 +2052,7 @@ ir_node *new_r_Sel (ir_graph *irg, ir_node *block, ir_node *store, * @param *y * @param *z */ -ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *x, ir_node *y, type *z); +ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *x, ir_node *y, ir_type *z); /** Constructor for a Call node. * @@ -2075,7 +2068,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 +2285,7 @@ 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 Phi node. * @@ -2339,7 +2332,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,7 +2348,7 @@ 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. * @@ -2555,7 +2548,7 @@ 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 Bound node. * Checks whether lower <= idx && idx < upper. @@ -2601,7 +2594,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 +2602,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 +2610,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 +2620,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. * @@ -2654,7 +2647,7 @@ ir_node *new_d_IJmp (dbg_info *db, ir_node *tgt); * @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. * @@ -2669,7 +2662,7 @@ ir_node *new_d_Cond (dbg_info* db, ir_node *c); * @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[]); +ir_node *new_d_Return (dbg_info *db, ir_node *store, int arity, ir_node *in[]); /** Constructor for a Raise node. * @@ -2680,7 +2673,7 @@ ir_node *new_d_Return (dbg_info* db, ir_node *store, int arity, ir_node *in[]); * @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_Raise (dbg_info *db, ir_node *store, ir_node *obj); /** Constructor for a Const_type node. * @@ -2695,7 +2688,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 +2703,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. * @@ -2740,12 +2733,12 @@ ir_node *new_d_Const (dbg_info* db, ir_mode *mode, tarval *con); * or symconst_addr_name. * @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 +2753,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,7 +2774,7 @@ 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. @@ -2795,7 +2788,7 @@ ir_node *new_d_Sel (dbg_info* db, ir_node *store, ir_node *objptr, int arity, * @param *objptr * @param *ent */ -ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent); +ir_node *new_d_InstOf (dbg_info *db, ir_node *store, ir_node *objptr, ir_type *ent); /** Constructor for a Call node. * @@ -2810,8 +2803,8 @@ ir_node *new_d_InstOf (dbg_info* db, ir_node *store, ir_node *objptr, type *ent) * @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 +2815,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. * @@ -2834,7 +2827,7 @@ ir_node *new_d_Add (dbg_info* db, ir_node *op1, ir_node *op2, ir_mode *mode); * @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 +2837,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 +2848,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 +2859,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 +2870,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 +2881,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 +2892,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 +2902,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 +2913,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 +2924,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 +2935,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 +2945,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 +2956,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 +2967,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 +2978,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 +2989,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 +2999,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,7 +3009,7 @@ 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. * @@ -3027,7 +3020,7 @@ 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 Phi node. * @@ -3038,7 +3031,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 +3042,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 +3053,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 +3066,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 +3082,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,7 +3097,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,7 +3111,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 +3123,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,7 +3135,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 +3147,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,7 +3169,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. @@ -3277,7 +3270,7 @@ 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 Bound node. * Checks whether lower <= idx && idx < upper. @@ -3426,7 +3419,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. * @@ -3497,7 +3490,7 @@ ir_node *new_Sel (ir_node *store, ir_node *objptr, int arity, ir_node *in[], * @param *obj * @param *ent */ -ir_node *new_InstOf (ir_node *store, ir_node *obj, type *ent); +ir_node *new_InstOf (ir_node *store, ir_node *obj, ir_type *ent); /** Constructor for a Call node. * @@ -3511,7 +3504,7 @@ 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. * @@ -3713,7 +3706,7 @@ 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 Phi node. * @@ -3751,7 +3744,7 @@ 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); @@ -3768,7 +3761,7 @@ 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. * @@ -3900,7 +3893,7 @@ 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 Bound node. * Checks whether lower <= idx && idx < upper. @@ -3932,7 +3925,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,7 +3985,7 @@ 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 --- */ @@ -4025,4 +4018,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 /* _IRCONS_H_ */ diff --git a/ir/tr/typegmod.h b/ir/tr/typegmod.h index bfdd7c221..3dcff60f4 100644 --- a/ir/tr/typegmod.h +++ b/ir/tr/typegmod.h @@ -9,12 +9,10 @@ * Copyright: (c) 2001-2003 Universität Karlsruhe * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. */ +#ifndef _TYPEGMOD_H_ +#define _TYPEGMOD_H_ - -# ifndef _TYPEGMOD_H_ -# define _TYPEGMOD_H_ - -# include "type.h" +#include "firm_types.h" /** * @@ -36,7 +34,7 @@ * @param new_type - The new type that will replace old_type. * */ -void exchange_types(type *old_type, type *new_type); +void exchange_types(ir_type *old_type, ir_type *new_type); /** Skip id types until a useful type is reached. * @@ -46,6 +44,6 @@ void exchange_types(type *old_type, type *new_type); * tp if it is not an id type. * If tp is an id type returns the real type it stands for. */ -type *skip_tid(type *tp); +ir_type *skip_tid(ir_type *tp); -# endif /*_TYPEGMOD_H_ */ +#endif /*_TYPEGMOD_H_ */ -- 2.20.1