renamed entity -> ir_entity

[r8438]

diff --git a/ir/ana/rta.c b/ir/ana/rta.c
index d9312ab..9992474 100644 (file)
--- a/ir/ana/rta.c
+++ b/ir/ana/rta.c
@@ -50,19 +50,19 @@ static eset *_live_graphs    = NULL;
 /**
    Given a method, find the firm graph that implements that method.
 */
-static ir_graph *get_implementing_graph (entity *method)
+static ir_graph *get_implementing_graph (ir_entity *method)
 {
 #if 0
-  ir_graph *graph = get_entity_irg ((entity*) method);
+  ir_graph *graph = get_entity_irg ((ir_entity*) method);
 
   /* Search upwards in the overwrites graph. */
   /* GL: this will not work for multiple inheritance */
   if (NULL == graph) {
     int i;
-    int n_over = get_entity_n_overwrites ((entity*) method);
+    int n_over = get_entity_n_overwrites ((ir_entity*) method);
 
     for (i = 0; (NULL == graph) && (i < n_over); i ++) {
-      entity *over = get_entity_overwrites ((entity*) method, i);
+      ir_entity *over = get_entity_overwrites ((ir_entity*) method, i);
       graph = get_implementing_graph (over);
     }
   }
@@ -135,7 +135,7 @@ static int add_class (ir_type *clazz)
  *
  *  Iff additions occurred, return TRUE, else FALSE.
 */
-static int add_implementing_graphs (entity *method)
+static int add_implementing_graphs (ir_entity *method)
 {
   int i;
   int n_over = get_entity_n_overwrittenby (method);
@@ -158,7 +158,7 @@ static int add_implementing_graphs (entity *method)
   }
 
   for (i = 0; i < n_over; i ++) {
-    entity *over = get_entity_overwrittenby (method, i);
+    ir_entity *over = get_entity_overwrittenby (method, i);
     change |= add_implementing_graphs (over);
   }
 
@@ -176,7 +176,7 @@ static void rta_act (ir_node *node, void *env)
   opcode op = get_irn_opcode (node);
 
   if (iro_Call == op) {         /* CALL */
-    entity *ent = NULL;
+    ir_entity *ent = NULL;
 
     ir_node *ptr = get_Call_ptr (node);
 
@@ -249,7 +249,7 @@ static int rta_fill_incremental (void)
 
   for (i = 0; i < get_irp_n_irgs(); i++) {
     ir_graph *graph = get_irp_irg (i);
-    entity *ent = get_irg_entity (graph);
+    ir_entity *ent = get_irg_entity (graph);
 
     if ((visibility_external_visible == get_entity_visibility (ent)) ||
         (stickyness_sticky == get_entity_stickyness (ent))) {
@@ -322,18 +322,18 @@ static int stats (void)
    entity that used to inherit this entity's graph is now abstract.
 */
 /* Since we *know* that this entity will not be called, this is OK. */
-static void force_description (entity *ent, entity *addr)
+static void force_description (ir_entity *ent, ir_entity *addr)
 {
   int i, n_over = get_entity_n_overwrittenby (ent);
 
   set_entity_peculiarity (ent, peculiarity_description);
 
   for (i = 0; i < n_over; i ++) {
-    entity *over = get_entity_overwrittenby (ent, i);
+    ir_entity *over = get_entity_overwrittenby (ent, i);
 
     if (peculiarity_inherited == get_entity_peculiarity (over)) {
       /* We rely on the fact that cse is performed on the const_code_irg. */
-      entity *my_addr = get_SymConst_entity(get_atomic_ent_value(over));
+      ir_entity *my_addr = get_SymConst_entity(get_atomic_ent_value(over));
 
       if (addr == my_addr) {
         force_description (over, addr);
@@ -341,7 +341,7 @@ static void force_description (entity *ent, entity *addr)
     } else if (peculiarity_existent == get_entity_peculiarity (over)) {
       /* check whether 'over' forces 'inheritance' of *our* graph: */
       ir_node *f_addr = get_atomic_ent_value (over);
-      entity *impl_ent = get_SymConst_entity (f_addr);
+      ir_entity *impl_ent = get_SymConst_entity (f_addr);
 
       assert ((get_irn_op(f_addr) == op_SymConst) && "can't do complex addrs");
       if (impl_ent == addr) {
@@ -443,7 +443,7 @@ void rta_init (int do_verbose)
  */
 static void make_entity_to_description(type_or_ent *tore, void *env) {
   if (get_kind(tore) == k_entity) {
-    entity *ent = (entity *)tore;
+    ir_entity *ent = (ir_entity *)tore;
 
     if ((is_Method_type(get_entity_type(ent)))                        &&
         (get_entity_peculiarity(ent) != peculiarity_description)      &&
@@ -482,7 +482,7 @@ void rta_delete_dead_graphs (void)
       /* do nothing (except some debugging fprintf`s :-) */
     } else {
 # ifdef DEBUG_libfirm
-      entity *ent = get_irg_entity (graph);
+      ir_entity *ent = get_irg_entity (graph);
       assert (visibility_external_visible != get_entity_visibility (ent));
 # endif /* defined DEBUG_libfirm */
 
@@ -562,6 +562,9 @@ void rta_report (void)
 
 /*
  * $Log$
+ * Revision 1.39  2006/12/13 13:15:12  beck
+ * renamed entity -> ir_entity
+ *
  * Revision 1.38  2006/12/12 16:12:05  beck
  * Fixed missing initialization
  *

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index df2d1ff..bbfa608 100644 (file)
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -577,7 +577,7 @@ new_bd_Free(dbg_info *db, ir_node *block, ir_node *store,
 
 static ir_node *
 new_bd_Sel(dbg_info *db, ir_node *block, ir_node *store, ir_node *objptr,
-           int arity, ir_node **in, entity *ent)
+           int arity, ir_node **in, ir_entity *ent)
 {
   ir_node  **r_in;
   ir_node  *res;
@@ -1197,7 +1197,7 @@ new_rd_Free(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
 
 ir_node *
 new_rd_simpleSel(dbg_info *db, ir_graph *irg, ir_node *block,
-                  ir_node *store, ir_node *objptr, entity *ent)
+                  ir_node *store, ir_node *objptr, ir_entity *ent)
 {
   ir_node  *res;
   ir_graph *rem = current_ir_graph;
@@ -1211,7 +1211,7 @@ new_rd_simpleSel(dbg_info *db, ir_graph *irg, ir_node *block,
 
 ir_node *
 new_rd_Sel(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store, ir_node *objptr,
-           int arity, ir_node **in, entity *ent)
+           int arity, ir_node **in, ir_entity *ent)
 {
   ir_node  *res;
   ir_graph *rem = current_ir_graph;
@@ -1245,14 +1245,14 @@ new_rd_SymConst(dbg_info *db, ir_graph *irg, ir_node *block, symconst_symbol val
   return res;
 }  /* new_rd_SymConst */
 
-ir_node *new_rd_SymConst_addr_ent(dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_addr_ent(dbg_info *db, ir_graph *irg, ir_entity *symbol, ir_type *tp)
 {
   symconst_symbol sym;
   sym.entity_p = symbol;
   return new_rd_SymConst_type(db, irg, get_irg_start_block(irg), sym, symconst_addr_ent, tp);
 }  /* new_rd_SymConst_addr_ent */
 
-ir_node *new_rd_SymConst_ofs_ent(dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_ofs_ent(dbg_info *db, ir_graph *irg, ir_entity *symbol, ir_type *tp)
 {
   symconst_symbol sym;
   sym.entity_p = symbol;
@@ -1531,12 +1531,12 @@ ir_node *new_r_SymConst (ir_graph *irg, ir_node *block,
   return new_rd_SymConst(NULL, irg, block, value, symkind);
 }
 ir_node *new_r_simpleSel(ir_graph *irg, ir_node *block, ir_node *store,
-                         ir_node *objptr, entity *ent) {
+                         ir_node *objptr, ir_entity *ent) {
   return new_rd_Sel(NULL, irg, block, store, objptr, 0, NULL, ent);
 }
 ir_node *new_r_Sel    (ir_graph *irg, ir_node *block, ir_node *store,
                   ir_node *objptr, int n_index, ir_node **index,
-                  entity *ent) {
+                  ir_entity *ent) {
   return new_rd_Sel(NULL, irg, block, store, objptr, n_index, index, ent);
 }
 ir_node *new_r_Call   (ir_graph *irg, ir_node *block, ir_node *store,
@@ -2850,7 +2850,7 @@ new_d_Free(dbg_info *db, ir_node *store, ir_node *ptr,
 }
 
 ir_node *
-new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, entity *ent)
+new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, ir_entity *ent)
 /* GL: objptr was called frame before.  Frame was a bad choice for the name
    as the operand could as well be a pointer to a dynamic object. */
 {
@@ -2859,7 +2859,7 @@ new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, entity *ent)
 }  /* new_d_simpleSel */
 
 ir_node *
-new_d_Sel(dbg_info *db, ir_node *store, ir_node *objptr, int n_index, ir_node **index, entity *sel)
+new_d_Sel(dbg_info *db, ir_node *store, ir_node *objptr, int n_index, ir_node **index, ir_entity *sel)
 {
   return new_bd_Sel(db, current_ir_graph->current_block,
             store, objptr, n_index, index, sel);
@@ -3211,11 +3211,11 @@ ir_node *new_SymConst_type (symconst_symbol value, symconst_kind kind, ir_type *
 ir_node *new_SymConst (symconst_symbol value, symconst_kind kind) {
   return new_d_SymConst(NULL, value, kind);
 }
-ir_node *new_simpleSel(ir_node *store, ir_node *objptr, entity *ent) {
+ir_node *new_simpleSel(ir_node *store, ir_node *objptr, ir_entity *ent) {
   return new_d_simpleSel(NULL, store, objptr, ent);
 }
 ir_node *new_Sel    (ir_node *store, ir_node *objptr, int arity, ir_node **in,
-                     entity *ent) {
+                     ir_entity *ent) {
   return new_d_Sel(NULL, store, objptr, arity, in, ent);
 }
 ir_node *new_Call   (ir_node *store, ir_node *callee, int arity, ir_node **in,

diff --git a/ir/ir/ircons.h b/ir/ir/ircons.h
index d792e4b..6ecce2f 100644 (file)
--- a/ir/ir/ircons.h
+++ b/ir/ir/ircons.h
@@ -255,9 +255,9 @@
  *    ir_node *new_Return   (ir_node *store, int arity, ir_node **in);
  *    ir_node *new_Const    (ir_mode *mode, tarval *con);
  *    ir_node *new_SymConst (symconst_symbol value, symconst_kind kind);
- *    ir_node *new_simpleSel (ir_node *store, ir_node *objptr, entity *ent);
+ *    ir_node *new_simpleSel (ir_node *store, ir_node *objptr, ir_entity *ent);
  *    ir_node *new_Sel    (ir_node *store, ir_node *objptr, int arity,
- *                         ir_node **in, entity *ent);
+ *                         ir_node **in, ir_entity *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);
@@ -566,8 +566,8 @@
  *
  *    ---------------
  *
- *    ir_node *new_simpleSel (ir_node *store, ir_node *frame, entity *sel)
- *    --------------------------------------------------------------------
+ *    ir_node *new_simpleSel (ir_node *store, ir_node *frame, ir_entity *sel)
+ *    -----------------------------------------------------------------------
  *
  *
  *    Selects an entity from a compound type. This entity can be a field or
@@ -591,8 +591,8 @@
  *
  *    ir_node *new_Sel (ir_node *store, ir_node *frame, int arity, ir_node **in,
  *    --------------------------------------------------------------------------
- *                      entity *sel)
- *                      ------------
+ *                      ir_entity *sel)
+ *                      ---------------
  *
  *    Selects a field from an array type.  The entity has as owner the array, as
  *    type the arrays element type.  The indices to access an array element are
@@ -1225,7 +1225,7 @@ ir_node *new_rd_Return (dbg_info *db, ir_graph *irg, ir_node *block,
  * @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, ir_type *tp);
+                            ir_mode *mode, tarval *con, ir_type *tp);
 
 /** Constructor for a Const node.
  *
@@ -1240,7 +1240,7 @@ ir_node *new_rd_Const_type (dbg_info *db, ir_graph *irg, ir_node *block,
  * @param *con   Points to an entry in the constant table.
  */
 ir_node *new_rd_Const  (dbg_info *db, ir_graph *irg, ir_node *block,
-               ir_mode *mode, tarval *con);
+                        ir_mode *mode, tarval *con);
 
 /** Constructor for a SymConst_type node.
  *
@@ -1277,27 +1277,27 @@ ir_node *new_rd_Const  (dbg_info *db, ir_graph *irg, ir_node *block,
  * @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, ir_type *tp);
+                                          symconst_kind symkind, ir_type *tp);
 
 /** Constructor for a SymConst node.
  *
  *  Same as new_rd_SymConst_type, except that it sets the type to type_unknown. */
 ir_node *new_rd_SymConst (dbg_info *db, ir_graph *irg, ir_node *block,
-                         union symconst_symbol value, symconst_kind symkind);
+                                     union symconst_symbol value, symconst_kind symkind);
 
 /** Constructor for a SymConst addr_ent 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_ent (dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp);
+ir_node *new_rd_SymConst_addr_ent (dbg_info *db, ir_graph *irg, ir_entity *symbol, ir_type *tp);
 
 /** Constructor for a SymConst ofs_ent node.
  *
  * Same as new_rd_SymConst_type, except that the constructor is tailored for
  * symconst_ofs_ent.
  * Adds the SymConst to the start block of irg. */
-ir_node *new_rd_SymConst_ofs_ent (dbg_info *db, ir_graph *irg, entity *symbol, ir_type *tp);
+ir_node *new_rd_SymConst_ofs_ent (dbg_info *db, ir_graph *irg, ir_entity *symbol, ir_type *tp);
 
 /** Constructor for a SymConst addr_name node.
  *
@@ -1343,7 +1343,7 @@ ir_node *new_rd_SymConst_align (dbg_info *db, ir_graph *irg, ir_type *symbol, ir
  * @param   *ent       The entity to select.
  */
 ir_node *new_rd_simpleSel (dbg_info *db, ir_graph *irg, ir_node *block,
-                  ir_node *store, ir_node *objptr, entity *ent);
+                           ir_node *store, ir_node *objptr, ir_entity *ent);
 
 /** Constructor for a Sel node.
  *
@@ -1366,7 +1366,7 @@ ir_node *new_rd_simpleSel (dbg_info *db, ir_graph *irg, ir_node *block,
  * @param   *ent       The entity to select.
  */
 ir_node *new_rd_Sel    (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *store,
-                       ir_node *objptr, int n_index, ir_node *index[], entity *ent);
+                                   ir_node *objptr, int n_index, ir_node *index[], ir_entity *ent);
 
 /** Constructor for a Call node.
  *
@@ -1382,7 +1382,7 @@ ir_node *new_rd_Sel    (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[], ir_type *tp);
+                                   ir_node *callee, int arity, ir_node *in[], ir_type *tp);
 
 /** Constructor for a Add node.
  *
@@ -1394,7 +1394,7 @@ ir_node *new_rd_Call   (dbg_info *db, ir_graph *irg, ir_node *block, ir_node *st
  * @param   *mode  The mode of the operands and the result.
  */
 ir_node *new_rd_Add    (dbg_info *db, ir_graph *irg, ir_node *block,
-                       ir_node *op1, ir_node *op2, ir_mode *mode);
+                                   ir_node *op1, ir_node *op2, ir_mode *mode);
 
 /** Constructor for a Sub node.
  *
@@ -1406,7 +1406,7 @@ ir_node *new_rd_Add    (dbg_info *db, ir_graph *irg, ir_node *block,
  * @param   *mode  The mode of the operands and the result.
  */
 ir_node *new_rd_Sub    (dbg_info *db, ir_graph *irg, ir_node *block,
-                       ir_node *op1, ir_node *op2, ir_mode *mode);
+                                   ir_node *op1, ir_node *op2, ir_mode *mode);
 
 /** Constructor for a Minus node.
  *
@@ -2144,7 +2144,7 @@ ir_node *new_r_SymConst (ir_graph *irg, ir_node *block,
  * @param   *ent       The entity to select.
  */
 ir_node *new_r_simpleSel(ir_graph *irg, ir_node *block, ir_node *store,
-                         ir_node *objptr, entity *ent);
+                         ir_node *objptr, ir_entity *ent);
 
 /** Constructor for a Sel node.
  *
@@ -2167,7 +2167,7 @@ ir_node *new_r_simpleSel(ir_graph *irg, ir_node *block, ir_node *store,
  */
 ir_node *new_r_Sel    (ir_graph *irg, ir_node *block, ir_node *store,
                        ir_node *objptr, int n_index, ir_node *index[],
-               entity *ent);
+               ir_entity *ent);
 
 /** Constructor for a Call node.
  *
@@ -2923,7 +2923,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, ir_entity *ent);
 
 /** Constructor for a Sel node.
  *
@@ -2945,7 +2945,7 @@ ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, entity *
  * @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[],
-                     entity *ent);
+                       ir_entity *ent);
 
 /** Constructor for a Call node.
  *
@@ -3254,7 +3254,7 @@ ir_node *new_d_Store  (dbg_info *db, ir_node *store, ir_node *addr, ir_node *val
  * @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, ir_type *alloc_type,
-                     where_alloc where);
+                       where_alloc where);
 
  /** Constructor for a Free node.
  *
@@ -3709,7 +3709,7 @@ ir_node *new_SymConst (union symconst_symbol value, symconst_kind kind);
  * @param   *objptr    The object from that the Sel operation selects a single attribute out.
  * @param   *ent       The entity to select.
  */
-ir_node *new_simpleSel(ir_node *store, ir_node *objptr, entity *ent);
+ir_node *new_simpleSel(ir_node *store, ir_node *objptr, ir_entity *ent);
 
 /** Constructor for a Sel node.
  *
@@ -3730,7 +3730,7 @@ ir_node *new_simpleSel(ir_node *store, ir_node *objptr, entity *ent);
  * @param   *ent       The entity to select.
  */
 ir_node *new_Sel    (ir_node *store, ir_node *objptr, int arity, ir_node *in[],
-                     entity *ent);
+                     ir_entity *ent);
 
 /** Constructor for a Call node.
  *
@@ -3744,7 +3744,7 @@ ir_node *new_Sel    (ir_node *store, ir_node *objptr, int arity, ir_node *in[],
  * @param   *tp     Type information of the procedure called.
  */
 ir_node *new_Call   (ir_node *store, ir_node *callee, int arity, ir_node *in[],
-                    ir_type *tp);
+                            ir_type *tp);
 
 /** Constructor for a CallBegin node.
  *
@@ -4029,7 +4029,7 @@ ir_node *new_Alloc  (ir_node *store, ir_node *size, ir_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,
-                    ir_type *free_type, where_alloc where);
+                            ir_type *free_type, where_alloc where);
 
 /** Constructor for a Sync node.
  *