arm.c, [...]: Replace "gen_rtx (FOO, " with "gen_rtx_FOO (".

	* config/arm/arm.c, config/arm/arm.h, config/arm/arm.md,
	config/arm/linux-gas.h, config/arm/netbsd-elf.h,
	config/arm/netbsd.h, config/arm/pe.c, config/avr/avr.c,
	config/avr/avr.h, config/avr/avr.md, config/c4x/c4x.h,
	config/cris/cris.h, config/fr30/fr30.h, config/frv/frv.c,
	config/frv/frv.h, config/ip2k/ip2k.c, config/iq2000/iq2000.c,
	config/iq2000/iq2000.h, config/m32r/m32r.c,
	config/m68hc11/m68hc11.c, config/m68hc11/m68hc11.h,
	config/m68hc11/m68hc11.md, config/m68k/m68k.md,
	config/mcore/mcore.c, config/mcore/mcore.h,
	config/mcore/mcore.md, config/mips/mips.c,
	config/ns32k/ns32k.h, config/ns32k/ns32k.md,
	config/rs6000/rs6000.c, config/s390/s390.c,
	config/s390/s390.md, config/sparc/sparc.c, config/v850/v850.c,
	config/xtensa/xtensa.h, config/xtensa/xtensa.md: Replace
	"gen_rtx (FOO, " with "gen_rtx_FOO (".

From-SVN: r77080

3 files changed, 79 insertions, 79 deletions

diff --git a/gcc/config/mcore/mcore.c b/gcc/config/mcore/mcore.c
index 0a503f0..ba7ad40 100644
--- a/gcc/config/mcore/mcore.c
+++ b/gcc/config/mcore/mcore.c
@@ -207,14 +207,14 @@ output_stack_adjust (int direction, int size)
   /* If extending stack a lot, we do it incrementally.  */
   if (direction < 0 && size > mcore_stack_increment && mcore_stack_increment > 0)
     {
-      rtx tmp = gen_rtx (REG, SImode, 1);
+      rtx tmp = gen_rtx_REG (SImode, 1);
       rtx memref;
 
       emit_insn (gen_movsi (tmp, GEN_INT (mcore_stack_increment)));
       do
 	{
 	  emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, tmp));
-	  memref = gen_rtx (MEM, SImode, stack_pointer_rtx);
+	  memref = gen_rtx_MEM (SImode, stack_pointer_rtx);
 	  MEM_VOLATILE_P (memref) = 1;
 	  emit_insn (gen_movsi (memref, stack_pointer_rtx));
 	  size -= mcore_stack_increment;
@@ -232,7 +232,7 @@ output_stack_adjust (int direction, int size)
 
       if (size > 32)
 	{
-	  rtx nval = gen_rtx (REG, SImode, 1);
+	  rtx nval = gen_rtx_REG (SImode, 1);
 	  emit_insn (gen_movsi (nval, val));
 	  val = nval;
 	}
@@ -550,7 +550,7 @@ mcore_gen_compare_reg (enum rtx_code code)
 {
   rtx op0 = arch_compare_op0;
   rtx op1 = arch_compare_op1;
-  rtx cc_reg = gen_rtx (REG, CCmode, CC_REG);
+  rtx cc_reg = gen_rtx_REG (CCmode, CC_REG);
 
   if (CONSTANT_P (op1) && GET_CODE (op1) != CONST_INT)
     op1 = force_reg (SImode, op1);
@@ -623,7 +623,7 @@ mcore_gen_compare_reg (enum rtx_code code)
       break;
     }
 
-  emit_insn (gen_rtx (SET, VOIDmode, cc_reg, gen_rtx (code, CCmode, op0, op1)));
+  emit_insn (gen_rtx_SET (VOIDmode, cc_reg, gen_rtx (code, CCmode, op0, op1)));
   
   return cc_reg;
 }
