From 5d8d9dd24e9705d84ddf762adefcc51bddf7065d Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Fri, 13 Jan 2006 21:51:02 +0000 Subject: [PATCH] removed unneeded includes renamed all types 'type' to 'ir_type' [r7229] --- ir/ana/field_temperature.h | 27 ++++++++++++--------------- ir/ana/irtypeinfo.h | 16 ++++++---------- ir/common/firmwalk.h | 8 +++----- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/ir/ana/field_temperature.h b/ir/ana/field_temperature.h index cd6d7c726..50e990d87 100644 --- a/ir/ana/field_temperature.h +++ b/ir/ana/field_temperature.h @@ -27,10 +27,7 @@ * - We compute a value for the entity based on the Sel nodes. */ -#include "irnode.h" -#include "entity.h" -#include "type.h" - +#include "firm_types.h" /* The number of array elements we assume if not both bounds are given. */ #define DEFAULT_N_ARRAY_ELEMENTS 1 @@ -60,32 +57,32 @@ double get_irn_final_cost(ir_node *n); /** Get accumulated(really?) execution frequencies. * A heuristic weights the recursions. */ -double get_type_estimated_n_instances(type *clss); -double get_type_estimated_mem_consumption_bytes(type *tp); +double get_type_estimated_n_instances(ir_type *clss); +double get_type_estimated_mem_consumption_bytes(ir_type *tp); /** Estimates the size of an object. * * The heuristic mainly affects array sizes. * Further this ignores padding for alignment, especially of small fields. */ -int get_type_estimated_size_bytes(type *tp); +int get_type_estimated_size_bytes(ir_type *tp); /** Estimates the number of fields of a single Object. * The heuristic mainly affects array sizes. * @@@ Misses inherited fields! */ -int get_type_estimated_n_fields(type *tp); -double get_type_estimated_n_casts(type *clss); +int get_type_estimated_n_fields(ir_type *tp); +double get_type_estimated_n_casts(ir_type *clss); -double get_class_estimated_n_upcasts(type *clss); -double get_class_estimated_n_downcasts(type *clss); +double get_class_estimated_n_upcasts(ir_type *clss); +double get_class_estimated_n_downcasts(ir_type *clss); /** Returns the number of accesses to the dispatch table. * * This includes the initialization of the pointer field, and accesses * to virtual fields (as instance marker in Java). Certainly this * includes virtual method calls. */ -double get_class_estimated_n_dyncalls(type *clss); +double get_class_estimated_n_dyncalls(ir_type *clss); /** Returns the number of writes to the dispatch pointer. * This is the same as the number of allocations. */ -double get_class_estimated_dispatch_writes(type *clss); +double get_class_estimated_dispatch_writes(ir_type *clss); /** Returns the number of reads of the dispatch pointer. */ -double get_class_estimated_dispatch_reads (type *clss); +double get_class_estimated_dispatch_reads (ir_type *clss); double get_entity_estimated_n_loads(entity *ent); double get_entity_estimated_n_stores(entity *ent); @@ -105,7 +102,7 @@ typedef enum { } irp_temperature_state; /** An auxiliary/temporary function */ -int is_jack_rts_class(type *t); +int is_jack_rts_class(ir_type *t); int is_jack_rts_entity(entity *e); #endif /* _FIELD_TEMPERATURE_H_ */ diff --git a/ir/ana/irtypeinfo.h b/ir/ana/irtypeinfo.h index d39456a6d..47c8e8022 100644 --- a/ir/ana/irtypeinfo.h +++ b/ir/ana/irtypeinfo.h @@ -19,14 +19,10 @@ * graph is valid. Further it defines an auxiliary type "init_type". * */ +#ifndef _IRTYPEINFO_H_ +#define _IRTYPEINFO_H_ - -# ifndef _IRTYPEINFO_H_ -# define _IRTYPEINFO_H_ - -# include "irgraph.h" -# include "irnode.h" -# include "type.h" +#include "firm_types.h" /* ------------ Auxiliary type. --------------------------------------- */ @@ -36,7 +32,7 @@ * variable is set by init_irtypeinfo. The type is freed by * free_irtypeinfo. */ -extern type *initial_type; +extern ir_type *initial_type; @@ -92,7 +88,7 @@ void set_irp_typeinfo_inconsistent(void); * ir_typeinfo_consistent or ir_typeinfo_inconsistent. They * assume current_ir_graph set properly. */ -type *get_irn_typeinfo_type(ir_node *n); -void set_irn_typeinfo_type(ir_node *n, type *tp); +ir_type *get_irn_typeinfo_type(ir_node *n); +void set_irn_typeinfo_type(ir_node *n, ir_type *tp); #endif /* _IRTYPEINFO_H_ */ diff --git a/ir/common/firmwalk.h b/ir/common/firmwalk.h index 8fe80f94d..6fce4eb74 100644 --- a/ir/common/firmwalk.h +++ b/ir/common/firmwalk.h @@ -32,9 +32,7 @@ #ifndef _FIRM_WALK_H_ #define _FIRM_WALK_H_ -#include "type.h" -#include "irgraph.h" -#include "typewalk.h" +#include "firm_types.h" #ifdef __cplusplus extern "C" { @@ -64,7 +62,7 @@ void *get_firm_walk_link(void *thing); * to a firm structure. The real link field of firm structure is used * by this firm walker to collect walking data. * - * @param thing firm structur + * @param thing firm structure * @param link Pointer to link field * * @note After calling firm_walk_finalize() the stored link @@ -79,7 +77,7 @@ typedef void firm_walk_finalize_func(void *env); /** Mode callback function definition */ typedef void firm_walk_mode_func(ir_mode *mode, void *env); /** Type callback function definition */ -typedef void firm_walk_type_func(type *tp, void *env); +typedef void firm_walk_type_func(ir_type *tp, void *env); /** Entity callback function definition */ typedef void firm_walk_entity_func(entity *ent, void *env); /** Graph callback function definition */ -- 2.20.1