RISC-V: Give stack slots same align as XLEN.

For riscv64-linux target, fixes
FAIL: gdb.base/gnu_vector.exp: call add_many_charvecs

Ensure that stack slots are always the same alignment as XLEN by rounding
up arg align to xlen.

	gdb/
	* riscv-tdep.c (riscv_call_arg_scalar_int): Use std::min when
	setting len.  New local align, set to max of arg align and xlen,
	and pass to first riscv_assign_stack_location call.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62d7f54cc5f1ac7b3169dc771b8621a78d7bc4c6..2406c1a57016d8da138978d3391573f1cdef0225 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-11-14  Jim Wilson  <jimw@sifive.com>
+
+       * riscv-tdep.c (riscv_call_arg_scalar_int): Use std::min when
+       setting len.  New local align, set to max of arg align and xlen,
+       and pass to first riscv_assign_stack_location call.
+
 2018-11-12  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * skip.c (complete_skip_number): New function.

diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 7a92fc7fae5384653bbadd6a0f1478bdb532647c..b59cc6ef3221277f0cb2758c497ce24b30489f2b 100644 (file)
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -1925,12 +1925,13 @@ riscv_call_arg_scalar_int (struct riscv_arg_info *ainfo,
     }
   else
     {
-      int len = (ainfo->length > cinfo->xlen) ? cinfo->xlen : ainfo->length;
+      int len = std::min (ainfo->length, cinfo->xlen);
+      int align = std::max (ainfo->align, cinfo->xlen);
 
       if (!riscv_assign_reg_location (&ainfo->argloc[0],
                                      &cinfo->int_regs, len, 0))
        riscv_assign_stack_location (&ainfo->argloc[0],
-                                    &cinfo->memory, len, ainfo->align);
+                                    &cinfo->memory, len, align);
 
       if (len < ainfo->length)
        {