* 1750a.md, arm.c, clipper.c, clipper.md: Use GEN_INT consistently.

        * convex.h, dsp16xx.c, fx80.md, gmicro.c, gmicro.md: Likewise.
        * i370.h, i370.md, i860.c, i860.h, i860.md, i960.c: Likewise.
        * i960.h, i960.md, m32r.md, m68k.md, m68kv4.h, m88k.c: Likewise.
        * m88k.md, ns32k.c, ns32k.md, pdp11.c, pdp11.h, pdp11.md: Likewise.
        * pyr.c, pyr.h, pyr.md, romp.c, romp.h, romp.md: Likewise.
        * rs6000.md, sparc.c, sparc.h, sparc.md, spur.c, spur.md: Likewise.
        * tahoe.md, vax.h, vax.md, we32k.c, we32k.h, we32k.md: Likewise.
        * md.texi: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18927 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 43 insertions, 61 deletions

diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index 67df28e5940..b1250e5e61b 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -596,8 +596,7 @@ block_move_loop (dest, dest_mem, src, src_mem, size, align)
 	   GET_MODE_NAME (mode), MOVSTR_LOOP, units * align);
   entry_name = get_identifier (entry);
 
-  offset_rtx = gen_rtx (CONST_INT, VOIDmode,
-			MOVSTR_LOOP + (1 - units) * align);
+  offset_rtx = GEN_INT (MOVSTR_LOOP + (1 - units) * align);
 
   value_rtx = gen_rtx (MEM, MEM_IN_STRUCT_P (src_mem) ? mode : BLKmode,
 		       gen_rtx (PLUS, Pmode,
@@ -611,7 +610,7 @@ block_move_loop (dest, dest_mem, src, src_mem, size, align)
 	     (gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (entry_name)),
 	      dest, src, offset_rtx, value_rtx,
 	      gen_rtx (REG, mode, ((units & 1) ? 4 : 5)),
-	      gen_rtx (CONST_INT, VOIDmode, count)));
+	      GEN_INT (count)));
 
   if (remainder)
     block_move_sequence (gen_rtx (REG, Pmode, 2), dest_mem,
@@ -654,7 +653,7 @@ block_move_no_loop (dest, dest_mem, src, src_mem, size, align)
 	   GET_MODE_NAME (mode), most, size - remainder);
   entry_name = get_identifier (entry);
 
-  offset_rtx = gen_rtx (CONST_INT, VOIDmode, most - (size - remainder));
+  offset_rtx = GEN_INT (most - (size - remainder));
 
   value_rtx = gen_rtx (MEM, MEM_IN_STRUCT_P (src_mem) ? mode : BLKmode,
 		       gen_rtx (PLUS, Pmode,
@@ -732,7 +731,7 @@ block_move_sequence (dest, dest_mem, src, src_mem, size, align, offset)
 	  srcp = gen_rtx (MEM,
 			  MEM_IN_STRUCT_P (src_mem) ? mode[next] : BLKmode,
 			  gen_rtx (PLUS, Pmode, src,
-				   gen_rtx (CONST_INT, SImode, offset_ld)));
+				   GEN_INT (offset_ld)));
 	  RTX_UNCHANGING_P (srcp) = RTX_UNCHANGING_P (src_mem);
 	  MEM_VOLATILE_P (srcp) = MEM_VOLATILE_P (src_mem);
 	  MEM_IN_STRUCT_P (srcp) = MEM_IN_STRUCT_P (src_mem);
@@ -747,7 +746,7 @@ block_move_sequence (dest, dest_mem, src, src_mem, size, align, offset)
 	  dstp = gen_rtx (MEM,
 			  MEM_IN_STRUCT_P (dest_mem) ? mode[phase] : BLKmode,
 			  gen_rtx (PLUS, Pmode, dest,
-				   gen_rtx (CONST_INT, SImode, offset_st)));
+				   GEN_INT (offset_st)));
 	  RTX_UNCHANGING_P (dstp) = RTX_UNCHANGING_P (dest_mem);
 	  MEM_VOLATILE_P (dstp) = MEM_VOLATILE_P (dest_mem);
 	  MEM_IN_STRUCT_P (dstp) = MEM_IN_STRUCT_P (dest_mem);
