From 229fbccbab7b8ad59558f34bce92311dbd48c2b4 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 22 Sep 2009 08:13:24 -0700 Subject: m32c-protos.h (m32c_initialize_trampoline): Remove. * config/m32c/m32c-protos.h (m32c_initialize_trampoline): Remove. * config/m32c/m32c.c (TARGET_TRAMPOLINE_INIT): New. (m32c_trampoline_init): Rename from m32c_initialize_trampoline; adjust for hook parameters. * config/m32c/m32c.h (INITIALIZE_TRAMPOLINE): Remove. From-SVN: r151996 --- gcc/config/m32c/m32c-protos.h | 1 - gcc/config/m32c/m32c.c | 13 +++++++++---- gcc/config/m32c/m32c.h | 1 - 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'gcc/config/m32c') diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h index d332475..e571fe9 100644 --- a/gcc/config/m32c/m32c-protos.h +++ b/gcc/config/m32c/m32c-protos.h @@ -73,7 +73,6 @@ int m32c_hard_regno_ok (int, MM); bool m32c_illegal_subreg_p (rtx); bool m32c_immd_dbl_mov (rtx *, MM); rtx m32c_incoming_return_addr_rtx (void); -void m32c_initialize_trampoline (rtx, rtx, rtx); int m32c_legitimate_constant_p (rtx); int m32c_legitimize_reload_address (rtx *, MM, int, int, int); rtx m32c_libcall_value (MM); diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c index 1bf3d1b..a068949 100644 --- a/gcc/config/m32c/m32c.c +++ b/gcc/config/m32c/m32c.c @@ -1717,11 +1717,16 @@ m32c_trampoline_alignment (void) return 2; } -/* Implements INITIALIZE_TRAMPOLINE. */ -void -m32c_initialize_trampoline (rtx tramp, rtx function, rtx chainval) +/* Implements TARGET_TRAMPOLINE_INIT. */ + +#undef TARGET_TRAMPOLINE_INIT +#define TARGET_TRAMPOLINE_INIT m32c_trampoline_init +static void +m32c_trampoline_init (rtx m_tramp, tree fndecl, rtx chainval) { -#define A0(m,i) gen_rtx_MEM (m, plus_constant (tramp, i)) + rtx function = XEXP (DECL_RTL (fndecl), 0); + +#define A0(m,i) adjust_address (m_tramp, m, i) if (TARGET_A16) { /* Note: we subtract a "word" because the moves want signed diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h index ee092a5..48e669b 100644 --- a/gcc/config/m32c/m32c.h +++ b/gcc/config/m32c/m32c.h @@ -555,7 +555,6 @@ typedef struct m32c_cumulative_args #define TRAMPOLINE_SIZE m32c_trampoline_size () #define TRAMPOLINE_ALIGNMENT m32c_trampoline_alignment () -#define INITIALIZE_TRAMPOLINE(a,fn,sc) m32c_initialize_trampoline (a, fn, sc) /* Addressing Modes */ -- cgit v1.1