@@ -1641,14 +1641,14 @@ mcore_expand_insv (rtx operands[])
       if ((INTVAL(operands[3])&1) == 0)
 	{
 	  mask = ~(1 << posn);
-	  emit_insn (gen_rtx (SET, SImode, operands[0],
-			      gen_rtx (AND, SImode, operands[0], GEN_INT (mask))));
+	  emit_insn (gen_rtx_SET (SImode, operands[0],
+			      gen_rtx_AND (SImode, operands[0], GEN_INT (mask))));
 	}
       else
 	{
 	  mask = 1 << posn;
-	  emit_insn (gen_rtx (SET, SImode, operands[0],
-			    gen_rtx (IOR, SImode, operands[0], GEN_INT (mask))));
+	  emit_insn (gen_rtx_SET (SImode, operands[0],
+			    gen_rtx_IOR (SImode, operands[0], GEN_INT (mask))));
 	}
       
       return 1;
@@ -1677,8 +1677,8 @@ mcore_expand_insv (rtx operands[])
       INTVAL (operands[3]) == ((1 << width) - 1))
     {
       mreg = force_reg (SImode, GEN_INT (INTVAL (operands[3]) << posn));
-      emit_insn (gen_rtx (SET, SImode, operands[0],
-                         gen_rtx (IOR, SImode, operands[0], mreg)));
+      emit_insn (gen_rtx_SET (SImode, operands[0],
+                         gen_rtx_IOR (SImode, operands[0], mreg)));
       return 1;
     }
 
@@ -1686,8 +1686,8 @@ mcore_expand_insv (rtx operands[])
   mreg = force_reg (SImode, GEN_INT (~(((1 << width) - 1) << posn)));
 
   /* Clear the field, to overlay it later with the source.  */
-  emit_insn (gen_rtx (SET, SImode, operands[0], 
-		      gen_rtx (AND, SImode, operands[0], mreg)));
+  emit_insn (gen_rtx_SET (SImode, operands[0], 
+		      gen_rtx_AND (SImode, operands[0], mreg)));
 
   /* If the source is constant 0, we've nothing to add back.  */
   if (GET_CODE (operands[3]) == CONST_INT && INTVAL (operands[3]) == 0)
@@ -1706,17 +1706,17 @@ mcore_expand_insv (rtx operands[])
   if (width + posn != (int) GET_MODE_SIZE (SImode))
     {
       ereg = force_reg (SImode, GEN_INT ((1 << width) - 1));      
-      emit_insn (gen_rtx (SET, SImode, sreg,
-                          gen_rtx (AND, SImode, sreg, ereg)));
+      emit_insn (gen_rtx_SET (SImode, sreg,
+                          gen_rtx_AND (SImode, sreg, ereg)));
     }
 
   /* Insert source value in dest.  */
   if (posn != 0)
-    emit_insn (gen_rtx (SET, SImode, sreg,
-		        gen_rtx (ASHIFT, SImode, sreg, GEN_INT (posn))));
+    emit_insn (gen_rtx_SET (SImode, sreg,
+		        gen_rtx_ASHIFT (SImode, sreg, GEN_INT (posn))));
   
-  emit_insn (gen_rtx (SET, SImode, operands[0],
-		      gen_rtx (IOR, SImode, operands[0], sreg)));
+  emit_insn (gen_rtx_SET (SImode, operands[0],
+		      gen_rtx_IOR (SImode, operands[0], sreg)));
 
   return 1;
 }
@@ -1870,19 +1870,19 @@ block_move_sequence (rtx dest, rtx dst_mem, rtx src, rtx src_mem,
 	    }
 	  
 	  size -= amount[next];