@@ -2102,7 +2101,7 @@ emit_add (dstreg, srcreg, amount)
      rtx srcreg;
      int amount;
 {
-  rtx incr = gen_rtx (CONST_INT, VOIDmode, abs (amount));
+  rtx incr = GEN_INT (abs (amount));
   if (! ADD_INTVAL (amount))
     {
       rtx temp = gen_rtx (REG, SImode, TEMP_REGNUM);
@@ -2229,7 +2228,7 @@ emit_ldst (store_p, regno, mode, offset)
     {
       /* offset is too large for immediate index must use register */
 
-      rtx disp = gen_rtx (CONST_INT, VOIDmode, offset);
+      rtx disp = GEN_INT (offset);
       rtx temp = gen_rtx (REG, SImode, TEMP_REGNUM);
       rtx regi = gen_rtx (PLUS, SImode, stack_pointer_rtx, temp);
       emit_move_insn (temp, disp);
@@ -2599,7 +2598,7 @@ m88k_builtin_saveregs (arglist)
     {
       fixed = (XINT (current_function_arg_offset_rtx, 0)
 	       + argadj) / UNITS_PER_WORD;
-      argsize = gen_rtx (CONST_INT, VOIDmode, fixed);
+      argsize = GEN_INT (fixed);
     }
   else
     {
@@ -2728,7 +2727,7 @@ emit_bcnd (op, label)
 	{
 	  if (SMALL_INTVAL (-value))
 	    emit_insn (gen_addsi3 (zero, reg,
-				   gen_rtx (CONST_INT, VOIDmode, -value)));
+				   GEN_INT (-value)));
 	  else
 	    emit_insn (gen_xorsi3 (zero, reg, constant));
 
diff --git a/gcc/config/m88k/m88k.md b/gcc/config/m88k/m88k.md
index bf5124b2244..54ec6486773 100644
--- a/gcc/config/m88k/m88k.md
+++ b/gcc/config/m88k/m88k.md
@@ -367,8 +367,7 @@
   "mak_mask_p (INTVAL (operands[3]) >> INTVAL (operands[2]))"
   "*
 {
-  operands[4] = gen_rtx (CONST_INT, SImode,
-			 exact_log2 (1 + (INTVAL (operands[3])
+  operands[4] = GEN_INT (exact_log2 (1 + (INTVAL (operands[3])
 					  >> INTVAL(operands[2]))));
   return \"mak %0,%1,%4<%2>\";
 }"
@@ -386,8 +385,7 @@
   "*
 {
   operands[2]
-    = gen_rtx (CONST_INT, SImode,
-	       ((1 << INTVAL (operands[2])) - 1) << INTVAL (operands[4]));
+    = GEN_INT (((1 << INTVAL (operands[2])) - 1) << INTVAL (operands[4]));
   return output_and (operands);
 }"
   [(set_attr "type" "marith")]) ; arith,bit,marith.  length is 1 or 2.
@@ -448,8 +446,7 @@
        int cv2 = condition_value (operands[3]);
 
        operands[4] = gen_rtx (ROTATE, CCmode, operands[4],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       ((cv2 & ~1) - (cv1 & ~1)) & 0x1f));
+			      GEN_INT (((cv2 & ~1) - (cv1 & ~1)) & 0x1f));
        /* Reverse the condition if needed.  */
        if ((cv1 & 1) != (cv2 & 1))
 	 operands[4] = gen_rtx (NOT, CCmode, operands[4]);
@@ -482,8 +479,7 @@
        int cv2 = condition_value (operands[3]);
 
        operands[4] = gen_rtx (ROTATE, CCmode, operands[4],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       (cv2 - cv1) & 0x1f));
+			      GEN_INT ((cv2 - cv1) & 0x1f));
      }")
 
 (define_split
@@ -514,8 +510,7 @@
        int cv2 = condition_value (operands[3]);
 
        operands[2] = gen_rtx (ROTATE, CCmode, operands[2],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       ((cv1 & ~1) - (cv2 & ~1)) & 0x1f));
+			      GEN_INT (((cv1 & ~1) - (cv2 & ~1)) & 0x1f));
      }")
 
 (define_split
@@ -603,8 +598,7 @@
        int cv1 = condition_value (operands[1]);
        int cv2 = condition_value (operands[3]);
        operands[4] = gen_rtx (ROTATE, CCmode, operands[4],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       ((cv2 & ~1) - (cv1 & ~1)) & 0x1f));
+			      GEN_INT (((cv2 & ~1) - (cv1 & ~1)) & 0x1f));
        /* Reverse the condition if needed.  */
        if ((cv1 & 1) != (cv2 & 1))
 	 operands[4] = gen_rtx (NOT, CCmode, operands[4]);
@@ -636,8 +630,7 @@
        int cv1 = condition_value (operands[1]);
        int cv2 = condition_value (operands[3]);
        operands[4] = gen_rtx (ROTATE, CCmode, operands[4],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       (cv2 - cv1) & 0x1f));
