sparc.md (save_register_window_1): Rename to...

	* config/sparc/sparc.md (save_register_window_1): Rename to...
	(window_save): ...this.
	* config/sparc/sparc.c (emit_save_register_window): Rename to...
	(emit_window_save): ...this.
	(sparc_expand_prologue): Adjust to above renaming.

From-SVN: r176138

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 752e252a7138b7e0489fcad8ab5d348e1b996cde..03eb93b30936411eb1e1673f5518873123ae1533 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * config/sparc/sparc.md (save_register_window_1): Rename to...
+       (window_save): ...this.
+       * config/sparc/sparc.c (emit_save_register_window): Rename to...
+       (emit_window_save): ...this.
+       (sparc_expand_prologue): Adjust to above renaming.
+
 2011-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/i386/i386.c (ix86_trampoline_init): Use movl instead

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 89e09d6726916222f10acfc50c165fbd6c43392f..a65b83665069937406aa9437e0ed477e08160b04 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4590,14 +4590,12 @@ emit_save_or_restore_local_in_regs (rtx base, int offset, sorr_act_t action)
                             save_local_or_in_reg_p, action, SORR_ADVANCE);
 }
 
-/* Generate a save_register_window insn.  */
+/* Emit a window_save insn.  */
 
 static rtx
-emit_save_register_window (rtx increment)
+emit_window_save (rtx increment)
 {
-  rtx insn;
-
-  insn = emit_insn (gen_save_register_window_1 (increment));
+  rtx insn = emit_insn (gen_window_save (increment));
   RTX_FRAME_RELATED_P (insn) = 1;
 
   /* The incoming return address (%o7) is saved in %i7.  */
@@ -4716,10 +4714,10 @@ sparc_expand_prologue (void)
       rtx size_int_rtx = GEN_INT (-size);
 
       if (size <= 4096)
-       emit_save_register_window (size_int_rtx);
+       emit_window_save (size_int_rtx);
       else if (size <= 8192)
        {
-         emit_save_register_window (GEN_INT (-4096));
+         emit_window_save (GEN_INT (-4096));
          /* %sp is not the CFA register anymore.  */
          emit_insn (gen_stack_pointer_inc (GEN_INT (4096 - size)));
        }
@@ -4727,7 +4725,7 @@ sparc_expand_prologue (void)
        {
          rtx size_rtx = gen_rtx_REG (Pmode, 1);
          emit_move_insn (size_rtx, size_int_rtx);
-         emit_save_register_window (size_rtx);
+         emit_window_save (size_rtx);
        }
     }
 

diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index 2c8d306fecc8be0ea496e1487ef6009e6536ce30..7d5d6dc441097018dc3d10ee59bc97bf28c61f6c 100644 (file)
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -6276,10 +6276,10 @@
   DONE;
 })
 
-;; The "save register window" insn is modelled as follows.  The dwarf2
-;; information is manually added in emit_save_register_window in sparc.c.
+;; The "register window save" insn is modelled as follows.  The dwarf2
+;; information is manually added in emit_window_save.
 
-(define_insn "save_register_window_1"
+(define_insn "window_save"
   [(unspec_volatile
        [(match_operand 0 "arith_operand" "rI")]
        UNSPECV_SAVEW)]