-	  srcp = gen_rtx (MEM,
+	  srcp = gen_rtx_MEM (
 #if 0
 			  MEM_IN_STRUCT_P (src_mem) ? mode[next] : BLKmode,
 #else
 			  mode[next],
 #endif
-			  gen_rtx (PLUS, Pmode, src,
-				   gen_rtx (CONST_INT, SImode, offset_ld)));
+			  gen_rtx_PLUS (Pmode, src,
+					gen_rtx_CONST_INT (SImode, 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) = 1;
-	  emit_insn (gen_rtx (SET, VOIDmode, temp[next], srcp));
+	  emit_insn (gen_rtx_SET (VOIDmode, temp[next], srcp));
 	  offset_ld += amount[next];
 	  active[next] = TRUE;
 	}
@@ -1891,19 +1891,19 @@ block_move_sequence (rtx dest, rtx dst_mem, rtx src, rtx src_mem,
 	{
 	  active[phase] = FALSE;
 	  
-	  dstp = gen_rtx (MEM,
+	  dstp = gen_rtx_MEM (
 #if 0
 			  MEM_IN_STRUCT_P (dst_mem) ? mode[phase] : BLKmode,
 #else
 			  mode[phase],
 #endif
-			  gen_rtx (PLUS, Pmode, dest,
-				   gen_rtx (CONST_INT, SImode, offset_st)));
+			  gen_rtx_PLUS (Pmode, dest,
+					gen_rtx_CONST_INT (SImode, offset_st)));
 	  
 	  RTX_UNCHANGING_P (dstp) = RTX_UNCHANGING_P (dst_mem);
 	  MEM_VOLATILE_P (dstp) = MEM_VOLATILE_P (dst_mem);
 	  MEM_IN_STRUCT_P (dstp) = 1;
-	  emit_insn (gen_rtx (SET, VOIDmode, dstp, temp[phase]));
+	  emit_insn (gen_rtx_SET (VOIDmode, dstp, temp[phase]));
 	  offset_st += amount[phase];
 	}
     }
@@ -1940,7 +1940,7 @@ mcore_expand_block_move (rtx dst_mem, rtx src_mem, rtx * operands)
     }
 
   /* If we get here, just use the library routine.  */
-  emit_library_call (gen_rtx (SYMBOL_REF, Pmode, "memcpy"), 0, VOIDmode, 3,
+  emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "memcpy"), 0, VOIDmode, 3,
 		     operands[0], Pmode, operands[1], Pmode, operands[2],
 		     SImode);
 }
@@ -2303,9 +2303,9 @@ mcore_expand_prolog (void)
       for (offset = fi.arg_offset; remaining >= 4; offset -= 4, rn--, remaining -= 4)
         {
           emit_insn (gen_movsi
-                     (gen_rtx (MEM, SImode,
+                     (gen_rtx_MEM (SImode,
                                plus_constant (stack_pointer_rtx, offset)),
-                      gen_rtx (REG, SImode, rn)));
+                      gen_rtx_REG (SImode, rn)));
         }
     }
 
@@ -2328,8 +2328,8 @@ mcore_expand_prolog (void)
 	        first_reg--;
 	      first_reg++;
 