+			      GEN_INT ((cv2 - cv1) & 0x1f));
      }")
 
 (define_split
@@ -667,8 +660,7 @@
        int cv1 = condition_value (operands[1]);
        int cv2 = condition_value (operands[3]);
        operands[2] = gen_rtx (ROTATE, CCmode, operands[2],
-			      gen_rtx (CONST_INT, VOIDmode,
-				       ((cv1 & ~1) - (cv2 & ~1)) & 0x1f));
+			      GEN_INT (((cv1 & ~1) - (cv2 & ~1)) & 0x1f));
      }")
 
 (define_split
@@ -2892,7 +2884,7 @@
       if (INTVAL (op1) < 0)
 	{
 	  neg = TRUE;
-	  op1 = gen_rtx (CONST_INT, VOIDmode, -INTVAL (op1));
+	  op1 = GEN_INT (-INTVAL (op1));
 	}
       op1 = force_reg (SImode, op1);
 
@@ -2924,7 +2916,7 @@
       if (INTVAL (op2) < 0)
 	{
 	  neg = TRUE;
-	  op2 = gen_rtx (CONST_INT, VOIDmode, -INTVAL (op2));
+	  op2 = GEN_INT (-INTVAL (op2));
 	}
       else if (! SMALL_INT (operands[2]))
 	op2 = force_reg (SImode, op2);
@@ -3204,10 +3196,9 @@
 	     || integer_ok_for_set (~value)))
 	{
 	  emit_insn (gen_andsi3 (operands[0], operands[1],
-				 gen_rtx (CONST_INT, VOIDmode,
-					  value | 0xffff)));
+				 GEN_INT (value | 0xffff)));
 	  operands[1] = operands[0];
-	  operands[2] = gen_rtx (CONST_INT, VOIDmode, value | 0xffff0000);
+	  operands[2] = GEN_INT (value | 0xffff0000);
 	}
     }
 }")
@@ -3276,10 +3267,9 @@
 	     || integer_ok_for_set (value)))
 	{
 	  emit_insn (gen_iorsi3 (operands[0], operands[1],
-				 gen_rtx (CONST_INT, VOIDmode,
-					  value & 0xffff0000)));
+				 GEN_INT (value & 0xffff0000)));
 	  operands[1] = operands[0];
-	  operands[2] = gen_rtx (CONST_INT, VOIDmode, value & 0xffff);
+	  operands[2] = GEN_INT (value & 0xffff);
 	}
     }
 }")
@@ -3351,10 +3341,9 @@
 	     || (value & 0xffff) == 0))
 	{
 	  emit_insn (gen_xorsi3 (operands[0], operands[1],
-				 gen_rtx (CONST_INT, VOIDmode,
-					  value & 0xffff0000)));
+				 GEN_INT (value & 0xffff0000)));
 	  operands[1] = operands[0];
-	  operands[2] = gen_rtx (CONST_INT, VOIDmode, value & 0xffff);
+	  operands[2] = GEN_INT (value & 0xffff);
 	}
     }
 }")
@@ -3487,7 +3476,7 @@
 	{
 	  if (TARGET_TRAP_LARGE_SHIFT)
 	    emit_insn (gen_tbnd (force_reg (SImode, operands[2]),
-				 gen_rtx (CONST_INT, VOIDmode, 31)));
+				 GEN_INT (31)));
 	  else
 	    emit_move_insn (operands[0], const0_rtx);
 	  DONE;
@@ -3495,12 +3484,12 @@
     }
 
   else if (TARGET_TRAP_LARGE_SHIFT)
