removed debug traces from infrastructure code

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ibm/git280@264375 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 11 insertions, 179 deletions

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 652cf1fe5ae..dacf27e087c 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -2553,12 +2553,6 @@ replace_equiv_address (rtx memref, rtx addr, bool inplace)
   /* change_address_1 copies the memory attribute structure without change
      and that's exactly what we want here.  */
   update_temp_slot_address (XEXP (memref, 0), addr);
-
-  if (dump_file) {
-    fprintf (dump_file, "kelvin says replace_equiv_address is looking at\n");
-    print_rtl (dump_file, addr);
-  }
-
   return change_address_1 (memref, VOIDmode, addr, 1, inplace);
 }
 
diff --git a/gcc/explow.c b/gcc/explow.c
index 17a9b0c050e..9a6182ac5c5 100644
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -297,29 +297,6 @@ convert_memory_address_addr_space_1 (scalar_int_mode to_mode ATTRIBUTE_UNUSED,
 				     bool no_emit ATTRIBUTE_UNUSED)
 {
 #ifndef POINTERS_EXTEND_UNSIGNED
-
-  if (dump_file) {
-    fprintf (dump_file, "convert_memory_address_addr_space_1\n");
-    fprintf (dump_file, " x: ");
-    print_rtl (dump_file, x);
-    fprintf (dump_file, "\n");
-    fprintf (dump_file, " to_mode: %d, VOIDMode: %d\n", (int) to_mode, VOIDmode);
-    fprintf (dump_file, " in case you're curious, V2DFmode: %d\n", E_V2DFmode);
-    fprintf (dump_file, " GET_MODE (x): %d\n", GET_MODE (x));
-  }
-  /* kelvin finds that following gcc_assert is failing because
-   *
-   * x: (mem:v2DF (reg:DI 191) [0 S16 A8])
-   *
-   * i'm guessing that 61 means V2DF.
-   *
-   * what is 10?
-   *
-   * where did to_mode come from?
-   *
-   *  GET_MODE (x): 61, to_mode: 10, VOIDmode: 0.
-   */
-
   gcc_assert (GET_MODE (x) == to_mode || GET_MODE (x) == VOIDmode);
   return x;
 #else /* defined(POINTERS_EXTEND_UNSIGNED) */
@@ -436,50 +413,22 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
   rtx oldx = x;
   scalar_int_mode address_mode = targetm.addr_space.address_mode (as);
 
-  if (dump_file) {
-    fprintf (dump_file, "memory_address_addr_space is calling ");
-    fprintf (dump_file, "convert_memory_address_addr_space with to_mode %d\n",
-	     (int) address_mode);
-    fprintf (dump_file, " x: ");
-    print_rtl (dump_file, x);
-    fprintf (dump_file, "\n");
-  }
-
   x = convert_memory_address_addr_space (address_mode, x, as);
 
-  if (dump_file) {
-    fprintf (dump_file, "Back from convert_memory_address_addr_space, x:\n");
-    print_rtl (dump_file, x);
-    fprintf (dump_file, "\n");
-  }
-
-
   /* By passing constant addresses through registers
      we get a chance to cse them.  */
-  if (! cse_not_expected && CONSTANT_P (x) && CONSTANT_ADDRESS_P (x)) {
+  if (! cse_not_expected && CONSTANT_P (x) && CONSTANT_ADDRESS_P (x))
     x = force_reg (address_mode, x);
 
-    if (dump_file) {	/* kelvin bracketed this else if clause */
-      fprintf (dump_file, "did top force_reg!, x: ");
-      print_rtl (dump_file, x);
-      fprintf (dump_file, "\n");
-    }
-  }
   /* We get better cse by rejecting indirect addressing at this stage.
      Let the combiner create indirect addresses where appropriate.
      For now, generate the code so that the subexpressions useful to share
      are visible.  But not if cse won't be done!  */
   else
     {
-      if (! cse_not_expected && !REG_P (x)) {
+      if (! cse_not_expected && !REG_P (x))
 	x = break_out_memory_refs (x);
 
-	if (dump_file) {	/* kelvin bracketed this else if clause */
-	  fprintf (dump_file, "did break_out_memory_refs, x: ");
-	  print_rtl (dump_file, x);
-	  fprintf (dump_file, "\n");
-	}
-      }
       /* At this point, any valid address is accepted.  */
       if (memory_address_addr_space_p (mode, x, as))
 	goto done;
@@ -489,12 +438,6 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
       if (memory_address_addr_space_p (mode, oldx, as))
 	{
 	  x = oldx;
-
-	  if (dump_file) {
-	    fprintf (dump_file, "x got oldx, x: ");
-	    print_rtl (dump_file, x);
-	    fprintf (dump_file, "\n");
-	  }
 	  goto done;
 	}
 
@@ -505,13 +448,6 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
       {
 	rtx orig_x = x;
 	x = targetm.addr_space.legitimize_address (x, oldx, mode, as);
-
-	if (dump_file) {
-	  fprintf (dump_file, "legitimize is illegitimate, new x: ");
-	  print_rtl (dump_file, x);
-	  fprintf (dump_file, "\n");
-	}
-
 	if (orig_x != x && memory_address_addr_space_p (mode, x, as))
 	  goto done;
       }
@@ -540,46 +476,20 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
 	      else
 		x = y;
 	    }
-
-	  if (dump_file) {
-	    fprintf (dump_file, "dealing with PLUS, x:: ");
-	    print_rtl (dump_file, x);
-	    fprintf (dump_file, "\n");
-	  }
-
 	}
 
