* tree.h (BUILT_IN_CALLER_RETURN_ADDRESS): Unused. Kill.

	(BUILT_IN_FP, BUILT_IN_SP, BUILT_IN_SET_RETURN_ADDR_REG): Kill.
	(BUILT_IN_EH_STUB_OLD, BUILT_IN_EH_STUB, BUILT_IN_SET_EH_REGS): Kill.
	(BUILT_IN_EH_RETURN, BUILT_IN_DWARF_CFA): New.
	* c-decl.c (init_decl_processing): Update accordingly.
	* expr.c (expand_builtin): Likewise.
	* cp/decl.c (init_decl_processing): Likewise.
	* rtl.h (global_rtl): Add cfa entry.
	(virtual_cfa_rtx, VIRTUAL_CFA_REGNUM): New.
	(LAST_VIRTUAL_REGISTER): Update.
	* emit-rtl.c (global_rtl): Add cfa entry.
	(init_emit): Initialize it.
	* function.c (cfa_offset): New.
	(instantiate_virtual_regs): Initialize it.
	(instantiate_virtual_regs_1): Instantiate virtual_cfa_rtx.
	(expand_function_end): Call expand_eh_return.
	* tm.texi (ARG_POINTER_CFA_OFFSET): New.
	* except.c (current_function_eh_stub_label): Kill.
	(current_function_eh_old_stub_label): Likwise; update all references.
	(expand_builtin_set_return_addr_reg): Kill.
	(expand_builtin_eh_stub_old, expand_builtin_eh_stub): Kill.
	(expand_builtin_set_eh_regs): Kill.
	(eh_regs): Produce a third reg for the actual handler address.
	(eh_return_context, eh_return_stack_adjust): New.
	(eh_return_handler, eh_return_stub_label): New.
	(init_eh_for_function): Initialize them.
	(expand_builtin_eh_return, expand_eh_return): New.
	* except.h: Update prototypes.
	* flow.c (find_basic_blocks_1): Update references to the stub label.
	* function.h (struct function): Kill stub label elements.
	* libgcc2.c (in_reg_window): For REG_SAVED_REG, check that the
	register number is one that would be in the previous window.
	Provide a dummy definition for non-windowed targets.
	(get_reg_addr): New function.
	(get_reg, put_reg, copy_reg): Use it.
	(__throw): Rely on in_reg_window, not INCOMING_REGNO.  Kill stub
	generating code and use __builtin_eh_return.  Use __builtin_dwarf_cfa.
	* alpha.c (alpha_eh_epilogue_sp_ofs): New.
	(alpha_init_expanders): Initialize it.
	(alpha_expand_epilogue): Use it.
	* alpha.h: Declare it.
	* alpha.md (eh_epilogue): New.
	* m68h.h (ARG_POINTER_CFA_OFFSET): New.
	* sparc.h (ARG_POINTER_CFA_OFFSET): New.


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

1 files changed, 4 insertions, 9 deletions

diff --git a/gcc/flow.c b/gcc/flow.c
index a7ce4a367e0..fb309be735a 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -485,8 +485,7 @@ find_basic_blocks_1 (f, nonlocal_label_list, live_reachable_p)
 	  /* Make a list of all labels referred to other than by jumps.  */
 	  for (note = REG_NOTES (insn); note; note = XEXP (note, 1))
 	    if (REG_NOTE_KIND (note) == REG_LABEL
-		&& XEXP (note, 0) != current_function_eh_stub_label
-		&& XEXP (note, 0) != current_function_eh_old_stub_label)
+		&& XEXP (note, 0) != eh_return_stub_label)
 	      label_value_list = gen_rtx_EXPR_LIST (VOIDmode, XEXP (note, 0),
 						    label_value_list);
 	}
@@ -619,8 +618,7 @@ find_basic_blocks_1 (f, nonlocal_label_list, live_reachable_p)
 			     note = XEXP (note, 1))
 			  {
 			    if (REG_NOTE_KIND (note) == REG_LABEL
-				&& XEXP (note, 0) != current_function_eh_stub_label
-				&& XEXP (note, 0) != current_function_eh_old_stub_label)
+				&& XEXP (note, 0) != eh_return_stub_label)
 			      {
 				x = XEXP (note, 0);
 				block_live[BLOCK_NUM (x)] = 1;
@@ -708,13 +706,10 @@ find_basic_blocks_1 (f, nonlocal_label_list, live_reachable_p)
 		   within it.  So we have to make additional edges in the
 		   flow graph.  */
 		if (i + 1 == n_basic_blocks
-		    && current_function_eh_stub_label != 0)
+		    && eh_return_stub_label != 0)
 		  {
 		    mark_label_ref (gen_rtx_LABEL_REF (VOIDmode,
-						       current_function_eh_stub_label),
-				    basic_block_end[i], 0);
-		    mark_label_ref (gen_rtx_LABEL_REF (VOIDmode,
-						       current_function_eh_old_stub_label),
+						       eh_return_stub_label),
 				    basic_block_end[i], 0);
 		  }
 	      }