-    emit_insn (gen_tbnd (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+    emit_insn (gen_tbnd (operands[2], GEN_INT (31)));
 
   else if (TARGET_HANDLE_LARGE_SHIFT)
     {
       rtx reg = gen_reg_rtx (SImode);
-      emit_insn (gen_cmpsi (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+      emit_insn (gen_cmpsi (operands[2], GEN_INT (31)));
       emit_insn (gen_sleu (reg));
       emit_insn (gen_andsi3 (reg, operands[1], reg));
       operands[1] = reg;
@@ -3531,21 +3520,21 @@
 	  if (TARGET_TRAP_LARGE_SHIFT)
 	    {
 	      emit_insn (gen_tbnd (force_reg (SImode, operands[2]),
-				   gen_rtx (CONST_INT, VOIDmode, 31)));
+				   GEN_INT (31)));
 	      DONE;
 	    }
 	  else
-	    operands[2] = gen_rtx (CONST_INT, VOIDmode, 31);
+	    operands[2] = GEN_INT (31);
 	}
     }
 
   else if (TARGET_TRAP_LARGE_SHIFT)
-    emit_insn (gen_tbnd (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+    emit_insn (gen_tbnd (operands[2], GEN_INT (31)));
 
   else if (TARGET_HANDLE_LARGE_SHIFT)
     {
       rtx reg = gen_reg_rtx (SImode);
-      emit_insn (gen_cmpsi (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+      emit_insn (gen_cmpsi (operands[2], GEN_INT (31)));
       emit_insn (gen_sgtu (reg));
       emit_insn (gen_iorsi3 (reg, operands[2], reg));
       operands[2] = reg;
@@ -3578,7 +3567,7 @@
 	{
 	  if (TARGET_TRAP_LARGE_SHIFT)
 	    emit_insn (gen_tbnd (force_reg (SImode, operands[2]),
-				 gen_rtx (CONST_INT, VOIDmode, 31)));
+				 GEN_INT (31)));
 	  else
 	    emit_move_insn (operands[0], const0_rtx);
 	  DONE;
@@ -3586,12 +3575,12 @@
     }
 
   else if (TARGET_TRAP_LARGE_SHIFT)
-    emit_insn (gen_tbnd (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+    emit_insn (gen_tbnd (operands[2], GEN_INT (31)));
 
   else if (TARGET_HANDLE_LARGE_SHIFT)
     {
       rtx reg = gen_reg_rtx (SImode);
-      emit_insn (gen_cmpsi (operands[2], gen_rtx (CONST_INT, VOIDmode, 31)));
+      emit_insn (gen_cmpsi (operands[2], GEN_INT (31)));
       emit_insn (gen_sleu (reg));
       emit_insn (gen_andsi3 (reg, operands[1], reg));
       operands[1] = reg;
@@ -3619,8 +3608,7 @@
 {
   if (GET_CODE (operands[2]) == CONST_INT
       && (unsigned) INTVAL (operands[2]) >= 32)
-    operands[2] = gen_rtx (CONST_INT, VOIDmode,
-			   (32 - INTVAL (operands[2])) % 32);
+    operands[2] = GEN_INT ((32 - INTVAL (operands[2])) % 32);
   else
     {
       rtx op = gen_reg_rtx (SImode);
@@ -3674,8 +3662,7 @@
   ""
   "*
 {
-  operands[4] = gen_rtx (CONST_INT, SImode,
-			 (32 - INTVAL (operands[2])) - INTVAL (operands[3]));
+  operands[4] = GEN_INT ((32 - INTVAL (operands[2])) - INTVAL (operands[3]));
   return \"ext %0,%1,%2<%4>\";  /* <(32-%2-%3)> */
 }"
   [(set_attr "type" "bit")])
@@ -3696,8 +3683,7 @@
   ""
   "*
 {
-  operands[4] = gen_rtx (CONST_INT, SImode,
-			 (32 - INTVAL (operands[2])) - INTVAL (operands[3]));
+  operands[4] = GEN_INT ((32 - INTVAL (operands[2])) - INTVAL (operands[3]));
   return \"extu %0,%1,%2<%4>\";  /* <(32-%2-%3)> */
 }"
   [(set_attr "type" "bit")])
@@ -3710,8 +3696,7 @@
   ""
   "*
 {
-  operands[3] = gen_rtx (CONST_INT, SImode,
-			 (32 - INTVAL (operands[1])) - INTVAL (operands[2]));
+  operands[3] = GEN_INT ((32 - INTVAL (operands[1])) - INTVAL (operands[2]));
   return \"clr %0,%0,%1<%3>\";  /* <(32-%1-%2)> */
 }"
   [(set_attr "type" "bit")])
@@ -3724,8 +3709,7 @@
   ""
   "*
 {
-  operands[3] = gen_rtx (CONST_INT, SImode,
-			 (32 - INTVAL (operands[1])) - INTVAL (operands[2]));
+  operands[3] = GEN_INT ((32 - INTVAL (operands[1])) - INTVAL (operands[2]));
   return \"set %0,%0,%1<%3>\";  /* <(32-%1-%2)> */
 }"
   [(set_attr "type" "bit")])
@@ -3743,11 +3727,10 @@
   if (INTVAL (operands[1]) < 32)
     value &= (1 << INTVAL (operands[1])) - 1;
 
-  operands[2] = gen_rtx (CONST_INT, VOIDmode,
-			 32 - (INTVAL(operands[1]) + INTVAL(operands[2])));
+  operands[2] = GEN_INT (32 - (INTVAL(operands[1]) + INTVAL(operands[2])));
 
   value <<= INTVAL (operands[2]);
-  operands[3] = gen_rtx (CONST_INT, VOIDmode, value);
+  operands[3] = GEN_INT (value);
 
   if (SMALL_INTVAL (value))
     return \"clr %0,%0,%1<%2>\;or %0,%0,%3\";
@@ -3828,7 +3811,7 @@
   "
 {
   register rtx index_diff = gen_reg_rtx (SImode);
-  register rtx low = gen_rtx (CONST_INT, VOIDmode, -INTVAL (operands[1]));
+  register rtx low = GEN_INT (-INTVAL (operands[1]));
   register rtx label = gen_rtx (LABEL_REF, VOIDmode, operands[3]);
   register rtx base;