X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fra-debug.c;h=d060e0487d3a73c911a1a40e4eba385f84e8f46b;hb=60433644567cc227dfe2aaeec0dbab0e53357c46;hp=16d2a589617fa74dbdb54b61e1f39851240c164d;hpb=2985dd16cf3aebea94d9903e8ec9b2177cea207d;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/ra-debug.c b/gcc/ra-debug.c
index 16d2a589617..d060e0487d3 100644
--- a/gcc/ra-debug.c
+++ b/gcc/ra-debug.c
@@ -271,7 +271,7 @@ ra_print_rtx_object (FILE *file, rtx x)
 	       {
 		 rtx sub = SUBREG_REG (x);
 		 int ofs = SUBREG_BYTE (x);
-		 if (GET_CODE (sub) == REG
+		 if (REG_P (sub)
 		     && REGNO (sub) < FIRST_PSEUDO_REGISTER)
 		   {
 		     int regno = REGNO (sub);
@@ -317,10 +317,10 @@ ra_print_rtx_object (FILE *file, rtx x)
       case LABEL_REF:
 		  {
 		    rtx sub = XEXP (x, 0);
-		    if (GET_CODE (sub) == NOTE
+		    if (NOTE_P (sub)
 			&& NOTE_LINE_NUMBER (sub) == NOTE_INSN_DELETED_LABEL)
 		      fprintf (file, "(deleted uid=%d)", INSN_UID (sub));
-		    else if (GET_CODE (sub) == CODE_LABEL)
+		    else if (LABEL_P (sub))
 		      fprintf (file, "L%d", CODE_LABEL_NUMBER (sub));
 		    else
 		      fprintf (file, "(nonlabel uid=%d)", INSN_UID (sub));
@@ -389,9 +389,11 @@ ra_print_rtx (FILE *file, rtx x, int with_pn)
 	    fprintf (file, " %s", GET_NOTE_INSN_NAME (ln));
 	  else
 	    {
-	      fprintf (file, " line %d", ln);
-	      if (NOTE_SOURCE_FILE (x))
-		fprintf (file, ":%s", NOTE_SOURCE_FILE (x));
+	      expanded_location s;
+	      NOTE_EXPANDED_LOCATION (s, x);
+	      fprintf (file, " line %d", s.line);
+	      if (s.file != NULL)
+		fprintf (file, ":%s", s.file);
 	    }
 	}
       else
@@ -564,7 +566,7 @@ ra_debug_insns (rtx insn, int num)
       insn = PREV_INSN (insn);
   for (i = count; i > 0 && insn; insn = NEXT_INSN (insn), i--)
     {
-      if (GET_CODE (insn) == CODE_LABEL)
+      if (LABEL_P (insn))
 	fprintf (stderr, "\n");
       ra_print_rtx_top (stderr, insn, (i == count || i == 1));
     }
@@ -584,7 +586,7 @@ ra_print_rtl_with_bb (FILE *file, rtx insn)
   last_bb = NULL;
   for (; insn; insn = NEXT_INSN (insn))
     {
-      if (GET_CODE (insn) == BARRIER)
+      if (BARRIER_P (insn))
 	bb = NULL;
       else
 	bb = BLOCK_FOR_INSN (insn);
@@ -596,9 +598,9 @@ ra_print_rtl_with_bb (FILE *file, rtx insn)
 	    fprintf (file, ";; Begin of basic block %d\n", bb->index);
 	  last_bb = bb;
 	}
-      if (GET_CODE (insn) == CODE_LABEL)
+      if (LABEL_P (insn))
 	fputc ('\n', file);
-      if (GET_CODE (insn) == NOTE)
+      if (NOTE_P (insn))
 	{
 	  /* Ignore basic block and maybe other notes not referencing
 	     deleted things.  */
@@ -802,7 +804,7 @@ dump_constraints (void)
   if (!dump_file || (debug_new_regalloc & DUMP_CONSTRAINTS) == 0)
     return;
   for (i = FIRST_PSEUDO_REGISTER; i < ra_max_regno; i++)
-    if (regno_reg_rtx[i] && GET_CODE (regno_reg_rtx[i]) == REG)
+    if (regno_reg_rtx[i] && REG_P (regno_reg_rtx[i]))
       REGNO (regno_reg_rtx[i])
 	  = ra_reg_renumber[i] >= 0 ? ra_reg_renumber[i] : i;
   for (insn = get_insns (); insn; insn = NEXT_INSN (insn))
@@ -840,7 +842,7 @@ dump_constraints (void)
 	ra_debug_msg (DUMP_CONSTRAINTS, "\n");
       }
   for (i = FIRST_PSEUDO_REGISTER; i < ra_max_regno; i++)
-    if (regno_reg_rtx[i] && GET_CODE (regno_reg_rtx[i]) == REG)
+    if (regno_reg_rtx[i] && REG_P (regno_reg_rtx[i]))
       REGNO (regno_reg_rtx[i]) = i;
 }
 
@@ -941,10 +943,11 @@ dump_static_insn_cost (FILE *file, const char *message, const char *prefix)
 	      if (rtx_equal_p (src, dest))
 		pcost = &selfcopy;
 	      else if (GET_CODE (src) == GET_CODE (dest)
-		       && ((GET_CODE (src) == REG)
+		       && ((REG_P (src))
 			   || (GET_CODE (src) == SUBREG
-			       && GET_CODE (SUBREG_REG (src)) == REG
-			       && GET_CODE (SUBREG_REG (dest)) == REG)))
+			       && REG_P (SUBREG_REG (src))
+			       && REG_P (SUBREG_REG (dest)))))
+		/* XXX is dest guaranteed to be a subreg? */
 		pcost = &regcopy;
 	      else
 		{
@@ -952,10 +955,10 @@ dump_static_insn_cost (FILE *file, const char *message, const char *prefix)
 		    src = SUBREG_REG (src);
 		  if (GET_CODE (dest) == SUBREG)
 		    dest = SUBREG_REG (dest);
-		  if (GET_CODE (src) == MEM && GET_CODE (dest) != MEM
+		  if (MEM_P (src) && !MEM_P (dest)
 		      && memref_is_stack_slot (src))
 		    pcost = &load;
-		  else if (GET_CODE (src) != MEM && GET_CODE (dest) == MEM
+		  else if (!MEM_P (src) && MEM_P (dest)
 			   && memref_is_stack_slot (dest))
 		    pcost = &store;
 		}