-      else if (GET_CODE (x) == MULT || GET_CODE (x) == MINUS) {
+      else if (GET_CODE (x) == MULT || GET_CODE (x) == MINUS)
 	x = force_operand (x, NULL_RTX);
 
-	if (dump_file) {	/* kelvin bracketed this else if clause */
-	  fprintf (dump_file, "MULT/MINUS, force_operand, x: ");
-	  print_rtl (dump_file, x);
-	  fprintf (dump_file, "\n");
-	}
-      }
       /* If we have a register that's an invalid address,
 	 it must be a hard reg of the wrong class.  Copy it to a pseudo.  */
-      else if (REG_P (x)) {
+      else if (REG_P (x))
 	x = copy_to_reg (x);
 
-	if (dump_file) {	/* kelvin bracketed this else if clause */
-	  fprintf (dump_file, "just did copy_to_reg!, x: ");
-	  print_rtl (dump_file, x);
-	  fprintf (dump_file, "\n");
-	}
-      }
       /* Last resort: copy the value to a register, since
 	 the register is a valid address.  */
-      else {
+      else
 	x = force_reg (address_mode, x);
-
-	if (dump_file) {	/* kelvin bracketed this else if clause */
-	  fprintf (dump_file, "just did force_reg!, x: ");
-	  print_rtl (dump_file, x);
-	  fprintf (dump_file, "\n");
-	}
-      }
     }
 
  done:
@@ -587,15 +497,6 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
   gcc_assert (memory_address_addr_space_p (mode, x, as));
   /* If we didn't change the address, we are done.  Otherwise, mark
      a reg as a pointer if we have REG or REG + CONST_INT.  */
-
-  if (dump_file) {
-    fprintf (dump_file, "kelvin is unhappy!\n");
-    fprintf (dump_file, "  address space is: %d\n", as);
-    fprintf (dump_file, "  my addr is: ");
-    print_rtl (dump_file, x);
-    fprintf (dump_file, "\n  why would anyone think this is a PLUS?\n");
-  }
-
   if (oldx == x)
     return x;
   else if (REG_P (x))
@@ -609,14 +510,6 @@ memory_address_addr_space (machine_mode mode, rtx x, addr_space_t as)
      to indicate that X is now used.  */
   update_temp_slot_address (oldx, x);
 
-  if (dump_file) {
-    fprintf (dump_file, "kelvin after update_temp_slot_address\n");
-    fprintf (dump_file, "  address space is: %d\n", as);
-    fprintf (dump_file, "  my addr is: ");
-    print_rtl (dump_file, x);
-    fprintf (dump_file, "\n");
-  }
-
   return x;
 }
 
