OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix breakage from 6th Feb thread_prologue_and_epilogue_insns change: 

* sh-protos.h (sh_need_epilogue): Declare.
	* sh.c (sh_need_epilogue_known): New static variable.
	(sh_need_epilogue): New function.
	(function_epilogue): Clear need_epilogue_known.
	* sh.md (return): Split into expander / insn pattern.
	Make the expander conditional on ! sh_need_epilogue ().

From-SVN: r32136
This commit is contained in:
J"orn Rennecke 2000-02-24 20:09:30 +00:00 committed by Joern Rennecke
parent 36c265b175
commit afbc290536
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
Thu Feb 24 20:04:11 2000 J"orn Rennecke <amylaar@cygnus.co.uk>
Fix breakage from 6th Feb thread_prologue_and_epilogue_insns change:
* sh-protos.h (sh_need_epilogue): Declare.
* sh.c (sh_need_epilogue_known): New static variable.
(sh_need_epilogue): New function.
(function_epilogue): Clear need_epilogue_known.
* sh.md (return): Split into expander / insn pattern.
Make the expander conditional on ! sh_need_epilogue ().
2000-02-24 Nathan Sidwell <nathan@codesourcery.com>
* machmode.h (get_mode_alignment): Declare.

1
gcc/config/sh/sh-protos.h
View File

@ -107,6 +107,7 @@ extern struct rtx_def *get_fpscr_rtx PARAMS ((void));
extern void output_file_start PARAMS ((FILE *));
extern void sh_expand_prologue PARAMS ((void));
extern void sh_expand_epilogue PARAMS ((void));
extern int sh_need_epilogue PARAMS ((void));
extern void function_epilogue PARAMS ((FILE *, int));
extern int initial_elimination_offset PARAMS ((int, int));
extern void emit_fpscr_use PARAMS ((void));

21
gcc/config/sh/sh.c
View File

@ -3919,6 +3919,26 @@ sh_expand_epilogue ()
emit_insn (gen_sp_switch_2 ());
}
static int sh_need_epilogue_known = 0;
int
sh_need_epilogue ()
{
if (! sh_need_epilogue_known)
{
rtx epilogue;
start_sequence ();
sh_expand_epilogue ();
epilogue = gen_sequence ();
end_sequence ();
sh_need_epilogue_known
= (GET_CODE (epilogue) == SEQUENCE && XVECLEN (epilogue, 0) == 0
? -1 : 1);
}
return sh_need_epilogue_known > 0;
}
/* Clear variables at function end. */
void
@ -3927,6 +3947,7 @@ function_epilogue (stream, size)
int size ATTRIBUTE_UNUSED;
{
trap_exit = pragma_interrupt = pragma_trapa = pragma_nosave_low_regs = 0;
sh_need_epilogue_known = 0;
sp_switch = NULL_RTX;
}

12
gcc/config/sh/sh.md
View File

@ -3484,12 +3484,12 @@
}"
[(set_attr "length" "4")])
;; ??? This is not the proper place to invoke another compiler pass;
;; Alas, there is no proper place to put it.
;; ??? This is also an odd place for the call to emit_fpscr_use. It
;; would be all right if it were for an define_expand for return, but
;; that doesn't mix with emitting a prologue.
(define_insn "return"
(define_expand "return"
[(return)]
"reload_completed && ! sh_need_epilogue ()"
"")
(define_insn "*return_i"
[(return)]
"reload_completed"
"%@ %#"