Added is_Const

[libfirm] / ir / ana / field_temperature.c

diff --git a/ir/ana/field_temperature.c b/ir/ana/field_temperature.c
index 541bded..a07b138 100644 (file)
--- a/ir/ana/field_temperature.c
+++ b/ir/ana/field_temperature.c
@@ -29,7 +29,6 @@
 /* initialize, global variables.                                               */
 /* *************************************************************************** */
 
-
 /* *************************************************************************** */
 /*   Access routines for irnodes                                               */
 /* *************************************************************************** */
@@ -43,8 +42,6 @@ entity *get_Sel_accessed_entity(ir_node *sel, int pos) {
   return get_Sel_entity(sel);
 }
 
-
-
 /* *************************************************************************** */
 /* The heuristic                                                               */
 /* *************************************************************************** */
@@ -68,6 +65,7 @@ int get_irn_recursion_depth(ir_node *n) {
 }
 
 
+/**   @@@ the second version of the heuristic. */
 int get_weighted_loop_depth(ir_node *n) {
   int loop_call_depth = get_irn_loop_call_depth(n);
   int loop_depth      = get_irn_loop_depth(n);
@@ -86,12 +84,14 @@ static int default_recursion_weight = 5;
 
 /* The final evaluation of a node.  In this function we can
    adapt the heuristic.  Combine execution freqency with
-   recursion depth. */
+   recursion depth.
+   @@@ the second version of the heuristic. */
 double get_irn_final_cost(ir_node *n) {
-  double cost_loop = get_irn_exec_freq(n);
-  int    rec_depth = get_irn_recursion_depth(n);
-  double cost_rec  = pow(default_recursion_weight, rec_depth);
-  return cost_loop + cost_rec;
+  double cost_loop   = get_irn_exec_freq(n);
+  double cost_method = get_irg_method_execution_frequency(get_irn_irg(n));
+  int    rec_depth   = get_irn_recursion_depth(n);
+  double cost_rec    = pow(default_recursion_weight, rec_depth);
+  return cost_loop*(cost_method + cost_rec);
 }
 
 double get_type_estimated_n_instances(type *tp) {
@@ -106,6 +106,7 @@ double get_type_estimated_n_instances(type *tp) {
 
 double get_type_estimated_mem_consumption_bytes(type *tp) {
   assert(0);
+  return 0.0;
 }
 
 int get_type_estimated_n_fields(type *tp) {
@@ -202,8 +203,9 @@ double get_type_estimated_n_casts(type *tp) {
 
 double get_class_estimated_n_upcasts(type *clss) {
   double n_instances = 0;
+  int i, j, n_casts, n_pointertypes;
 
-  int i, n_casts = get_type_n_casts(clss);
+  n_casts = get_type_n_casts(clss);
   for (i = 0; i < n_casts; ++i) {
     ir_node *cast = get_type_cast(clss, i);
     if (get_irn_opcode(cast) != iro_Cast) continue;  /* Could be optimized away. */
@@ -212,7 +214,7 @@ double get_class_estimated_n_upcasts(type *clss) {
       n_instances += get_irn_final_cost(cast);
   }
 
-  int j, n_pointertypes = get_type_n_pointertypes_to(clss);
+  n_pointertypes = get_type_n_pointertypes_to(clss);
   for (j = 0; j < n_pointertypes; ++j) {
     n_instances += get_class_estimated_n_upcasts(get_type_pointertype_to(clss, j));
   }
@@ -222,8 +224,9 @@ double get_class_estimated_n_upcasts(type *clss) {
 
 double get_class_estimated_n_downcasts(type *clss) {
   double n_instances = 0;
+  int i, j, n_casts, n_pointertypes;
 
-  int i, n_casts = get_type_n_casts(clss);
+  n_casts = get_type_n_casts(clss);
   for (i = 0; i < n_casts; ++i) {
     ir_node *cast = get_type_cast(clss, i);
     if (get_irn_opcode(cast) != iro_Cast) continue;  /* Could be optimized away. */
@@ -232,7 +235,7 @@ double get_class_estimated_n_downcasts(type *clss) {
       n_instances += get_irn_final_cost(cast);
   }
 
-  int j, n_pointertypes = get_type_n_pointertypes_to(clss);
+  n_pointertypes = get_type_n_pointertypes_to(clss);
   for (j = 0; j < n_pointertypes; ++j) {
     n_instances += get_class_estimated_n_downcasts(get_type_pointertype_to(clss, j));
   }
@@ -324,12 +327,11 @@ double get_entity_estimated_n_dyncalls(entity *ent) {
   return n_calls;
 }
 
+/* ------------------------------------------------------------------------- */
+/* Auxiliary                                                                 */
+/* ------------------------------------------------------------------------- */
 
-/* *************************************************************************** */
-/* Auxiliary                                                                   */
-/* *************************************************************************** */
-
-int is_jack_rts_name(const ident *name) {
+int is_jack_rts_name(ident *name) {
   return  0;
   if (id_is_prefix(new_id_from_str("java/"), name)) return 1;
   if (id_is_prefix(new_id_from_str("["),     name)) return 1;
@@ -349,8 +351,10 @@ int is_jack_rts_class(type *t) {
 #include "entity_t.h"  // for the assertion.
 
 int is_jack_rts_entity(entity *e) {
+  ident *name;
+
   assert(e->ld_name);
-  ident *name = get_entity_ld_ident(e);
+  name = get_entity_ld_ident(e);
 
   return is_jack_rts_name(name);
 }