diff options
| author | Richard Henderson <rth@redhat.com> | 2009-09-22 08:11:37 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2009-09-22 08:11:37 -0700 |
| commit | 531ca746f972a758565b0623288ea24162442248 (patch) | |
| tree | 78521a0ca34823fbb38443911cb1b76f4bd93d6c /gcc/function.c | |
| parent | 2df373c2eb9148f995614d5405f0e4b500de4e0d (diff) | |
| download | gcc-531ca746f972a758565b0623288ea24162442248.zip gcc-531ca746f972a758565b0623288ea24162442248.tar.gz gcc-531ca746f972a758565b0623288ea24162442248.tar.bz2 | |
re PR target/41246 (should "sorry" when regparm=3 and nested functions are encountered)
PR target/41246
* target.h (struct gcc_target): Add asm_out.trampoline_template,
calls.static_chain, calls.trampoline_init,
calls.trampoline_adjust_address.
* target-def.h (TARGET_ASM_TRAMPOLINE_TEMPLATE): New.
(TARGET_STATIC_CHAIN, TARGET_TRAMPOLINE_INIT): New.
(TARGET_TRAMPOLINE_ADJUST_ADDRESS): New.
* builtins.c (expand_builtin_setjmp_receiver): Use
targetm.calls.static_chain; only clobber registers.
(expand_builtin_init_trampoline): Use targetm.calls.trampoline_init;
set up memory attributes properly for the trampoline block.
(expand_builtin_adjust_trampoline): Use
targetm.calls.trampoline_adjust_address.
* calls.c (prepare_call_address): Add fndecl argument. Use
targetm.calls.static_chain.
* df-scan.c (df_need_static_chain_reg): Remove.
(df_get_entry_block_def_set): Use targetm.calls.static_chain;
consolodate static chain handling.
* doc/tm.texi: Document new hooks.
* emit-rtl.c (static_chain_rtx, static_chain_incoming_rtx): Remove.
(init_emit_regs): Don't initialize them.
* expr.h (prepare_call_address): Update decl.
* final.c (profile_function): Use targetm.calls.static_chain.
* function.c (expand_function_start): Likewise.
* rtl.h (static_chain_rtx, static_chain_incoming_rtx): Remove.
* stmt.c (expand_nl_goto_receiver): Use targetm.calls.static_chain;
only clobber registers.
* targhooks.c (default_static_chain): New.
(default_asm_trampoline_template, default_trampoline_init): New.
(default_trampoline_adjust_address): New.
* targhooks.h: Declare them.
* varasm.c (assemble_trampoline_template): Use
targetm.asm_out.trampoline_template. Make the memory block const
and set its size.
From-SVN: r151983
Diffstat (limited to 'gcc/function.c')
| -rw-r--r-- | gcc/function.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gcc/function.c b/gcc/function.c index 85e2f05..6c9bea8 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4453,13 +4453,21 @@ expand_function_start (tree subr) if (cfun->static_chain_decl) { tree parm = cfun->static_chain_decl; - rtx local = gen_reg_rtx (Pmode); + rtx local, chain, insn; - set_decl_incoming_rtl (parm, static_chain_incoming_rtx, false); + local = gen_reg_rtx (Pmode); + chain = targetm.calls.static_chain (current_function_decl, true); + + set_decl_incoming_rtl (parm, chain, false); SET_DECL_RTL (parm, local); mark_reg_pointer (local, TYPE_ALIGN (TREE_TYPE (TREE_TYPE (parm)))); - emit_move_insn (local, static_chain_incoming_rtx); + insn = emit_move_insn (local, chain); + + /* Mark the register as eliminable, similar to parameters. */ + if (MEM_P (chain) + && reg_mentioned_p (arg_pointer_rtx, XEXP (chain, 0))) + set_unique_reg_note (insn, REG_EQUIV, chain); } /* If the function receives a non-local goto, then store the |