X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fweb.c;h=8025e4b7d447f4234828271d17b03e70d1c9dfa6;hb=3c905014c0a13bea5e94c6d41593e991fc22ccea;hp=11f2caa6cd2e4983e57c4495fff06b8d334fc428;hpb=613172207b7ce182da93de2237405652ce34a4d6;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/web.c b/gcc/web.c
index 11f2caa6cd2..8025e4b7d44 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -51,6 +51,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "rtl.h"
 #include "hard-reg-set.h"
 #include "flags.h"
+#include "obstack.h"
 #include "basic-block.h"
 #include "output.h"
 #include "df.h"
@@ -70,9 +71,8 @@ static struct web_entry *unionfind_root (struct web_entry *);
 static void unionfind_union (struct web_entry *, struct web_entry *);
 static void union_defs (struct df *, struct ref *, struct web_entry *, 
                         struct web_entry *);
-static rtx entry_register (struct web_entry *, struct ref *, char *, char *);
+static rtx entry_register (struct web_entry *, struct ref *, char *);
 static void replace_ref (struct ref *, rtx);
-static int mark_addressof (rtx *, void *);
 
 /* Find the root of unionfind tree (the representative of set).  */
 
@@ -160,19 +160,20 @@ union_defs (struct df *df, struct ref *use, struct web_entry *def_entry,
     {
       struct df_link *link = DF_INSN_DEFS (df, DF_REF_INSN (use));
 
-      while (DF_REF_REAL_REG (link->ref) != DF_REF_REAL_REG (use))
-	link = link->next;
-
-      unionfind_union (use_entry + DF_REF_ID (use),
-		       def_entry + DF_REF_ID (link->ref));
+      while (link)
+	{
+	  if (DF_REF_REAL_REG (link->ref) == DF_REF_REAL_REG (use))
+	    unionfind_union (use_entry + DF_REF_ID (use),
+			     def_entry + DF_REF_ID (link->ref));
+	  link = link->next;
+	}
     }
 }
 
 /* Find the corresponding register for the given entry.  */
 
 static rtx
-entry_register (struct web_entry *entry, struct ref *ref, char *used, 
-                char *use_addressof)
+entry_register (struct web_entry *entry, struct ref *ref, char *used)
 {
   struct web_entry *root;
   rtx reg, newreg;
@@ -196,21 +197,11 @@ entry_register (struct web_entry *entry, struct ref *ref, char *used,
 		 "New web forced to keep reg=%i (user variable)\n",
 		 REGNO (reg));
     }
-  else if (use_addressof [REGNO (reg)])
-    {
-      newreg = reg;
-      if (dump_file)
-	fprintf (dump_file,
-		 "New web forced to keep reg=%i (address taken)\n",
-		 REGNO (reg));
-    }
   else
     {
       newreg = gen_reg_rtx (GET_MODE (reg));
       REG_USERVAR_P (newreg) = REG_USERVAR_P (reg);
       REG_POINTER (newreg) = REG_POINTER (reg);
-      REG_LOOP_TEST_P (newreg) = REG_LOOP_TEST_P (reg);
-      RTX_UNCHANGING_P (newreg) = RTX_UNCHANGING_P (reg);
       REG_ATTRS (newreg) = REG_ATTRS (reg);
       if (dump_file)
 	fprintf (dump_file, "Web oldreg=%i newreg=%i\n", REGNO (reg),
@@ -237,19 +228,6 @@ replace_ref (struct ref *ref, rtx reg)
   *loc = reg;
 }
 
-/* Mark each pseudo whose address is taken.  */
-
-static int
-mark_addressof (rtx *rtl, void *data)
-{
-  if (!*rtl)
-    return 0;
-  if (GET_CODE (*rtl) == ADDRESSOF
-      && REG_P (XEXP (*rtl, 0)))
-    ((char *)data)[REGNO (XEXP (*rtl, 0))] = 1;
-  return 0;
-}
-
 /* Main entry point.  */
 
 void
@@ -261,9 +239,6 @@ web_main (void)
   unsigned int i;
   int max = max_reg_num ();
   char *used;
-  char *use_addressof;
-  basic_block bb;
-  rtx insn;
 
   df = df_init ();
   df_analyze (df, 0, DF_UD_CHAIN | DF_EQUIV_NOTES);
@@ -271,7 +246,6 @@ web_main (void)
   def_entry = xcalloc (df->n_defs, sizeof (struct web_entry));
   use_entry = xcalloc (df->n_uses, sizeof (struct web_entry));
   used = xcalloc (max, sizeof (char));
-  use_addressof = xcalloc (max, sizeof (char));
 
   if (dump_file)
     df_dump (df, DF_UD_CHAIN | DF_DU_CHAIN, dump_file);
@@ -280,22 +254,14 @@ web_main (void)
   for (i = 0; i < df->n_uses; i++)
     union_defs (df, df->uses[i], def_entry, use_entry);
 
-  /* We can not safely rename registers whose address is taken.  */
-  FOR_EACH_BB (bb)
-    FOR_BB_INSNS (bb, insn)
-      {
-	if (INSN_P (insn))
-	  for_each_rtx (&PATTERN (insn), mark_addressof, use_addressof);
-      }
-
   /* Update the instruction stream, allocating new registers for split pseudos
      in progress.  */
   for (i = 0; i < df->n_uses; i++)
     replace_ref (df->uses[i], entry_register (use_entry + i, df->uses[i],
-					      used, use_addressof));
+					      used));
   for (i = 0; i < df->n_defs; i++)
     replace_ref (df->defs[i], entry_register (def_entry + i, df->defs[i],
-					      used, use_addressof));
+					      used));
 
   /* Dataflow information is corrupt here, but it can be easily updated
      by creating new entries for new registers and updates or calling
@@ -303,6 +269,5 @@ web_main (void)
   free (def_entry);
   free (use_entry);
   free (used);
-  free (use_addressof);
   df_finish (df);
 }