-	      emit_insn (gen_store_multiple (gen_rtx (MEM, SImode, stack_pointer_rtx),
-					     gen_rtx (REG, SImode, first_reg),
+	      emit_insn (gen_store_multiple (gen_rtx_MEM (SImode, stack_pointer_rtx),
+					     gen_rtx_REG (SImode, first_reg),
 					     GEN_INT (16 - first_reg)));
 
 	      i -= (15 - first_reg);
@@ -2338,9 +2338,9 @@ mcore_expand_prolog (void)
           else if (fi.reg_mask & (1 << i))
 	    {
 	      emit_insn (gen_movsi
-		         (gen_rtx (MEM, SImode,
+		         (gen_rtx_MEM (SImode,
 			           plus_constant (stack_pointer_rtx, offs)),
-		          gen_rtx (REG, SImode, i)));
+		          gen_rtx_REG (SImode, i)));
 	      offs += 4;
 	    }
         }
@@ -2422,8 +2422,8 @@ mcore_expand_epilog (void)
 	  
 	  first_reg++;
 
-	  emit_insn (gen_load_multiple (gen_rtx (REG, SImode, first_reg),
-					gen_rtx (MEM, SImode, stack_pointer_rtx),
+	  emit_insn (gen_load_multiple (gen_rtx_REG (SImode, first_reg),
+					gen_rtx_MEM (SImode, stack_pointer_rtx),
 					GEN_INT (16 - first_reg)));
 
 	  i -= (15 - first_reg);
@@ -2432,8 +2432,8 @@ mcore_expand_epilog (void)
       else if (fi.reg_mask & (1 << i))
 	{
 	  emit_insn (gen_movsi
-		     (gen_rtx (REG, SImode, i),
-		      gen_rtx (MEM, SImode,
+		     (gen_rtx_REG (SImode, i),
+		      gen_rtx_MEM (SImode,
 			       plus_constant (stack_pointer_rtx, offs))));
 	  offs += 4;
 	}
@@ -3224,7 +3224,7 @@ mcore_mark_dllexport (tree decl)
   idp = get_identifier (newname);
 
   XEXP (DECL_RTL (decl), 0) =
-    gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (idp));
+    gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (idp));
 }
 
 /* Mark a DECL as being dllimport'd.  */
@@ -3285,8 +3285,8 @@ mcore_mark_dllimport (tree decl)
   /* ??? At least I think that's why we do this.  */
   idp = get_identifier (newname);
 
-  newrtl = gen_rtx (MEM, Pmode,
-		    gen_rtx (SYMBOL_REF, Pmode,
+  newrtl = gen_rtx_MEM (Pmode,
+		    gen_rtx_SYMBOL_REF (Pmode,
 			     IDENTIFIER_POINTER (idp)));
   XEXP (DECL_RTL (decl), 0) = newrtl;
 }
@@ -3337,7 +3337,7 @@ mcore_encode_section_info (tree decl, rtx rtl ATTRIBUTE_UNUSED, int first ATTRIB
     {
       const char * oldname = XSTR (XEXP (XEXP (DECL_RTL (decl), 0), 0), 0);
       tree idp = get_identifier (oldname + 9);
-      rtx newrtl = gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (idp));
+      rtx newrtl = gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (idp));
 
       XEXP (DECL_RTL (decl), 0) = newrtl;
 
diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index 4d79e08..56d311c 100644
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -656,7 +656,7 @@ extern const enum reg_class reg_class_from_letter[];
 
 /* Define how to find the value returned by a library function
    assuming the value has mode MODE.  */
-#define LIBCALL_VALUE(MODE)  gen_rtx (REG, MODE, FIRST_RET_REG)
+#define LIBCALL_VALUE(MODE)  gen_rtx_REG (MODE, FIRST_RET_REG)
 
 /* 1 if N is a possible register number for a function value.
    On the MCore, only r4 can return results.  */
@@ -775,9 +775,9 @@ extern const enum reg_class reg_class_from_letter[];
    CXT is an RTX for the static chain value for the function.  */
 #define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT)  \
 {									\
-  emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 8)),	\
+  emit_move_insn (gen_rtx_MEM (SImode, plus_constant ((TRAMP), 8)),	\
 		  (CXT));						\
-  emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 12)),	\
+  emit_move_insn (gen_rtx_MEM (SImode, plus_constant ((TRAMP), 12)),	\
 		  (FNADDR));						\
 }
 
diff --git a/gcc/config/mcore/mcore.md b/gcc/config/mcore/mcore.md
index e10be25..f57da64 100644
--- a/gcc/config/mcore/mcore.md
+++ b/gcc/config/mcore/mcore.md
@@ -1413,13 +1413,13 @@
   count = INTVAL (operands[2]);
   regno = REGNO (operands[0]);
 
-  operands[3] = gen_rtx (PARALLEL, VOIDmode, rtvec_alloc (count));
+  operands[3] = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
 
   for (i = 0; i < count; i++)
     XVECEXP (operands[3], 0, i)
