Commit 44fec44b authored by Michael Beck's avatar Michael Beck
Browse files

renamed all types 'type' to 'ir_type'

[r7237]
parent 4aea4687
......@@ -86,7 +86,7 @@ void set_main_ctx (ctx_info_t*);
/* ====================
Alloc stuff
==================== */
static void append_alloc (graph_info_t *ginfo, ir_node *alloc, type *tp)
static void append_alloc (graph_info_t *ginfo, ir_node *alloc, ir_type *tp)
{
alloc_info_t *ainfo = xmalloc (sizeof (alloc_info_t));
......@@ -419,7 +419,7 @@ static void ecg_calls_act (ir_node *node, void *env)
assert (0 && "Unexpected address expression");
}
} else if (op_Alloc == op) {
type *tp = get_Alloc_type (node);
ir_type *tp = get_Alloc_type (node);
/* const char *name = get_type_name (tp); */
append_alloc (graph_info, node, tp);
......@@ -1267,6 +1267,9 @@ void ecg_ecg (void)
/*
$Log$
Revision 1.22 2006/01/13 22:55:03 beck
renamed all types 'type' to 'ir_type'
Revision 1.21 2005/12/31 15:58:57 beck
added missing includes
......
......@@ -202,7 +202,7 @@ static void pto_name_alloc_colors (void)
/* See whether the given entity is a field. */
static int is_field (entity *ent)
{
type *tp = get_entity_type (ent);
ir_type *tp = get_entity_type (ent);
if (is_Primitive_type (tp) || is_Pointer_type (tp)) {
/* actually, we don't get by by restricting ourselves to pointer types */
......@@ -212,9 +212,9 @@ static int is_field (entity *ent)
}
}
/* Helper to collect_fields(type*): collect all fields of the given
/* Helper to collect_fields(ir_type*): collect all fields of the given
clazz and its super classes into the given obstack. */
static void _collect_fields (type *clazz, struct obstack *obst)
static void _collect_fields (ir_type *clazz, struct obstack *obst)
{
int n_members = get_class_n_members (clazz);
int n_supers = get_class_n_supertypes (clazz);
......@@ -231,7 +231,7 @@ static void _collect_fields (type *clazz, struct obstack *obst)
}
for (i = 0; i < n_supers; i ++) {
type *s_clazz = get_class_supertype (clazz, i);
ir_type *s_clazz = get_class_supertype (clazz, i);
_collect_fields (s_clazz, obst);
}
......@@ -239,7 +239,7 @@ static void _collect_fields (type *clazz, struct obstack *obst)
/* Collect the fields of the given class and its super classes into an array.
The last entry of the array is written NULL. */
static entity **collect_fields (type *clazz)
static entity **collect_fields (ir_type *clazz)
{
struct obstack obst;
int n_fields;
......@@ -302,7 +302,7 @@ static void pto_name_dump_finish (FILE *stream)
/* Write a node for the given descriptor into the given stream */
static void pto_name_dump_desc (desc_t *desc, FILE *stream)
{
type *tp = desc->tp;
ir_type *tp = desc->tp;
const char *tp_name = get_type_name (tp);
ir_node *nd;
......@@ -473,7 +473,7 @@ qset_t *get_entry (desc_t *desc, entity *ent)
/* get a new descriptor for the given type at the given node */
desc_t *new_name (type *tp, ir_node *node, int ctx)
desc_t *new_name (ir_type *tp, ir_node *node, int ctx)
{
desc_t *desc = NULL;
......@@ -535,7 +535,7 @@ desc_t *new_ent_name (entity *ent)
{
int i;
int missing = TRUE;
type *tp = get_entity_type (ent);
ir_type *tp = get_entity_type (ent);
assert (is_Pointer_type (tp));
tp = get_pointer_points_to_type (tp);
......@@ -658,6 +658,9 @@ void pto_name_cleanup (void)
/*
$Log$
Revision 1.18 2006/01/13 22:56:21 beck
renamed all types 'type' to 'ir_type'
Revision 1.17 2005/12/16 16:59:54 grund
*** empty log message ***
......
......@@ -150,7 +150,7 @@ new_bd_Phi (dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode
}
static ir_node *
new_bd_Const_type (dbg_info *db, ir_node *block, ir_mode *mode, tarval *con, type *tp)
new_bd_Const_type (dbg_info *db, ir_node *block, ir_mode *mode, tarval *con, ir_type *tp)
{
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -241,7 +241,7 @@ new_bd_Conv (dbg_info *db, ir_node *block, ir_node *op, ir_mode *mode)
}
static ir_node *
new_bd_Cast (dbg_info *db, ir_node *block, ir_node *op, type *to_tp)
new_bd_Cast (dbg_info *db, ir_node *block, ir_node *op, ir_type *to_tp)
{
ir_node *res;
ir_graph *irg = current_ir_graph;
......@@ -596,7 +596,7 @@ new_bd_Cond (dbg_info *db, ir_node *block, ir_node *c)
static ir_node *
new_bd_Call (dbg_info *db, 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)
{
ir_node **r_in;
ir_node *res;
......@@ -694,7 +694,7 @@ new_bd_Store (dbg_info *db, ir_node *block,
static ir_node *
new_bd_Alloc (dbg_info *db, 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)
{
ir_node *in[2];
ir_node *res;
......@@ -713,7 +713,7 @@ new_bd_Alloc (dbg_info *db, ir_node *block, ir_node *store,
static ir_node *
new_bd_Free (dbg_info *db, 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)
{
ir_node *in[3];
ir_node *res;
......@@ -758,7 +758,7 @@ new_bd_Sel (dbg_info *db, ir_node *block, ir_node *store, ir_node *objptr,
static ir_node *
new_bd_InstOf (dbg_info *db, ir_node *block, ir_node *store,
ir_node *objptr, type *ent)
ir_node *objptr, ir_type *ent)
{
ir_node **r_in;
ir_node *res;
......@@ -780,7 +780,7 @@ new_bd_InstOf (dbg_info *db, ir_node *block, ir_node *store,
static ir_node *
new_bd_SymConst_type (dbg_info *db, ir_node *block, symconst_symbol value,
symconst_kind symkind, type *tp) {
symconst_kind symkind, ir_type *tp) {
ir_node *res;
ir_mode *mode;
ir_graph *irg = current_ir_graph;
......@@ -945,7 +945,7 @@ new_bd_Mux (dbg_info *db, ir_node *block,
static ir_node *
new_bd_CopyB (dbg_info *db, 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)
{
ir_node *in[3];
ir_node *res;
......@@ -1047,7 +1047,7 @@ new_rd_Phi (dbg_info *db, ir_graph *irg, ir_node *block, int arity, ir_node **in
}
ir_node *
new_rd_Const_type (dbg_info *db, ir_graph *irg, ir_node *block, ir_mode *mode, tarval *con, type *tp)
new_rd_Const_type (dbg_info *db, ir_graph *irg, ir_node *block, ir_mode *mode, tarval *con, ir_type *tp)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1133,7 +1133,7 @@ new_rd_Conv (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *op, ir_mode *
}
ir_node *
new_rd_Cast (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *op, type *to_tp)
new_rd_Cast (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *op, ir_type *to_tp)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1451,7 +1451,7 @@ new_rd_Cond (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *c)
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)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1520,7 +1520,7 @@ new_rd_Store (dbg_info *db, ir_graph *irg, ir_node *block,
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)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1534,7 +1534,7 @@ new_rd_Alloc (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
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)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1576,7 +1576,7 @@ new_rd_Sel (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, ir_node
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)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1590,7 +1590,7 @@ new_rd_InstOf (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
ir_node *
new_rd_SymConst_type (dbg_info *db, ir_graph *irg, ir_node *block, symconst_symbol value,
symconst_kind symkind, type *tp)
symconst_kind symkind, ir_type *tp)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1610,23 +1610,23 @@ new_rd_SymConst (dbg_info *db, ir_graph *irg, ir_node *block, symconst_symbol va
return res;
}
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)
{
symconst_symbol sym = {(type *)symbol};
symconst_symbol sym = {(ir_type *)symbol};
return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_ent, tp);
}
ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, type *tp) {
symconst_symbol sym = {(type *)symbol};
ir_node *new_rd_SymConst_addr_name (dbg_info *db, ir_graph *irg, ident *symbol, ir_type *tp) {
symconst_symbol sym = {(ir_type *)symbol};
return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_addr_name, tp);
}
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) {
symconst_symbol sym = {symbol};
return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_type_tag, tp);
}
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) {
symconst_symbol sym = {symbol};
return new_rd_SymConst_type(db, irg, irg->start_block, sym, symconst_size, tp);
}
......@@ -1759,7 +1759,7 @@ new_rd_Mux (dbg_info *db, ir_graph *irg, ir_node *block,
}
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)
{
ir_node *res;
ir_graph *rem = current_ir_graph;
......@@ -1821,7 +1821,7 @@ ir_node *new_r_Const_long(ir_graph *irg, ir_node *block,
}
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) {
return new_rd_Const_type(NULL, irg, block, mode, con, tp);
}
......@@ -1835,12 +1835,12 @@ ir_node *new_r_Sel (ir_graph *irg, ir_node *block, ir_node *store,
return new_rd_Sel(NULL, irg, block, store, objptr, n_index, index, ent);
}
ir_node *new_r_InstOf (ir_graph *irg, ir_node *block, ir_node *store, ir_node *objptr,
type *ent) {
ir_type *ent) {
return (new_rd_InstOf (NULL, irg, block, store, objptr, ent));
}
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) {
return new_rd_Call(NULL, irg, block, store, callee, arity, in, tp);
}
ir_node *new_r_Add (ir_graph *irg, ir_node *block,
......@@ -1919,7 +1919,7 @@ ir_node *new_r_Conv (ir_graph *irg, ir_node *block,
ir_node *op, ir_mode *mode) {
return new_rd_Conv(NULL, irg, block, op, mode);
}
ir_node *new_r_Cast (ir_graph *irg, ir_node *block, ir_node *op, type *to_tp) {
ir_node *new_r_Cast (ir_graph *irg, ir_node *block, ir_node *op, ir_type *to_tp) {
return new_rd_Cast(NULL, irg, block, op, to_tp);
}
ir_node *new_r_Phi (ir_graph *irg, ir_node *block, int arity,
......@@ -1935,11 +1935,11 @@ ir_node *new_r_Store (ir_graph *irg, ir_node *block,
return new_rd_Store(NULL, irg, block, store, adr, val);
}
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) {
return new_rd_Alloc(NULL, irg, block, store, size, alloc_type, where);
}
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) {
return new_rd_Free(NULL, irg, block, store, ptr, size, free_type, where);
}
ir_node *new_r_Sync (ir_graph *irg, ir_node *block, int arity, ir_node **in) {
......@@ -1994,7 +1994,7 @@ ir_node *new_r_Mux (ir_graph *irg, ir_node *block,
return new_rd_Mux(NULL, irg, block, sel, ir_false, ir_true, mode);
}
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) {
return new_rd_CopyB(NULL, irg, block, store, dst, src, data_type);
}
ir_node *new_r_Bound(ir_graph *irg, ir_node *block,
......@@ -2909,7 +2909,7 @@ new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
}
ir_node *
new_d_Const_type (dbg_info *db, ir_mode *mode, tarval *con, type *tp)
new_d_Const_type (dbg_info *db, ir_mode *mode, tarval *con, ir_type *tp)
{
return new_bd_Const_type(db, current_ir_graph->start_block,
mode, con, tp);
......@@ -2949,7 +2949,7 @@ new_d_Conv (dbg_info *db, ir_node *op, ir_mode *mode)
}
ir_node *
new_d_Cast (dbg_info *db, ir_node *op, type *to_tp)
new_d_Cast (dbg_info *db, ir_node *op, ir_type *to_tp)
{
return new_bd_Cast(db, current_ir_graph->current_block, op, to_tp);
}
......@@ -3150,7 +3150,7 @@ new_d_Cond (dbg_info *db, ir_node *c)
ir_node *
new_d_Call (dbg_info *db, ir_node *store, ir_node *callee, int arity, ir_node **in,
type *tp)
ir_type *tp)
{
ir_node *res;
res = new_bd_Call (db, current_ir_graph->current_block,
......@@ -3203,7 +3203,7 @@ new_d_Store (dbg_info *db, ir_node *store, ir_node *addr, ir_node *val)
}
ir_node *
new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, type *alloc_type,
new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, ir_type *alloc_type,
where_alloc where)
{
ir_node *res;
......@@ -3218,7 +3218,7 @@ new_d_Alloc (dbg_info *db, ir_node *store, ir_node *size, type *alloc_type,
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 *size, ir_type *free_type, where_alloc where)
{
return new_bd_Free (db, current_ir_graph->current_block,
store, ptr, size, free_type, where);
......@@ -3241,14 +3241,14 @@ new_d_Sel (dbg_info *db, ir_node *store, ir_node *objptr, int n_index, ir_node *
}
ir_node *
new_d_InstOf (dbg_info *db, ir_node *store, ir_node *objptr, type *ent)
new_d_InstOf (dbg_info *db, ir_node *store, ir_node *objptr, ir_type *ent)
{
return (new_bd_InstOf (db, current_ir_graph->current_block,
store, objptr, ent));
}
ir_node *
new_d_SymConst_type (dbg_info *db, symconst_symbol value, symconst_kind kind, type *tp)
new_d_SymConst_type (dbg_info *db, symconst_symbol value, symconst_kind kind, ir_type *tp)
{
return new_bd_SymConst_type (db, current_ir_graph->start_block,
value, kind, tp);
......@@ -3338,7 +3338,7 @@ new_d_Mux (dbg_info *db, ir_node *sel, ir_node *ir_false,
}
ir_node *new_d_CopyB(dbg_info *db,ir_node *store,
ir_node *dst, ir_node *src, type *data_type) {
ir_node *dst, ir_node *src, ir_type *data_type) {
ir_node *res;
res = new_bd_CopyB(db, current_ir_graph->current_block,
store, dst, src, data_type);
......@@ -3478,7 +3478,7 @@ ir_node *get_cur_block(void) {
}
/* Returns the frame type of the current graph */
type *get_cur_frame_type(void) {
ir_type *get_cur_frame_type(void) {
return get_irg_frame_type(current_ir_graph);
}
......@@ -3544,7 +3544,7 @@ ir_node *new_Const_long(ir_mode *mode, long value)
return new_d_Const_long(NULL, mode, value);
}
ir_node *new_Const_type(tarval *con, type *tp) {
ir_node *new_Const_type(tarval *con, ir_type *tp) {
return new_d_Const_type(NULL, get_type_mode(tp), con, tp);
}
......@@ -3558,11 +3558,11 @@ ir_node *new_Sel (ir_node *store, ir_node *objptr, int arity, ir_node **in,
entity *ent) {
return new_d_Sel(NULL, store, objptr, arity, in, ent);
}
ir_node *new_InstOf (ir_node *store, ir_node *objptr, type *ent) {
ir_node *new_InstOf (ir_node *store, ir_node *objptr, ir_type *ent) {
return new_d_InstOf (NULL, store, objptr, ent);
}
ir_node *new_Call (ir_node *store, ir_node *callee, int arity, ir_node **in,
type *tp) {
ir_type *tp) {
return new_d_Call(NULL, store, callee, arity, in, tp);
}
ir_node *new_Add (ir_node *op1, ir_node *op2, ir_mode *mode) {
......@@ -3622,7 +3622,7 @@ ir_node *new_Cmp (ir_node *op1, ir_node *op2) {
ir_node *new_Conv (ir_node *op, ir_mode *mode) {
return new_d_Conv(NULL, op, mode);
}
ir_node *new_Cast (ir_node *op, type *to_tp) {
ir_node *new_Cast (ir_node *op, ir_type *to_tp) {
return new_d_Cast(NULL, op, to_tp);
}
ir_node *new_Phi (int arity, ir_node **in, ir_mode *mode) {
......@@ -3634,12 +3634,12 @@ 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) {
return new_d_Store(NULL, store, addr, 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) {
return new_d_Alloc(NULL, store, size, alloc_type, 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) {
return new_d_Free(NULL, store, ptr, size, free_type, where);
}
ir_node *new_Sync (int arity, ir_node **in) {
......@@ -3687,7 +3687,7 @@ ir_node *new_NoMem (void) {
ir_node *new_Mux (ir_node *sel, ir_node *ir_false, ir_node *ir_true, ir_mode *mode) {
return new_d_Mux(NULL, sel, ir_false, ir_true, 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) {
return new_d_CopyB(NULL, store, dst, src, data_type);
}
ir_node *new_Bound(ir_node *store, ir_node *idx, ir_node *lower, ir_node *upper) {
......
......@@ -219,7 +219,7 @@ const char *get_mode_name_ex(ir_mode *mode, int *bad)
* returns the name of a type or <ERROR> if mode is NOT a mode object.
* in the later case, sets bad
*/
const char *get_type_name_ex(type *tp, int *bad)
const char *get_type_name_ex(ir_type *tp, int *bad)
{
if (is_type(tp))
return get_type_name(tp);
......@@ -250,7 +250,7 @@ static void print_vcg_color(FILE *F, dumper_colors color) {
* prints the edge from a type S to a type T with additional info fmt, ...
* to the file F
*/
static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ...)
static void print_type_type_edge(FILE *F, ir_type *S, ir_type *T, const char *fmt, ...)
{
va_list ap;
......@@ -266,7 +266,7 @@ static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ...
* prints the edge from a type T to an entity E with additional info fmt, ...
* to the file F
*/
static void print_type_ent_edge(FILE *F, type *T, entity *E, const char *fmt, ...)
static void print_type_ent_edge(FILE *F, ir_type *T, entity *E, const char *fmt, ...)
{
va_list ap;
......@@ -302,7 +302,7 @@ static void print_ent_ent_edge(FILE *F, entity *E, entity *T, int backedge, cons
* prints the edge from an entity E to a type T with additional info fmt, ...
* to the file F
*/
static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, ...)
static void print_ent_type_edge(FILE *F, entity *E, ir_type *T, const char *fmt, ...)
{
va_list ap;
......@@ -318,7 +318,7 @@ static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, ..
* prints the edge from a node N to a type T with additional info fmt, ...
* to the file F
*/
static void print_node_type_edge(FILE *F, const ir_node *N, type *T, const char *fmt, ...)
static void print_node_type_edge(FILE *F, const ir_node *N, ir_type *T, const char *fmt, ...)
{
va_list ap;
......@@ -367,7 +367,7 @@ static void print_ent_node_edge(FILE *F, entity *E, const ir_node *N, const char
* prints the edge from a type E to an enumeration item item with additional info fmt, ...
* to the file F
*/
static void print_enum_item_edge(FILE *F, type *E, int item, const char *fmt, ...)
static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt, ...)
{
va_list ap;
......@@ -742,7 +742,7 @@ static int dump_node_typeinfo(FILE *F, ir_node *n) {
if (opt_dump_analysed_type_info) {
if (get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent ||
get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent) {
type *tp = get_irn_typeinfo_type(n);
ir_type *tp = get_irn_typeinfo_type(n);
if (tp != firm_none_type)
fprintf(F, "[%s] ", get_type_name_ex(tp, &bad));
else
......@@ -1693,7 +1693,7 @@ static void dump_node2type_edges(ir_node *n, void *env)
}
#if 0
static int print_type_info(FILE *F, type *tp) {
static int print_type_info(FILE *F, ir_type *tp) {
int bad = 0;
if (get_type_state(tp) == layout_undefined) {
......@@ -1708,7 +1708,7 @@ static int print_type_info(FILE *F, type *tp) {
return bad;
}
static void print_typespecific_info(FILE *F, type *tp) {
static void print_typespecific_info(FILE *F, ir_type *tp) {
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
......@@ -1743,7 +1743,7 @@ static void print_typespecific_info(FILE *F, type *tp) {
}
#endif
static void print_typespecific_vcgattr(FILE *F, type *tp) {
static void print_typespecific_vcgattr(FILE *F, ir_type *tp) {
switch (get_type_tpop_code(tp)) {
case tpo_class:
{
......@@ -1779,7 +1779,7 @@ static void print_typespecific_vcgattr(FILE *F, type *tp) {
}
int dump_type_node(FILE *F, type *tp)
int dump_type_node(FILE *F, ir_type *tp)
{
int bad = 0;
......@@ -1824,7 +1824,7 @@ void dump_entity_node(FILE *F, entity *ent, int color)
}
#undef X
static void dump_enum_item(FILE *F, type *tp, int pos)
static void dump_enum_item(FILE *F, ir_type *tp, int pos)
{
char buf[1024];
ident *id = get_enumeration_nameid(tp, pos);
......@@ -1892,7 +1892,7 @@ dump_type_info(type_or_ent *tore, void *env) {
} break;
case k_type:
{
type *tp = (type *)tore;
ir_type *tp = (ir_type *)tore;
dump_type_node(F, tp);
/* and now the edges */
switch (get_type_tpop_code(tp)) {
......@@ -1991,7 +1991,7 @@ dump_class_hierarchy_node (type_or_ent *tore, void *ctx) {
} break; /* case k_entity */
case k_type:
{
type *tp = (type *)tore;
ir_type *tp = (ir_type *)tore;
if (tp == get_glob_type()) break;
switch (get_type_tpop_code(tp)) {
case tpo_class: {
......
......@@ -510,11 +510,11 @@ void dump_entity (entity *ent);
/** Write the type and all its attributes to the file passed.
* */
void dump_type_to_file (FILE *f, type *tp, dump_verbosity verbosity);
void dump_type_to_file (FILE *f, ir_type *tp, dump_verbosity verbosity);
/** Write the type and all its attributes to stdout.
* */
void dump_type (type *tp);
void dump_type (ir_type *tp);
/** Dump type information as text.
......
......@@ -70,7 +70,7 @@ void vcg_close (FILE *F);
const char *get_ent_dump_name(entity *ent);
const char *get_type_name_ex(type *tp, int *bad);
const char *get_type_name_ex(ir_type *tp, int *bad);
const char *get_mode_name_ex(ir_mode *mode, int *bad);
/**
* dump the name of a node n to the File F.
......@@ -82,6 +82,6 @@ int dump_node_label(FILE *F, ir_node *n);
/** Writes vcg representation with title "PRINT_TYPEID(tp)" to file F. */
int dump_type_node(FILE *F, type *tp);
int dump_type_node(FILE *F, ir_type *tp);
#endif /* __IRDUMPT_T_H__ */
......@@ -189,7 +189,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
/* not dumped: mature */
} break;
case iro_Start: {
type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
fprintf(F, " start of method of type %s \n", get_type_name_ex(tp, &bad));
for (i = 0; i < get_method_n_params(tp); ++i)
fprintf(F, " param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
......@@ -231,7 +231,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
}
} break;
case iro_Call: {
type *tp = get_Call_type(n);
ir_type *tp = get_Call_type(n);
fprintf(F, " calling method of type %s \n", get_type_name_ex(tp, &bad));