ra.h (enum node_type): Rename to: (enum ra_node_type).

	* ra.h (enum node_type): Rename to:
	(enum ra_node_type).
	* ra-colorize.c: Likewise.

From-SVN: r85202

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8b9d02ae28bc3dfcf36eefec55dbb439b1da6c8..37f22c8c27e538653d4a725e2a8d329762a0994a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-26  J"orn Rennecke <joern.rennecke@superh.com>
+
+       * ra.h (enum node_type): Rename to:
+       (enum ra_node_type).
+       * ra-colorize.c: Likewise.
+
 2004-07-26  Richard Sandiford  <rsandifo@redhat.com>
 
        * cfgcleanup.c (try_simplify_condjump): Call update_forwarder_flag

diff --git a/gcc/ra-colorize.c b/gcc/ra-colorize.c
index 4411f00de6a7362f9b4646d957ed0caf1f634376..3d248fa40ea6e69ffc5063d4a095444f15af695d 100644 (file)
--- a/gcc/ra-colorize.c
+++ b/gcc/ra-colorize.c
@@ -50,7 +50,7 @@
 static void push_list (struct dlist *, struct dlist **);
 static void push_list_end (struct dlist *, struct dlist **);
 static void free_dlist (struct dlist **);
-static void put_web_at_end (struct web *, enum node_type);
+static void put_web_at_end (struct web *, enum ra_node_type);
 static void put_move (struct move *, enum move_type);
 static void build_worklists (struct df *);
 static void enable_move (struct web *);
@@ -61,7 +61,7 @@ static void remove_move (struct web *, struct move *);
 static void add_worklist (struct web *);
 static int ok (struct web *, struct web *);
 static int conservative (struct web *, struct web *);
-static inline unsigned int simplify_p (enum node_type);
+static inline unsigned int simplify_p (enum ra_node_type);
 static void combine (struct web *, struct web *);
 static void coalesce (void);
 static void freeze_moves (struct web *);
@@ -168,7 +168,7 @@ free_dlist (struct dlist **list)
    Inline, because it's called with constant TYPE every time.  */
 
 inline void
-put_web (struct web *web, enum node_type type)
+put_web (struct web *web, enum ra_node_type type)
 {
   switch (type)
     {
@@ -260,7 +260,7 @@ reset_lists (void)
    list.  Additionally TYPE may not be SIMPLIFY.  */
 
 static void
-put_web_at_end (struct web *web, enum node_type type)
+put_web_at_end (struct web *web, enum ra_node_type type)
 {
   if (type == PRECOLORED)
     type = INITIAL;
@@ -683,7 +683,7 @@ alias (struct web *web)
    SIMPLIFY types.  */
 
 static inline unsigned int
-simplify_p (enum node_type type)
+simplify_p (enum ra_node_type type)
 {
   return type == SIMPLIFY || type == SIMPLIFY_SPILL || type == SIMPLIFY_FAT;
 }

diff --git a/gcc/ra.h b/gcc/ra.h
index 19a627d1930987b20239520f6ad35c4b4fdc54f8..2e2fa408989c69041d5e97248b51ab10cde334b7 100644 (file)
--- a/gcc/ra.h
+++ b/gcc/ra.h
@@ -43,7 +43,7 @@ struct dlist
 #define DLIST_MOVE(l) ((l)->value.move)
 
 /* Classification of a given node (i.e. what state it's in).  */
-enum node_type
+enum ra_node_type
 {
   INITIAL = 0, FREE,
   PRECOLORED,
@@ -214,7 +214,7 @@ struct web
   unsigned int have_orig_conflicts:1;
 
   /* Current state of the node.  */
-  ENUM_BITFIELD(node_type) type:5;
+  ENUM_BITFIELD(ra_node_type) type:5;
 
   /* A regclass, combined from preferred and alternate class, or calculated
      from usable_regs.  Used only for debugging, and to determine
@@ -623,7 +623,7 @@ extern struct dlist * pop_list (struct dlist **);
 extern void record_conflict (struct web *, struct web *);
 extern int memref_is_stack_slot (rtx);
 extern void build_i_graph (struct df *);
-extern void put_web (struct web *, enum node_type);
+extern void put_web (struct web *, enum ra_node_type);
 extern void remove_web_from_list (struct web *);
 extern void reset_lists (void);
 extern struct web * alias (struct web *);