* g++.dg/lookup/new1.C: Fix dg-excess-error syntax.

[pf3gnuchains/gcc-fork.git] / gcc / genemit.c

diff --git a/gcc/genemit.c b/gcc/genemit.c
index 16440c5..1198123 100644 (file)
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -243,6 +243,10 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used)
        printf ("const1_rtx");
       else if (INTVAL (x) == -1)
        printf ("constm1_rtx");
+      else if (-MAX_SAVED_CONST_INT <= INTVAL (x)
+         && INTVAL (x) <= MAX_SAVED_CONST_INT)
+       printf ("const_int_rtx[MAX_SAVED_CONST_INT + (%d)]",
+               (int) INTVAL (x));
       else if (INTVAL (x) == STORE_FLAG_VALUE)
        printf ("const_true_rtx");
       else
@@ -317,7 +321,7 @@ gen_insn (rtx insn, int lineno)
          if (GET_CODE (XVECEXP (insn, 1, i)) != CLOBBER)
            break;
 
-         if (GET_CODE (XEXP (XVECEXP (insn, 1, i), 0)) == REG)
+         if (REG_P (XEXP (XVECEXP (insn, 1, i), 0)))
            has_hard_reg = 1;
          else if (GET_CODE (XEXP (XVECEXP (insn, 1, i), 0)) != MATCH_SCRATCH)
            break;
@@ -351,7 +355,7 @@ gen_insn (rtx insn, int lineno)
                  if (! (GET_MODE (old) == GET_MODE (new)
                         && ((GET_CODE (old) == MATCH_SCRATCH
                              && GET_CODE (new) == MATCH_SCRATCH)
-                            || (GET_CODE (old) == REG && GET_CODE (new) == REG
+                            || (REG_P (old) && REG_P (new)
                                 && REGNO (old) == REGNO (new)))))
                    break;
                }
@@ -532,7 +536,7 @@ gen_expand (rtx expand)
               || (GET_CODE (next) == PARALLEL
                   && GET_CODE (XVECEXP (next, 0, 0)) == CALL))
        printf ("  emit_call_insn (");
-      else if (GET_CODE (next) == CODE_LABEL)
+      else if (LABEL_P (next))
        printf ("  emit_label (");
       else if (GET_CODE (next) == MATCH_OPERAND
               || GET_CODE (next) == MATCH_DUP
@@ -595,8 +599,9 @@ gen_split (rtx split)
     }
   else
     {
-      printf ("extern rtx gen_split_%d (rtx *);\n", insn_code_number);
-      printf ("rtx\ngen_%s_%d (rtx *operands%s)\n", name, insn_code_number, unused);
+      printf ("extern rtx gen_split_%d (rtx, rtx *);\n", insn_code_number);
+      printf ("rtx\ngen_split_%d (rtx curr_insn ATTRIBUTE_UNUSED, rtx *operands%s)\n", 
+             insn_code_number, unused);
     }
   printf ("{\n");
 
@@ -641,7 +646,7 @@ gen_split (rtx split)
               || (GET_CODE (next) == PARALLEL
                   && GET_CODE (XVECEXP (next, 0, 0)) == CALL))
        printf ("  emit_call_insn (");
-      else if (GET_CODE (next) == CODE_LABEL)
+      else if (LABEL_P (next))
        printf ("  emit_label (");
       else if (GET_CODE (next) == MATCH_OPERAND
               || GET_CODE (next) == MATCH_OPERATOR
@@ -707,9 +712,10 @@ output_add_clobbers (void)
   printf ("}\n");
 }
 \f
-/* Write a function, `added_clobbers_hard_reg_p' this is given an insn_code
-   number that needs clobbers and returns 1 if they include a clobber of a
-   hard reg and 0 if they just clobber SCRATCH.  */
+/* Write a function, `added_clobbers_hard_reg_p' that is given an insn_code
+   number that will have clobbers added (as indicated by `recog') and returns
+   1 if those include a clobber of a hard reg or 0 if all of them just clobber
+   SCRATCH.  */
 
 static void
 output_added_clobbers_hard_reg_p (void)