(TRAMPOLINE_TEMPLATE): Remove.
(TRAMPOLINE_ALIGNMENT): New.
+ * config/score/score-protos.h (score_initialize_trampoline): Remove.
+ * config/score/score.c (TARGET_ASM_TRAMPOLINE_TEMPLATE): New.
+ (TARGET_TRAMPOLINE_INIT): New.
+ (score_asm_trampoline_template): New.
+ (score_trampoline_init): Rename from score_initialize_trampoline;
+ make static; adjust for hook parameters.
+ * config/score/score.h (TRAMPOLINE_TEMPLATE): Move code to
+ score[37]_asm_trampoline_template.
+ (INITIALIZE_TRAMPOLINE): Remove.
+ * config/score/score3.c (score3_asm_trampoline_template): New.
+ (score3_trampoline_init): Rename from score3_initialize_trampoline;
+ adjust for target hook.
+ * config/score/score7.c (score7_asm_trampoline_template): New.
+ (score7_trampoline_init): Rename from score7_initialize_trampoline;
+ adjust for target hook.
+ * config/score/score3.h, config/score/score7.h: Update.
+
+ * config/sh/sh-protos.h (sh_initialize_trampoline): Remove.
+ * config/sh/sh.c (TARGET_TRAMPOLINE_INIT): New.
+ (TARGET_TRAMPOLINE_ADJUST_ADDRESS): New.
+ (sh_trampoline_init): Rename from sh_initialize_trampoline;
+ make static; adjust for target hook parameters.
+ (sh_trampoline_adjust_address): New.
+ * config/sh/sh.h (INITIALIZE_TRAMPOLINE): New.
+ (TRAMPOLINE_ADJUST_ADDRESS): Move code to sh_trampoline_adjust_address.
+
+ * config/sparc/sparc.c (TARGET_TRAMPOLINE_INIT): New.
+ (sparc32_initialize_trampoline): Rename from
+ sparc_initialize_trampoline; make static; replace tramp parameter
+ with m_tramp and update memory accesses.
+ (sparc64_initialize_trampoline): Similarly.
+ (sparc_trampoline_init): New.
+ * config/sparc/sparc-protos.h: Remove trampoline decls.
+ * config/sparc/sparc.h (INITIALIZE_TRAMPOLINE): Remove.
+ * config/sparc/sparc.md (nonlocal_goto): Don't use static_chain_rtx.
+
+ * config/spu/spu.c (TARGET_TRAMPOLINE_INIT): New.
+ (array_to_constant): Make ARR parameter const.
+ (spu_trampoline_init): Rename from spu_initialize_trampoline;
+ make static; update for hook parameters.
+ * config/spu/spu-protos.h: Update decls.
+ * config/spu/spu.h (INITIALIZE_TRAMPOLINE): Remove.
+
+ * config/stormy16/stormy16.c (xstormy16_trampoline_init): Rename
+ from xstormy16_initialize_trampoline; make static; update for
+ hook parameters.
+ (TARGET_TRAMPOLINE_INIT): New.
+ * config/stormy16/stormy16.h (INITIALIZE_TRAMPOLINE): Remove.
+
+ * config/v850/v850.c (TARGET_ASM_TRAMPOLINE_TEMPLATE): New.
+ (TARGET_TRAMPOLINE_INIT): New.
+ (v850_can_eliminate): Make static.
+ (v850_asm_trampoline_template, v850_trampoline_init): New.
+ * config/v850/v850.h (TRAMPOLINE_TEMPLATE): Move code to
+ v850_asm_trampoline_template.
+ (INITIALIZE_TRAMPOLINE): Move code to v850_trampoline_init
+ and adjust for target hook parameters.
+
+ * config/vax/vax.c (TARGET_ASM_TRAMPOLINE_TEMPLATE): New.
+ (TARGET_TRAMPOLINE_INIT): New.
+ (vax_asm_trampoline_template, vax_trampoline_init): New.
+ * config/vax/vax.h (TRAMPOLINE_TEMPLATE): Move code to
+ vax_asm_trampoline_template.
+ (INITIALIZE_TRAMPOLINE): Move code to vax_trampoline_init.
+
+ * config/xtensa/xtensa.c (TARGET_ASM_TRAMPOLINE_TEMPLATE): New.
+ (TARGET_TRAMPOLINE_INIT): New.
+ (xtensa_asm_trampoline_template): Rename from
+ xtensa_trampoline_template; make static.
+ (xtensa_trampoline_init): Rename from xtensa_initialize_trampoline;
+ make static; update for hook parameters.
+ * config/xtensa/xtensa-protos.h: Remove trampoline decls.
+ * config/xtensa/xtensa.h (TRAMPOLINE_TEMPLATE): Remove.
+ (INITIALIZE_TRAMPOLINE): Remove.
+
+ * config/i386/i386.c (ix86_function_regparm): Do not issue an
+ error for nested functions with regparm=3.
+ (ix86_compute_frame_layout): Adjust frame pointer offset for
+ ix86_static_chain_on_stack.
+ (ix86_expand_prologue): Handle ix86_static_chain_on_stack.
+ (ix86_emit_restore_reg_using_pop): Increment ix86_cfa_state->offset,
+ don't reset to UNITS_PER_WORD.
+ (ix86_emit_leave): Adjust ix86_cfa_state.
+ (ix86_expand_epilogue): Handle ix86_static_chain_on_stack.
+ (ix86_static_chain): New.
+ (ix86_trampoline_init): Rename from x86_initialize_trampoline;
+ make static; update for target hook parameters; use ix86_static_chain.
+ (TARGET_STATIC_CHAIN, TARGET_TRAMPOLINE_INIT): New.
+ * config/i386/i386.h (STATIC_CHAIN_REGNUM): Remove.
+ (INITIALIZE_TRAMPOLINE): Remove.
+ (TRAMPOLINE_SIZE): Use 24 for 64-bit.
+ (struct machine_function): Use BOOL_BITFIELD; rearrange bitfields
+ to the end. Add static_chain_on_stack.
+ (ix86_static_chain_on_stack): New.
+
+ * config/m68k/m68k.c (TARGET_TRAMPOLINE_INIT): New.
+ (m68k_output_mi_thunk): Don't use static_chain_rtx.
+ (m68k_trampoline_init): New.
+ * config/m68k/m68k.h (INITIALIZE_TRAMPOLINE): Move code to
+ m68k_trampoline_init and adjust for hook parameters.
+ * config/m68k/netbsd-elf.h (TRAMPOLINE_TEMPLATE): Remove.
+ (TRAMPOLINE_SIZE, INITIALIZE_TRAMPOLINE): Remove.
+
2009-09-22 Jakub Jelinek <jakub@redhat.com>
* config/rs6000/rs6000.c (bdesc_2arg): Fix CODE_FOR_vector_gt* codes
OSDN Git Service
