* config/v850/v850.md (epilogue): Remove suppressed code.

        (return): Rename to return_simple and remove test of frame size.
        * config/v850/v850.c (expand_epilogue): Rename call to gen_return
        to gen_return_simple.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fccf2c0a2bfd1dbf2f56ab94534a1b3af6f8eba0..e3321c3ceaf7f5462b4611a7589c9cab6ebf462a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-23  Nick Clifton  <nickc@redhat.com>
+
+       * config/v850/v850.md (epilogue): Remove suppressed code.
+       (return): Rename to return_simple and remove test of frame size.
+       * config/v850/v850.c (expand_epilogue): Rename call to gen_return
+       to gen_return_simple.
+
 2009-04-22  Jing Yu  <jingyu@google.com>
 
        PR testsuite/39781

diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index 51146e65d43e600298c008f55cc81cde5134c5a4..b556cbdf8cc2ab3fe0c4009df00eaa9b72c6040c 100644 (file)
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -1931,7 +1931,7 @@ Saved %d bytes via epilogue function (%d vs. %d) in function %s\n",
       else if (actual_fsize)
        emit_jump_insn (gen_return_internal ());
       else
-       emit_jump_insn (gen_return ());
+       emit_jump_insn (gen_return_simple ());
     }
 
   v850_interrupt_cache_p = FALSE;

diff --git a/gcc/config/v850/v850.md b/gcc/config/v850/v850.md
index 901075921769adefca10e71fbf9a1ce49b9ec4e4..dad3cdd885b9fc35ce155c0bab8f204b32b202b2 100644 (file)
--- a/gcc/config/v850/v850.md
+++ b/gcc/config/v850/v850.md
@@ -1552,18 +1552,13 @@
   ""
   "
 {
-  /* Try to use the trivial return first.  Else use the
-     full epilogue.  */
-  if (0)
-    emit_jump_insn (gen_return ());
-  else
-    expand_epilogue ();
+  expand_epilogue ();
   DONE;
 }")
 
-(define_insn "return"
+(define_insn "return_simple"
   [(return)]
-  "reload_completed && compute_frame_size (get_frame_size (), (long *)0) == 0"
+  "reload_completed"
   "jmp [r31]"
   [(set_attr "length" "2")
    (set_attr "cc" "none")])