X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Ffield_temperature.c;h=c179f07ac47cf86331189a540693faddb581e2eb;hb=64eae41a44856b8b13b1ea6edce58188f1de7e3e;hp=39593be325bb48826e04b6f8681b04a7ed47bf28;hpb=1b79f1a29cd8c8e98568aef2c5e9ca8e4a95a509;p=libfirm

diff --git a/ir/ana/field_temperature.c b/ir/ana/field_temperature.c
index 39593be32..c179f07ac 100644
--- a/ir/ana/field_temperature.c
+++ b/ir/ana/field_temperature.c
@@ -106,7 +106,7 @@ double get_irn_final_cost(ir_node *n) {
   return cost_loop*(cost_method + cost_rec);
 }
 
-double get_type_estimated_n_instances(type *tp) {
+double get_type_estimated_n_instances(ir_type *tp) {
   int i, n_allocs = get_type_n_allocs(tp);
   double n_instances = 0;
   for (i = 0; i < n_allocs; ++i) {
@@ -116,12 +116,12 @@ double get_type_estimated_n_instances(type *tp) {
   return n_instances;
 }
 
-double get_type_estimated_mem_consumption_bytes(type *tp) {
+double get_type_estimated_mem_consumption_bytes(ir_type *tp) {
   assert(0);
   return 0.0;
 }
 
-int get_type_estimated_n_fields(type *tp) {
+int get_type_estimated_n_fields(ir_type *tp) {
   int s = 0;
   switch(get_type_tpop_code(tp)) {
 
@@ -160,7 +160,7 @@ int get_type_estimated_n_fields(type *tp) {
   return s;
 }
 
-int get_type_estimated_size_bytes(type *tp) {
+int get_type_estimated_size_bytes(ir_type *tp) {
   int s = 0;
 
   switch(get_type_tpop_code(tp)) {
@@ -203,7 +203,7 @@ int get_type_estimated_size_bytes(type *tp) {
   return s;
 }
 
-double get_type_estimated_n_casts(type *tp) {
+double get_type_estimated_n_casts(ir_type *tp) {
   int i, n_casts = get_type_n_casts(tp);
   double n_instances = 0;
   for (i = 0; i < n_casts; ++i) {
@@ -213,7 +213,7 @@ double get_type_estimated_n_casts(type *tp) {
   return n_instances;
 }
 
-double get_class_estimated_n_upcasts(type *clss) {
+double get_class_estimated_n_upcasts(ir_type *clss) {
   double n_instances = 0;
   int i, j, n_casts, n_pointertypes;
 
@@ -234,7 +234,7 @@ double get_class_estimated_n_upcasts(type *clss) {
   return n_instances;
 }
 
-double get_class_estimated_n_downcasts(type *clss) {
+double get_class_estimated_n_downcasts(ir_type *clss) {
   double n_instances = 0;
   int i, j, n_casts, n_pointertypes;
 
@@ -256,12 +256,12 @@ double get_class_estimated_n_downcasts(type *clss) {
 }
 
 
-double get_class_estimated_dispatch_writes(type *clss) {
+double get_class_estimated_dispatch_writes(ir_type *clss) {
   return get_type_estimated_n_instances(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) {
   int i, n_mems = get_class_n_members(clss);
   double n_calls = 0;
   for (i = 0; i < n_mems; ++i) {
@@ -271,7 +271,7 @@ double get_class_estimated_dispatch_reads (type *clss) {
   return n_calls;
 }
 
-double get_class_estimated_n_dyncalls(type *clss) {
+double get_class_estimated_n_dyncalls(ir_type *clss) {
   return get_class_estimated_dispatch_reads(clss) +
          get_class_estimated_dispatch_writes(clss);
 }
@@ -319,19 +319,18 @@ double get_entity_estimated_n_dyncalls(entity *ent) {
     ir_node *acc = get_entity_access(ent, i);
 
     /* Call->Sel(ent) combination */
-    if ((get_irn_op(acc) == op_Call)  &&
-	(get_irn_op(get_Call_ptr(acc)) == op_Sel)) {
+    if (is_Call(acc) && is_Sel(get_Call_ptr(acc))) {
       n_calls += get_irn_final_cost(acc);
 
     /* MemOp->Sel combination for static, overwritten entities */
-    } else if (is_memop(acc) && (get_irn_op(get_memop_ptr(acc)) == op_Sel)) {
+    } else if (is_memop(acc) && is_Sel(get_memop_ptr(acc))) {
       entity *ent = get_Sel_entity(get_memop_ptr(acc));
       if (is_Class_type(get_entity_owner(ent))) {
-	/* We might call this for inner entities in compounds. */
-	if (get_entity_n_overwrites(ent) > 0 ||
-	    get_entity_n_overwrittenby(ent) > 0) {
-	  n_calls += get_irn_final_cost(acc);
-	}
+        /* We might call this for inner entities in compounds. */
+        if (get_entity_n_overwrites(ent) > 0 ||
+            get_entity_n_overwrittenby(ent) > 0) {
+          n_calls += get_irn_final_cost(acc);
+        }
       }
     }
 
@@ -360,7 +359,7 @@ int is_jack_rts_name(ident *name) {
 }
 
 
-int is_jack_rts_class(type *t) {
+int is_jack_rts_class(ir_type *t) {
   ident *name = get_type_ident(t);
   return is_jack_rts_name(name);
 }