Re: [PATCH 5/11] Add M32R_MAX_REGISTER_SIZE

Alan Hayward
2017-04-12T08:22:06Z

> On 11 Apr 2017, at 10:02, Yao Qi <qiyaoltc@gmail.com> wrote:
>
> Alan Hayward <Alan.Hayward@arm.com> writes:
>
>> +/* Big enough to hold the size of the largest register in bytes. */
>> +#define M32R_MAX_REGISTER_SIZE 4
>> +
>> #endif /* m32r-tdep.h */
>> diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
>> index 40f29d343b91f254cce2dd783553795c9c990eff..cb53a352b2d47068ad7cd5dacd3325d66bd77964 100644
>> --- a/gdb/m32r-tdep.c
>> +++ b/gdb/m32r-tdep.c
>> @@ -677,7 +677,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
>> enum type_code typecode;
>> CORE_ADDR regval;
>> gdb_byte *val;
>> - gdb_byte valbuf[MAX_REGISTER_SIZE];
>> + gdb_byte valbuf[M32R_MAX_REGISTER_SIZE];
>
> valbuf is only used for argument registers, r0 - r3. Can you rename
> M32R_MAX_REGISTER_SIZE with M32R_ARG_REGISTER_SIZE? and move its
> definition into m32r-tdep.c.
>
> /* The size of argument registers (r0 - r3) in bytes. */
> #define M32R_ARG_REGISTER_SIZE 4
>
> OK with the change.
>
> --
> Yao (齐尧)

Ok, pushed the following patch:

Alan.

2017-04-12 Alan Hayward <alan.hayward@arm.com>

* m32r-tdep.c M32R_ARG_REGISTER_SIZE: Added.
(m32r_push_dummy_call): Use M32R_ARG_REGISTER_SIZE.

diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 1d0d7ed..4701f7a 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -39,6 +39,9 @@
#include "m32r-tdep.h"
#include <algorithm>

+/* The size of the argument registers (r0 - r3) in bytes. */
+#define M32R_ARG_REGISTER_SIZE 4
+
/* Local functions */

extern void _initialize_m32r_tdep (void);
@@ -677,7 +680,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
enum type_code typecode;
CORE_ADDR regval;
gdb_byte *val;
- gdb_byte valbuf[MAX_REGISTER_SIZE];
+ gdb_byte valbuf[M32R_ARG_REGISTER_SIZE];
int len;

/* First force sp to a 4-byte alignment. */