* bt-load.c: Replace "gen_rtx (FOO, " with "gen_rtx_FOO (".

	* calls.c: Likewise.
	* emit-rtl.c: Likewise.
	* function.c: Likewise.
	* reload1.c: Likewise.
	* config/i386/cygming.h: Likewise.
	* config/i386/i386.c: Likewise.
	* config/i386/winnt.c: Likewise.


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

9 files changed, 34 insertions, 23 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6fcea98ff80..5c3b446701b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-31  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* bt-load.c: Replace "gen_rtx (FOO, " with "gen_rtx_FOO (".
+	* calls.c: Likewise.
+	* emit-rtl.c: Likewise.
+	* function.c: Likewise.
+	* reload1.c: Likewise.
+	* config/i386/cygming.h: Likewise.
+	* config/i386/i386.c: Likewise.
+	* config/i386/winnt.c: Likewise.
+
 2004-01-30  Dara Hazeghi  <dhazeghi@yahoo.com>
 
 	PR bootstrap/9249
diff --git a/gcc/bt-load.c b/gcc/bt-load.c
index 9b8f598d0c5..f49cec8d00b 100644
--- a/gcc/bt-load.c
+++ b/gcc/bt-load.c
@@ -1155,7 +1155,7 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
   set = single_set (old_insn);
   src = SET_SRC (set);
   btr_mode = GET_MODE (SET_DEST (set));
-  btr_rtx = gen_rtx (REG, btr_mode, btr);
+  btr_rtx = gen_rtx_REG (btr_mode, btr);
 
   new_insn = gen_move_insn (btr_rtx, src);
 
@@ -1184,7 +1184,7 @@ move_btr_def (basic_block new_def_bb, int btr, btr_def def, bitmap live_range,
 	  || GET_MODE (user->use) == VOIDmode)
 	replacement_rtx = btr_rtx;
       else
-	replacement_rtx = gen_rtx (REG, GET_MODE (user->use), btr);
+	replacement_rtx = gen_rtx_REG (GET_MODE (user->use), btr);
       replace_rtx (user->insn, user->use, replacement_rtx);
       user->use = replacement_rtx;
     }
diff --git a/gcc/calls.c b/gcc/calls.c
index b4d66f92212..7960bbc7601 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -3549,7 +3549,7 @@ expand_call (tree exp, rtx target, int ignore)
   if (flags & ECF_SP_DEPRESSED)
     {
       clear_pending_stack_adjust ();
-      emit_insn (gen_rtx (CLOBBER, VOIDmode, stack_pointer_rtx));
+      emit_insn (gen_rtx_CLOBBER (VOIDmode, stack_pointer_rtx));
       emit_move_insn (virtual_stack_dynamic_rtx, stack_pointer_rtx);
       save_stack_pointer ();
     }
diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
index 4652802102c..00628f09e2d 100644
--- a/gcc/config/i386/cygming.h
+++ b/gcc/config/i386/cygming.h
@@ -315,7 +315,7 @@ extern void i386_pe_unique_section (TREE, int);
 #define PROFILE_HOOK(LABEL)						\
   if (MAIN_NAME_P (DECL_NAME (current_function_decl)))			\
     {									\
-      emit_call_insn (gen_rtx (CALL, VOIDmode,				\
+      emit_call_insn (gen_rtx_CALL (VOIDmode,				\
 	gen_rtx_MEM (FUNCTION_MODE,					\
 		     gen_rtx_SYMBOL_REF (Pmode, "_monstartup")),	\
 	const0_rtx));							\
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 9e6f9b3d2f4..02105a8f0da 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -12766,7 +12766,7 @@ x86_initialize_trampoline (rtx tramp, rtx fnaddr, rtx cxt)
     }
 
 #ifdef TRANSFER_FROM_TRAMPOLINE
-  emit_library_call (gen_rtx (SYMBOL_REF, Pmode, "__enable_execute_stack"),
+  emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"),
 		     LCT_NORMAL, VOIDmode, 1, tramp, Pmode);
 #endif
 }
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index 5620158ac32..cf7b61ebcc0 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -345,7 +345,7 @@ i386_pe_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.  */
@@ -393,9 +393,9 @@ i386_pe_mark_dllimport (tree decl)
      identical.  */
   idp = get_identifier (newname);
 
-  newrtl = gen_rtx (MEM, Pmode,
-		    gen_rtx (SYMBOL_REF, Pmode,
-			     IDENTIFIER_POINTER (idp)));
+  newrtl = gen_rtx_MEM (Pmode,
+			gen_rtx_SYMBOL_REF (Pmode,
+					    IDENTIFIER_POINTER (idp)));
   XEXP (DECL_RTL (decl), 0) = newrtl;
 
   /* Can't treat a pointer to this as a constant address */
@@ -492,11 +492,11 @@ i386_pe_encode_section_info (tree decl, rtx rtl, int first)
       if (lookup_attribute ("stdcall",
 			    TYPE_ATTRIBUTES (TREE_TYPE (decl))))
         XEXP (DECL_RTL (decl), 0) =
-	  gen_rtx (SYMBOL_REF, Pmode, gen_stdcall_suffix (decl));
+	  gen_rtx_SYMBOL_REF (Pmode, gen_stdcall_suffix (decl));
       else if (lookup_attribute ("fastcall",
 				 TYPE_ATTRIBUTES (TREE_TYPE (decl))))
         XEXP (DECL_RTL (decl), 0) =
-	  gen_rtx (SYMBOL_REF, Pmode, gen_fastcall_suffix (decl));
+	  gen_rtx_SYMBOL_REF (Pmode, gen_fastcall_suffix (decl));
     }
 
   /* Mark the decl so we can tell from the rtl whether the object is
@@ -523,7 +523,7 @@ i386_pe_encode_section_info (tree decl, rtx rtl, int first)
 
       /* Remove DLL_IMPORT_PREFIX.  */
       tree idp = get_identifier (oldname + strlen (DLL_IMPORT_PREFIX));
-      rtx newrtl = gen_rtx (SYMBOL_REF, Pmode, IDENTIFIER_POINTER (idp));
+      rtx newrtl = gen_rtx_SYMBOL_REF (Pmode, IDENTIFIER_POINTER (idp));
 
       if (DECL_INITIAL (decl) || !DECL_EXTERNAL (decl))
 	warning ("%J'%D' defined locally after being "
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index dec49462bc1..c720b651df8 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -660,13 +660,13 @@ gen_lowpart_SUBREG (enum machine_mode mode, rtx reg)
 **
 **		...would be generated by the following C code:
 **
-**		gen_rtx (PLUS, QImode,
-**		    gen_rtx (MEM, QImode,
-**			gen_rtx (REG, SImode, 1)),
-**		    gen_rtx (MEM, QImode,
-**			gen_rtx (PLUS, SImode,
-**			    gen_rtx (REG, SImode, 2),
-**			    gen_rtx (REG, SImode, 3)))),
+**		gen_rtx_PLUS (QImode,
+**		    gen_rtx_MEM (QImode,
+**			gen_rtx_REG (SImode, 1)),
+**		    gen_rtx_MEM (QImode,
+**			gen_rtx_PLUS (SImode,
+**			    gen_rtx_REG (SImode, 2),
+**			    gen_rtx_REG (SImode, 3)))),
 */
 
 /*VARARGS2*/
diff --git a/gcc/function.c b/gcc/function.c
index 5af0a901cde..11edd8b9b27 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -3241,9 +3241,9 @@ purge_addressof_1 (rtx *loc, rtx insn, int force, int store, int may_postpone,
 		    return true;
 		  }
 	      purge_addressof_replacements
-		= gen_rtx (EXPR_LIST, VOIDmode, XEXP (x, 0),
-			   gen_rtx_EXPR_LIST (VOIDmode, sub,
-					      purge_addressof_replacements));
+		= gen_rtx_EXPR_LIST (VOIDmode, XEXP (x, 0),
+				     gen_rtx_EXPR_LIST (VOIDmode, sub,
+							purge_addressof_replacements));
 	      return true;
 	    }
 	  goto restart;
diff --git a/gcc/reload1.c b/gcc/reload1.c
index d53b27be6d6..32341d1c231 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -3478,7 +3478,7 @@ init_elim_table (void)
 
   /* 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.,
-     gen_rtx (REG, Pmode, STACK_POINTER_REGNUM) to equal stack_pointer_rtx.
+     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++)
     {