gdb/nds32: Use type_align instead of nds32_type_align
The general type_align method should be a suitable alternative to nds32_type_align, so switch to use that. The only change this will introduce is related to static fields in a struct or union, the existing code doesn't take account of static fields when computing the alignment for structs of unions, though this is probably a bug - which would probably be exposed by the test case gdb.cp/many-args.exp, though I don't have any way to test this target right now. gdb/ChangeLog: * nds32-tdep.c (nds32_type_align): Delete. (nds32_push_dummy_call): Use type_align instead.
This commit is contained in:
parent
030197b43c
commit
ecbc06d2a6
2 changed files with 7 additions and 47 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2019-04-23 Andrew Burgess <andrew.burgess@embecosm.com>
|
||||||
|
|
||||||
|
* nds32-tdep.c (nds32_type_align): Delete.
|
||||||
|
(nds32_push_dummy_call): Use type_align instead.
|
||||||
|
|
||||||
2019-04-23 Andrew Burgess <andrew.burgess@embecosm.com>
|
2019-04-23 Andrew Burgess <andrew.burgess@embecosm.com>
|
||||||
|
|
||||||
* arm-tdep.c (arm_type_align): Only handle vector override case.
|
* arm-tdep.c (arm_type_align): Only handle vector override case.
|
||||||
|
|
|
@ -1439,51 +1439,6 @@ nds32_check_calling_use_fpr (struct type *type)
|
||||||
return typecode == TYPE_CODE_FLT;
|
return typecode == TYPE_CODE_FLT;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return the alignment (in bytes) of the given type. */
|
|
||||||
|
|
||||||
static int
|
|
||||||
nds32_type_align (struct type *type)
|
|
||||||
{
|
|
||||||
int n;
|
|
||||||
int align;
|
|
||||||
int falign;
|
|
||||||
|
|
||||||
type = check_typedef (type);
|
|
||||||
switch (TYPE_CODE (type))
|
|
||||||
{
|
|
||||||
default:
|
|
||||||
/* Should never happen. */
|
|
||||||
internal_error (__FILE__, __LINE__, _("unknown type alignment"));
|
|
||||||
return 4;
|
|
||||||
|
|
||||||
case TYPE_CODE_PTR:
|
|
||||||
case TYPE_CODE_ENUM:
|
|
||||||
case TYPE_CODE_INT:
|
|
||||||
case TYPE_CODE_FLT:
|
|
||||||
case TYPE_CODE_SET:
|
|
||||||
case TYPE_CODE_RANGE:
|
|
||||||
case TYPE_CODE_REF:
|
|
||||||
case TYPE_CODE_CHAR:
|
|
||||||
case TYPE_CODE_BOOL:
|
|
||||||
return TYPE_LENGTH (type);
|
|
||||||
|
|
||||||
case TYPE_CODE_ARRAY:
|
|
||||||
case TYPE_CODE_COMPLEX:
|
|
||||||
return nds32_type_align (TYPE_TARGET_TYPE (type));
|
|
||||||
|
|
||||||
case TYPE_CODE_STRUCT:
|
|
||||||
case TYPE_CODE_UNION:
|
|
||||||
align = 1;
|
|
||||||
for (n = 0; n < TYPE_NFIELDS (type); n++)
|
|
||||||
{
|
|
||||||
falign = nds32_type_align (TYPE_FIELD_TYPE (type, n));
|
|
||||||
if (falign > align)
|
|
||||||
align = falign;
|
|
||||||
}
|
|
||||||
return align;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Implement the "push_dummy_call" gdbarch method. */
|
/* Implement the "push_dummy_call" gdbarch method. */
|
||||||
|
|
||||||
static CORE_ADDR
|
static CORE_ADDR
|
||||||
|
@ -1522,7 +1477,7 @@ nds32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
|
||||||
for (i = 0; i < nargs; i++)
|
for (i = 0; i < nargs; i++)
|
||||||
{
|
{
|
||||||
struct type *type = value_type (args[i]);
|
struct type *type = value_type (args[i]);
|
||||||
int align = nds32_type_align (type);
|
int align = type_align (type);
|
||||||
|
|
||||||
/* If align is zero, it may be an empty struct.
|
/* If align is zero, it may be an empty struct.
|
||||||
Just ignore the argument of empty struct. */
|
Just ignore the argument of empty struct. */
|
||||||
|
@ -1548,7 +1503,7 @@ nds32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
|
||||||
type = value_type (args[i]);
|
type = value_type (args[i]);
|
||||||
calling_use_fpr = nds32_check_calling_use_fpr (type);
|
calling_use_fpr = nds32_check_calling_use_fpr (type);
|
||||||
len = TYPE_LENGTH (type);
|
len = TYPE_LENGTH (type);
|
||||||
align = nds32_type_align (type);
|
align = type_align (type);
|
||||||
val = value_contents (args[i]);
|
val = value_contents (args[i]);
|
||||||
|
|
||||||
/* The size of a composite type larger than 4 bytes will be rounded
|
/* The size of a composite type larger than 4 bytes will be rounded
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue