combine.c (simplify_set): Use gen_rtx_fmt_e instead of gen_rtx.

	gcc/
	* combine.c (simplify_set): Use gen_rtx_fmt_e instead of
	gen_rtx.
	* emit-rtl.c (init_emit_once): Use gen_rtx_PC and gen_rtx_CC0
	instead of gen_rtx.
	* reload1.c (init_elim_table): Use gen_rtx_fmt_e instead of
	gen_rtx.
	* config/ns32k/ns32k.md (udivmodhi4): Use gen_rtx_IOR and
	gen_rtx_ASHIFT instead of gen_rtx.
	(udivmodqi4): Likewise.

	ada/
	* ada/trans.c (gigi): Use gen_rtx_SYMBOL_REF instead of
	gen_rtx.

	f/
	* com.c (ffecom_member_phase2_): Use gen_rtx_MEM instead of
	gen_rtx.

From-SVN: r77159

9 files changed, 44 insertions, 20 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e2f3c1..c440da3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-03  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* combine.c (simplify_set): Use gen_rtx_fmt_e instead of
+	gen_rtx.
+	* emit-rtl.c (init_emit_once): Use gen_rtx_PC and gen_rtx_CC0
+	instead of gen_rtx.
+	* reload1.c (init_elim_table): Use gen_rtx_fmt_e instead of
+	gen_rtx.
+	* config/ns32k/ns32k.md (udivmodhi4): Use gen_rtx_IOR and
+	gen_rtx_ASHIFT instead of gen_rtx.
+	(udivmodqi4): Likewise.
+
 2004-02-02  Richard Henderson  <rth@redhat.com>
 
         PR target/13789
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4bec383..b69ba86 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* ada/trans.c (gigi): Use gen_rtx_SYMBOL_REF instead of
+	gen_rtx.
+
 2004-02-02  Arnaud Charlet  <charlet@gnat.com>
 
 	* Makefile.in: Remove setting of THREADSLIB on mips o32, unneeded.
diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c
index 92934bc..d11742d 100644
--- a/gcc/ada/trans.c
+++ b/gcc/ada/trans.c
@@ -186,7 +186,7 @@ gigi (Node_Id gnat_root,
 
   /* Enable GNAT stack checking method if needed */
   if (!Stack_Check_Probes_On_Target)
-    set_stack_check_libfunc (gen_rtx (SYMBOL_REF, Pmode, "_gnat_stack_check"));
+    set_stack_check_libfunc (gen_rtx_SYMBOL_REF (Pmode, "_gnat_stack_check"));
 
   /* Save the type we made for integer as the type for Standard.Integer.
      Then make the rest of the standard types.  Note that some of these
diff --git a/gcc/combine.c b/gcc/combine.c
index 36a7194..14cd64b 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -5200,8 +5200,8 @@ simplify_set (rtx x)
       && GET_CODE (SUBREG_REG (src)) == MEM)
     {
       SUBST (SET_SRC (x),
-	     gen_rtx (LOAD_EXTEND_OP (GET_MODE (SUBREG_REG (src))),
-		      GET_MODE (src), SUBREG_REG (src)));
+	     gen_rtx_fmt_e (LOAD_EXTEND_OP (GET_MODE (SUBREG_REG (src))),
+			    GET_MODE (src), SUBREG_REG (src)));
 
       src = SET_SRC (x);
     }
diff --git a/gcc/config/ns32k/ns32k.md b/gcc/config/ns32k/ns32k.md
index f4d94eb..987625d 100644
--- a/gcc/config/ns32k/ns32k.md
+++ b/gcc/config/ns32k/ns32k.md
@@ -1322,8 +1322,8 @@
 ;;			         REG_NOTES (first));
 ;;    REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first,
 ;;                                gen_rtx_EXPR_LIST (REG_EQUAL,
-;;                       gen_rtx(IOR, DImode, moddi,
-;;                               gen_rtx(ASHIFT, DImode, divdi, GEN_INT(32))),
+;;                       gen_rtx_IOR (DImode, moddi,
+;;                                    gen_rtx_ASHIFT (DImode, divdi, GEN_INT(32))),
 ;;                       REG_NOTES (last)));
 ;;  }
 ;;
@@ -1379,8 +1379,8 @@
 ;;			         REG_NOTES (first));
 ;;    REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first,
 ;;                                gen_rtx_EXPR_LIST (REG_EQUAL,
-;;                       gen_rtx(IOR, DImode, moddi,
-;;                               gen_rtx(ASHIFT, DImode, divdi, GEN_INT(32))),
+;;                       gen_rtx_IOR (DImode, moddi,
+;;                                    gen_rtx_ASHIFT (DImode, divdi, GEN_INT(32))),
 ;;                       REG_NOTES (last)));
 ;;  }
 ;;
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index df2a236..3deefe8 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -5355,8 +5355,8 @@ init_emit_once (int line_numbers)
      This must be done at runtime because the register number field
      is in a union and some compilers can't initialize unions.  */
 
-  pc_rtx = gen_rtx (PC, VOIDmode);
-  cc0_rtx = gen_rtx (CC0, VOIDmode);
+  pc_rtx = gen_rtx_PC (VOIDmode);
+  cc0_rtx = gen_rtx_CC0 (VOIDmode);
   stack_pointer_rtx = gen_raw_REG (Pmode, STACK_POINTER_REGNUM);
   frame_pointer_rtx = gen_raw_REG (Pmode, FRAME_POINTER_REGNUM);
   if (hard_frame_pointer_rtx == 0)
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index fd818f4..2677242 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* com.c (ffecom_member_phase2_): Use gen_rtx_MEM instead of
+	gen_rtx.
+
 2004-01-30  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Make-lang.in (doc/g77.dvi): Use $(abs_docdir). 
diff --git a/gcc/f/com.c b/gcc/f/com.c
index a64ef86..5309b84 100644
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -1,5 +1,5 @@
 /* com.c -- Implementation File (module.c template V1.0)
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
@@ -6906,11 +6906,11 @@ ffecom_member_phase2_ (ffestorag mst, ffestorag st)
   TREE_USED (t) = 1;
 
   SET_DECL_RTL (t,
-		gen_rtx (MEM, TYPE_MODE (type),
-			 plus_constant (XEXP (DECL_RTL (mt), 0),
-					ffestorag_modulo (mst)
-					+ ffestorag_offset (st)
-					- ffestorag_offset (mst))));
+		gen_rtx_MEM (TYPE_MODE (type),
+			     plus_constant (XEXP (DECL_RTL (mt), 0),
+					    ffestorag_modulo (mst)
+					    + ffestorag_offset (st)
+					    - ffestorag_offset (mst))));
 
   t = start_decl (t, FALSE);
 
diff --git a/gcc/reload1.c b/gcc/reload1.c
index 5cce770..c24f4ac 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3477,7 +3477,7 @@ init_elim_table (void)
 #endif
 
   /* Count the number of eliminable registers and build the FROM and TO
-     REG rtx's.  Note that code in gen_rtx will cause, e.g.,
+     REG rtx's.  Note that code in gen_rtx_REG will cause, e.g.,
      gen_rtx_REG (Pmode, STACK_POINTER_REGNUM) to equal stack_pointer_rtx.
      We depend on this.  */
   for (ep = reg_eliminate; ep < &reg_eliminate[NUM_ELIMINABLE_REGS]; ep++)
@@ -3932,8 +3932,9 @@ reload_as_needed (int live_known)
 			  if (n == 1)
 			    {
 			      n = validate_replace_rtx (reload_reg,
-							gen_rtx (code, mode,
-								 reload_reg),
+							gen_rtx_fmt_e (code,
+								       mode,
+								       reload_reg),
 							p);
 
 			      /* We must also verify that the constraints
@@ -3948,8 +3949,9 @@ reload_as_needed (int live_known)
 				 undo the replacement.  */
 			      if (!n)
 				{
-				  validate_replace_rtx (gen_rtx (code, mode,
-								 reload_reg),
+				  validate_replace_rtx (gen_rtx_fmt_e (code,
+								       mode,
+								       reload_reg),
 							reload_reg, p);
 				  break;
 				}