-      = gen_rtx (SET, VOIDmode,
-		 gen_rtx (REG, SImode, regno + i),
-		 gen_rtx (MEM, SImode, plus_constant (stack_pointer_rtx,
+      = gen_rtx_SET (VOIDmode,
+		 gen_rtx_REG (SImode, regno + i),
+		 gen_rtx_MEM (SImode, plus_constant (stack_pointer_rtx,
 						      i * 4)));
 }")
 
@@ -1452,14 +1452,14 @@
   count = INTVAL (operands[2]);
   regno = REGNO (operands[1]);
 
-  operands[3] = gen_rtx (PARALLEL, VOIDmode, rtvec_alloc (count));
+  operands[3] = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
 
   for (i = 0; i < count; i++)
     XVECEXP (operands[3], 0, i)
-      = gen_rtx (SET, VOIDmode,
-		 gen_rtx (MEM, SImode, plus_constant (stack_pointer_rtx,
+      = gen_rtx_SET (VOIDmode,
+		 gen_rtx_MEM (SImode, plus_constant (stack_pointer_rtx,
 						      i * 4)),
-		 gen_rtx (REG, SImode, regno + i));
+		 gen_rtx_REG (SImode, regno + i));
 }")
 
 (define_insn ""
@@ -1729,7 +1729,7 @@
   if (GET_CODE (operands[0]) == MEM
       && ! register_operand (XEXP (operands[0], 0), SImode)
       && ! mcore_symbolic_address_p (XEXP (operands[0], 0)))
-    operands[0] = gen_rtx (MEM, GET_MODE (operands[0]),
+    operands[0] = gen_rtx_MEM (GET_MODE (operands[0]),
 			   force_reg (Pmode, XEXP (operands[0], 0)));
 }")
 
@@ -1751,7 +1751,7 @@
   if (GET_CODE (operands[0]) == MEM
       && ! register_operand (XEXP (operands[0], 0), SImode)
       && ! mcore_symbolic_address_p (XEXP (operands[0], 0)))
-    operands[1] = gen_rtx (MEM, GET_MODE (operands[1]),
+    operands[1] = gen_rtx_MEM (GET_MODE (operands[1]),
 			   force_reg (Pmode, XEXP (operands[1], 0)));
 }")
 
@@ -2627,11 +2627,11 @@
 ;        rtx lshft = GEN_INT (32 - (INTVAL (operands[2]) + INTVAL (operands[3])));
 ;        rtx rshft = GEN_INT (32 - INTVAL (operands[2]));
 ;
-;        emit_insn (gen_rtx (SET, SImode, operands[0], operands[1]));
-;        emit_insn (gen_rtx (SET, SImode, operands[0],
-;                            gen_rtx (ASHIFT, SImode, operands[0], lshft)));
-;        emit_insn (gen_rtx (SET, SImode, operands[0],
-;                            gen_rtx (ASHIFTRT, SImode, operands[0], rshft)));
+;        emit_insn (gen_rtx_SET (SImode, operands[0], operands[1]));
+;        emit_insn (gen_rtx_SET (SImode, operands[0],
+;                            gen_rtx_ASHIFT (SImode, operands[0], lshft)));
+;        emit_insn (gen_rtx_SET (SImode, operands[0],
+;                            gen_rtx_ASHIFTRT (SImode, operands[0], rshft)));
 ;        DONE;
 ;     }
 ;     else
@@ -2662,11 +2662,11 @@
       rtx tmp1 = gen_reg_rtx (SImode);
       rtx tmp2 = gen_reg_rtx (SImode);
 
-      emit_insn (gen_rtx (SET, SImode, tmp1, operands[1]));
-      emit_insn (gen_rtx (SET, SImode, tmp2,
-                         gen_rtx (ASHIFT, SImode, tmp1, lshft)));
-      emit_insn (gen_rtx (SET, SImode, operands[0],
-                         gen_rtx (ASHIFTRT, SImode, tmp2, rshft)));
+      emit_insn (gen_rtx_SET (SImode, tmp1, operands[1]));
+      emit_insn (gen_rtx_SET (SImode, tmp2,
+                         gen_rtx_ASHIFT (SImode, tmp1, lshft)));
+      emit_insn (gen_rtx_SET (SImode, operands[0],
+                         gen_rtx_ASHIFTRT (SImode, tmp2, rshft)));
       DONE;
     }
   else
@@ -2707,11 +2707,11 @@
         {
           rtx rshft = GEN_INT (INTVAL (operands[3]));
           shifted = gen_reg_rtx (SImode);
-          emit_insn (gen_rtx (SET, SImode, shifted,
-                         gen_rtx (LSHIFTRT, SImode, operands[1], rshft)));
+          emit_insn (gen_rtx_SET (SImode, shifted,
+                         gen_rtx_LSHIFTRT (SImode, operands[1], rshft)));
         }
-     emit_insn (gen_rtx (SET, SImode, operands[0],
-                       gen_rtx (AND, SImode, shifted, mask)));
+     emit_insn (gen_rtx_SET (SImode, operands[0],
+                       gen_rtx_AND (SImode, shifted, mask)));
      DONE;
    }
  else if (TARGET_W_FIELD)
@@ -2723,11 +2723,11 @@
      rtx tmp1 = gen_reg_rtx (SImode);
      rtx tmp2 = gen_reg_rtx (SImode);
 
-     emit_insn (gen_rtx (SET, SImode, tmp1, operands[1]));
-     emit_insn (gen_rtx (SET, SImode, tmp2,
-                         gen_rtx (ASHIFT, SImode, tmp1, lshft)));
-     emit_insn (gen_rtx (SET, SImode, operands[0],
-                       gen_rtx (LSHIFTRT, SImode, tmp2, rshft)));
+     emit_insn (gen_rtx_SET (SImode, tmp1, operands[1]));
+     emit_insn (gen_rtx_SET (SImode, tmp2,
+                         gen_rtx_ASHIFT (SImode, tmp1, lshft)));
+     emit_insn (gen_rtx_SET (SImode, operands[0],
+                       gen_rtx_LSHIFTRT (SImode, tmp2, rshft)));
      DONE;
    }
  else
