From 8f90b7d4fcde936b2458835eebf84cba5b23e1e2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 7 Jun 2013 21:53:46 +0930 Subject: [PATCH] rs6000.c (setup_incoming_varargs): Round up va_list_gpr_size. * config/rs6000/rs6000.c (setup_incoming_varargs): Round up va_list_gpr_size. From-SVN: r199808 --- gcc/ChangeLog | 5 +++++ gcc/config/rs6000/rs6000.c | 19 ++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b27f22a033f..025e2c5bed8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-06-07 Alan Modra + + * config/rs6000/rs6000.c (setup_incoming_varargs): Round up + va_list_gpr_size. + 2013-06-07 Alan Modra * varasm.c (force_const_mem): Assert mode is not VOID or BLK. diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index cc16e3fb819..3e019bb0697 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -9370,20 +9370,17 @@ setup_incoming_varargs (cumulative_args_t cum, enum machine_mode mode, if (! no_rtl && first_reg_offset < GP_ARG_NUM_REG && cfun->va_list_gpr_size) { - int nregs = GP_ARG_NUM_REG - first_reg_offset; + int n_gpr, nregs = GP_ARG_NUM_REG - first_reg_offset; if (va_list_gpr_counter_field) - { - /* V4 va_list_gpr_size counts number of registers needed. */ - if (nregs > cfun->va_list_gpr_size) - nregs = cfun->va_list_gpr_size; - } + /* V4 va_list_gpr_size counts number of registers needed. */ + n_gpr = cfun->va_list_gpr_size; else - { - /* char * va_list instead counts number of bytes needed. */ - if (nregs > cfun->va_list_gpr_size / reg_size) - nregs = cfun->va_list_gpr_size / reg_size; - } + /* char * va_list instead counts number of bytes needed. */ + n_gpr = (cfun->va_list_gpr_size + reg_size - 1) / reg_size; + + if (nregs > n_gpr) + nregs = n_gpr; mem = gen_rtx_MEM (BLKmode, plus_constant (Pmode, save_area, -- 2.30.2