diff --git a/gcc/function.c b/gcc/function.c
index 1f1032dbf27..dee303cdbdd 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -1096,24 +1096,9 @@ update_temp_slot_address (rtx old_rtx, rtx new_rtx)
 {
   struct temp_slot *p;
 
-  if (dump_file) {
-    fprintf (dump_file, "kelvin says update_temp_slot_address is screwing me\n");
-    /* wrong: by the time i get here, the new-rtx already has
-       incorrect value.  */
-    fprintf (dump_file, "old_rtx: ");
-    print_rtl (dump_file, old_rtx);
-    fprintf (dump_file, "\nnew_rtx: ");
-    print_rtl (dump_file, new_rtx);
-    fprintf (dump_file, "\n");
-  }
-
   if (rtx_equal_p (old_rtx, new_rtx))
     return;
 
-  if (dump_file) {
-    fprintf (dump_file, "kelvin says !rtx_equal_p\n");
-  }
-
   p = find_temp_slot_from_address (old_rtx);
 
   /* If we didn't find one, see if both OLD_RTX is a PLUS.  If so, and
@@ -1148,10 +1133,6 @@ update_temp_slot_address (rtx old_rtx, rtx new_rtx)
       return;
     }
 
-  if (dump_file) {
-    fprintf (dump_file, "kelvin trying to insert_temp_slot_address\n");
-  }
-
   /* Otherwise add an alias for the temp's address.  */
   insert_temp_slot_address (new_rtx, p);
 }
diff --git a/gcc/web.c b/gcc/web.c
index 6fd36316bd8..1bbb8f32562 100644
--- a/gcc/web.c
+++ b/gcc/web.c
@@ -400,54 +400,18 @@ pass_web::execute (function *fun)
 	{
 	  struct df_insn_info *insn_info = DF_INSN_INFO_GET (insn);
 	  df_ref def, use;
-	  FOR_EACH_INSN_INFO_USE (use, insn_info) {
-	    if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) {
-	      if (dump_file) {
-		/* Apparently, in this phase, the only pseudo registers
-		   that are supposed to be here are the results of "splits",
-		   and my newly introduced pseudo register does not fit the
-		   bill.  */
-		fprintf (dump_file, "A: kelvin web @insn %d, "
-			 "uses def %d from insn %d\n",
-			 INSN_UID (insn), DF_REF_ID (use),
-			 INSN_UID (DF_REF_INSN (use)));
-	      }
+	  FOR_EACH_INSN_INFO_USE (use, insn_info)
+	    if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER)
 	      replace_ref (use, entry_register (use_entry + DF_REF_ID (use),
 						use, used));
-	    }
-	  }
-	  FOR_EACH_INSN_INFO_EQ_USE (use, insn_info) {
-	    if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) {
-	      if (dump_file) {
-		/* Apparently, in this phase, the only pseudo registers
-		   that are supposed to be here are the results of "splits",
-		   and my newly introduced pseudo register does not fit the
-		   bill.  */
-		fprintf (dump_file, "A: kelvin web @insn %d, "
-			 "uses def %d from insn %d\n",
-			 INSN_UID (insn), DF_REF_ID (use),
-			 INSN_UID (DF_REF_INSN (use)));
-	      }
+	  FOR_EACH_INSN_INFO_EQ_USE (use, insn_info)
+	    if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER)
 	      replace_ref (use, entry_register (use_entry + DF_REF_ID (use),
 						use, used));
-	    }
-	  }
-	  FOR_EACH_INSN_INFO_DEF (def, insn_info) {
-	    if (dump_file) {
-	      /* Apparently, in this phase, the only pseudo registers
-		 that are supposed to be here are the results of "splits",
-		 and my newly introduced pseudo register does not fit the
-		 bill.  */
-	      fprintf (dump_file, "C: kelvin web @insn %d uses "
-		       "def %d from insn %d\n",
-		       INSN_UID (DF_REF_INSN (def)), DF_REF_ID (def),
-		       INSN_UID (insn));
-	    }
-	    if (DF_REF_REGNO (def) >= FIRST_PSEUDO_REGISTER) {
+	  FOR_EACH_INSN_INFO_DEF (def, insn_info)
+	    if (DF_REF_REGNO (def) >= FIRST_PSEUDO_REGISTER)
 	      replace_ref (def, entry_register (def_entry + DF_REF_ID (def),
 						def, used));
-	    }
-	  }
 	}
 
   free (def_entry);