@@ -3072,10 +3072,10 @@
       abort ();
 
    if (ofs > 0) 
-      operands[4] = gen_rtx (MEM, mode, 
-                              gen_rtx (PLUS, SImode, base_reg, GEN_INT(ofs)));
+      operands[4] = gen_rtx_MEM (mode, 
+                              gen_rtx_PLUS (SImode, base_reg, GEN_INT(ofs)));
    else
-      operands[4] = gen_rtx (MEM, mode, base_reg);
+      operands[4] = gen_rtx_MEM (mode, base_reg);
 
    if (mode == QImode)
       return \"movi	%0,0\\n\\tst.b	%0,%4\";
@@ -3284,7 +3284,7 @@
 	  emit_insn (gen_movsi (tmp, GEN_INT (STACK_UNITS_MAXSTEP)));
 	  do
 	    {
-	      rtx memref = gen_rtx (MEM, SImode, stack_pointer_rtx);
+	      rtx memref = gen_rtx_MEM (SImode, stack_pointer_rtx);
 
               MEM_VOLATILE_P (memref) = 1;
 	      emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx, tmp));
@@ -3322,7 +3322,7 @@
 
       /* Extend a step, probe, and adjust remaining count.  */
       emit_insn(gen_subsi3(stack_pointer_rtx, stack_pointer_rtx, step));
-      memref = gen_rtx (MEM, SImode, stack_pointer_rtx);
+      memref = gen_rtx_MEM (SImode, stack_pointer_rtx);
       MEM_VOLATILE_P (memref) = 1;
       emit_insn(gen_movsi(memref, stack_pointer_rtx));
       emit_insn(gen_subsi3(tmp, tmp, step));