1750a.md, [...]: Use GEN_INT consistently.

        * 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.

From-SVN: r18927

3 files changed, 29 insertions, 45 deletions

diff --git a/gcc/config/we32k/we32k.c b/gcc/config/we32k/we32k.c
index 3dceb07e8c9..0c02686d703 100644
--- a/gcc/config/we32k/we32k.c
+++ b/gcc/config/we32k/we32k.c
@@ -1,6 +1,6 @@
 /* Subroutines for insn-output.c for AT&T we32000 Family.
    Contributed by John Wehle (john@feith1.uucp)
-   Copyright (C) 1991-1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -20,8 +20,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include <stdio.h>
 #include "config.h"
+#include <stdio.h>
 #include "rtl.h"
 #include "real.h"
 
@@ -85,10 +85,8 @@ output_move_double (operands)
     }
   else if (GET_CODE (operands[1]) == CONST_DOUBLE)
     {
-      lsw_operands[1] = gen_rtx (CONST_INT, SImode,
-				 CONST_DOUBLE_HIGH (operands[1]));
-      operands[1] = gen_rtx (CONST_INT, SImode,
-			     CONST_DOUBLE_LOW (operands[1]));
+      lsw_operands[1] = GEN_INT (CONST_DOUBLE_HIGH (operands[1]));
+      operands[1] = GEN_INT (CONST_DOUBLE_LOW (operands[1]));
     }
   else if (GET_CODE (operands[1]) == CONST_INT)
     {
@@ -122,10 +120,8 @@ output_push_double (operands)
     lsw_operands[0] = adj_offsettable_operand (operands[0], 4);
   else if (GET_CODE (operands[0]) == CONST_DOUBLE)
     {
-      lsw_operands[0] = gen_rtx (CONST_INT, SImode,
-				 CONST_DOUBLE_HIGH (operands[0]));
-      operands[0] = gen_rtx (CONST_INT, SImode,
-			     CONST_DOUBLE_LOW (operands[0]));
+      lsw_operands[0] = GEN_INT (CONST_DOUBLE_HIGH (operands[0]));
+      operands[0] = GEN_INT (CONST_DOUBLE_LOW (operands[0]));
     }
   else if (GET_CODE (operands[0]) == CONST_INT)
     { 
diff --git a/gcc/config/we32k/we32k.h b/gcc/config/we32k/we32k.h
index 8d8593bc26b..07f00107d59 100644
--- a/gcc/config/we32k/we32k.h
+++ b/gcc/config/we32k/we32k.h
@@ -480,11 +480,11 @@ enum reg_class { NO_REGS, GENERAL_REGS,
 
 #define TRAMPOLINE_TEMPLATE(FILE)					\
 {									\
-  ASM_OUTPUT_SHORT (FILE, gen_rtx (CONST_INT, VOIDmode, 0x844f));	\
+  ASM_OUTPUT_SHORT (FILE, GEN_INT (0x844f));				\
   ASM_OUTPUT_SHORT (FILE, const0_rtx);					\
   ASM_OUTPUT_SHORT (FILE, const0_rtx);					\
-  ASM_OUTPUT_CHAR (FILE, gen_rtx (CONST_INT, VOIDmode, 0x48));		\
-  ASM_OUTPUT_SHORT (FILE, gen_rtx (CONST_INT, VOIDmode, 0x247f));	\
+  ASM_OUTPUT_CHAR (FILE, GEN_INT (0x48));				\
+  ASM_OUTPUT_SHORT (FILE, GEN_INT (0x247f));				\
   ASM_OUTPUT_SHORT (FILE, const0_rtx);					\
   ASM_OUTPUT_SHORT (FILE, const0_rtx);					\
 }
diff --git a/gcc/config/we32k/we32k.md b/gcc/config/we32k/we32k.md
index 216b1ff04e2..9d85a1026db 100644
--- a/gcc/config/we32k/we32k.md
+++ b/gcc/config/we32k/we32k.md
@@ -140,10 +140,8 @@
     else
       if (GET_CODE (operands[2]) == CONST_DOUBLE)
         {
-        lsw_operands[2] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[2]));
-        operands[2] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[2]));
+        lsw_operands[2] = GEN_INT (CONST_DOUBLE_HIGH(operands[2]));
+        operands[2] = GEN_INT (CONST_DOUBLE_LOW(operands[2]));
         }
       else
         if (GET_CODE (operands[2]) == CONST_INT)
@@ -192,10 +190,8 @@
     else
       if (GET_CODE (operands[1]) == CONST_DOUBLE)
         {
-        lsw_operands[1] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[1]));
-        operands[1] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[1]));
+        lsw_operands[1] = GEN_INT (CONST_DOUBLE_HIGH(operands[1]));
+        operands[1] = GEN_INT (CONST_DOUBLE_LOW(operands[1]));
         }
       else
         if (GET_CODE (operands[1]) == CONST_INT)
@@ -214,10 +210,8 @@
     else
       if (GET_CODE (operands[2]) == CONST_DOUBLE)
         {
-        lsw_operands[2] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[2]));
-        operands[2] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[2]));
+        lsw_operands[2] = GEN_INT (CONST_DOUBLE_HIGH(operands[2]));
+        operands[2] = GEN_INT (CONST_DOUBLE_LOW(operands[2]));
         }
       else
         if (GET_CODE (operands[2]) == CONST_INT)
@@ -310,10 +304,8 @@
     else
       if (GET_CODE (operands[2]) == CONST_DOUBLE)
         {
-        lsw_operands[2] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[2]));
-        operands[2] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[2]));
+        lsw_operands[2] = GEN_INT (CONST_DOUBLE_HIGH(operands[2]));
+        operands[2] = GEN_INT (CONST_DOUBLE_LOW(operands[2]));
         }
       else
         if (GET_CODE (operands[2]) == CONST_INT)
@@ -362,10 +354,8 @@
     else
       if (GET_CODE (operands[1]) == CONST_DOUBLE)
         {
-        lsw_operands[1] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[1]));
-        operands[1] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[1]));
+        lsw_operands[1] = GEN_INT (CONST_DOUBLE_HIGH(operands[1]));
+        operands[1] = GEN_INT (CONST_DOUBLE_LOW(operands[1]));
         }
       else
         if (GET_CODE (operands[1]) == CONST_INT)
@@ -384,10 +374,8 @@
     else
       if (GET_CODE (operands[2]) == CONST_DOUBLE)
         {
-        lsw_operands[2] = gen_rtx(CONST_INT, SImode,
-                                  CONST_DOUBLE_HIGH(operands[2]));
-        operands[2] = gen_rtx(CONST_INT, SImode,
-                              CONST_DOUBLE_LOW(operands[2]));
+        lsw_operands[2] = GEN_INT (CONST_DOUBLE_HIGH(operands[2]));
+        operands[2] = GEN_INT (CONST_DOUBLE_LOW(operands[2]));
         }
       else
         if (GET_CODE (operands[2]) == CONST_INT)
@@ -770,7 +758,7 @@
 
   if (GET_CODE (operands[1]) == CONST_INT &&
     ((unsigned long)INTVAL (operands[1]) & 0x8000L))
-    operands[1] = gen_rtx(CONST_INT, SImode, INTVAL(operands[1]) | 0xffff0000L);
+    operands[1] = GEN_INT (INTVAL(operands[1]) | 0xffff0000L);
 
   output_asm_insn(\"CMPH %1, %0\",operands);
 
@@ -786,7 +774,7 @@
 
   if (GET_CODE (operands[1]) == CONST_INT &&
     ((unsigned long)INTVAL (operands[1]) & 0x80L))
-    operands[1] = gen_rtx(CONST_INT, SImode, INTVAL(operands[1]) | 0xffffff00L);
+    operands[1] = GEN_INT (INTVAL(operands[1]) | 0xffffff00L);
 
   output_asm_insn(\"CMPB {sbyte}%1, {sbyte}%0\",operands);
 
@@ -910,7 +898,7 @@
   "*
   {
 
-  operands[2] = gen_rtx(CONST_INT, SImode, INTVAL(operands[2]) - 1);
+  operands[2] = GEN_INT (INTVAL(operands[2]) - 1);
   output_asm_insn(\"EXTFW %2, %3, %1, %0\",operands);
 
   return \"\";
@@ -925,7 +913,7 @@
   "*
   {
 
-  operands[2] = gen_rtx(CONST_INT, SImode, INTVAL(operands[2]) - 1);
+  operands[2] = GEN_INT (INTVAL(operands[2]) - 1);
   output_asm_insn(\"EXTFH %2, %3, {uhalf}%1, {uword}%0\",operands);
 
   return \"\";
@@ -940,7 +928,7 @@
   "*
   {
 
-  operands[2] = gen_rtx(CONST_INT, SImode, INTVAL(operands[2]) - 1);
+  operands[2] = GEN_INT (INTVAL(operands[2]) - 1);
   output_asm_insn(\"EXTFB %2, %3, {ubyte}%1, {uword}%0\",operands);
 
   return \"\";
@@ -955,7 +943,7 @@
   "*
   {
 
-  operands[1] = gen_rtx(CONST_INT, SImode, INTVAL(operands[1]) - 1);
+  operands[1] = GEN_INT (INTVAL(operands[1]) - 1);
   output_asm_insn(\"INSFW %1, %2, %3, %0\",operands);
 
   return \"\";
@@ -970,7 +958,7 @@
   "*
   {
 
-  operands[1] = gen_rtx(CONST_INT, SImode, INTVAL(operands[1]) - 1);
+  operands[1] = GEN_INT (INTVAL(operands[1]) - 1);
   output_asm_insn(\"INSFH %1, %2, {uword}%3, {uhalf}%0\",operands);
 
   return \"\";
@@ -985,7 +973,7 @@
   "*
   {
 
-  operands[1] = gen_rtx(CONST_INT, SImode, INTVAL(operands[1]) - 1);
+  operands[1] = GEN_INT (INTVAL(operands[1]) - 1);
   output_asm_insn(\"INSFB %1, %2, {uword}%3, {ubyte}%0\",operands);
 
   return \"\";