From 7dd689869298beb490a6c84cc04e1f2a2686649b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 22 Apr 2008 09:49:43 +0000 Subject: [PATCH] frv.c (frv_stack_info): Use crtl instead of cfun. * config/frv/frv.c (frv_stack_info): Use crtl instead of cfun. (frv_expand_builtin_va_start): Likewise. From-SVN: r134554 --- gcc/ChangeLog | 3 +++ gcc/config/frv/frv.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb996fce98f..7c659d4cddd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2008-04-22 Nick Clifton + * config/frv/frv.c (frv_stack_info): Use crtl instead of cfun. + (frv_expand_builtin_va_start): Likewise. + * config/arm/arm.c (thumb_find_work_register): Fix location of argument register count. diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c index 150e25d568b..badc45e7ab6 100644 --- a/gcc/config/frv/frv.c +++ b/gcc/config/frv/frv.c @@ -1208,7 +1208,7 @@ frv_stack_info (void) /* If this is a stdarg function with a non varardic argument split between registers and the stack, adjust the saved registers downward. */ - last -= (ADDR_ALIGN (cfun->pretend_args_size, UNITS_PER_WORD) + last -= (ADDR_ALIGN (crtl->args.pretend_args_size, UNITS_PER_WORD) / UNITS_PER_WORD); for (regno = first; regno <= last; regno++) @@ -1268,13 +1268,13 @@ frv_stack_info (void) be used, or the size of a word otherwise. */ alignment = (TARGET_DWORD? 2 * UNITS_PER_WORD : UNITS_PER_WORD); - info_ptr->parameter_size = ADDR_ALIGN (cfun->outgoing_args_size, alignment); + info_ptr->parameter_size = ADDR_ALIGN (crtl->outgoing_args_size, alignment); info_ptr->regs_size = ADDR_ALIGN (info_ptr->regs_size_2words + info_ptr->regs_size_1word, alignment); info_ptr->vars_size = ADDR_ALIGN (get_frame_size (), alignment); - info_ptr->pretend_size = cfun->pretend_args_size; + info_ptr->pretend_size = crtl->args.pretend_args_size; /* Work out the size of the frame, excluding the header. Both the frame body and register parameter area will be dword-aligned. */ @@ -2194,7 +2194,7 @@ static void frv_expand_builtin_va_start (tree valist, rtx nextarg) { tree t; - int num = cfun->args_info - FIRST_ARG_REGNUM - FRV_NUM_ARG_REGS; + int num = crtl->args.info - FIRST_ARG_REGNUM - FRV_NUM_ARG_REGS; nextarg = gen_rtx_PLUS (Pmode, virtual_incoming_args_rtx, GEN_INT (UNITS_PER_WORD * num)); @@ -2202,7 +2202,7 @@ frv_expand_builtin_va_start (tree valist, rtx nextarg) if (TARGET_DEBUG_ARG) { fprintf (stderr, "va_start: args_info = %d, num = %d\n", - cfun->args_info, num); + crtl->args.info, num); debug_rtx (nextarg); } -- 2.30.2