diff options
Diffstat (limited to 'gdb/avr-tdep.c')
| -rw-r--r-- | gdb/avr-tdep.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index d823c87..fd602e3 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -314,8 +314,8 @@ avr_address_to_pointer (struct gdbarch *gdbarch, avr_convert_iaddr_to_raw (addr)); } /* Is it a code address? */ - else if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD) + else if (TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_FUNC + || TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_METHOD) { /* A code pointer is word (16 bits) addressed. We shift the address down by 1 bit to convert it to a pointer. */ @@ -345,8 +345,8 @@ avr_pointer_to_address (struct gdbarch *gdbarch, return avr_make_iaddr (addr); } /* Is it a code address? */ - else if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC - || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD + else if (TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_FUNC + || TYPE_TARGET_TYPE (type)->code () == TYPE_CODE_METHOD || TYPE_CODE_SPACE (TYPE_TARGET_TYPE (type))) { /* A code pointer is word (16 bits) addressed so we shift it up @@ -935,9 +935,9 @@ avr_return_value (struct gdbarch *gdbarch, struct value *function, register holds the LSB. */ int lsb_reg; - if ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT - || TYPE_CODE (valtype) == TYPE_CODE_UNION - || TYPE_CODE (valtype) == TYPE_CODE_ARRAY) + if ((valtype->code () == TYPE_CODE_STRUCT + || valtype->code () == TYPE_CODE_UNION + || valtype->code () == TYPE_CODE_ARRAY) && TYPE_LENGTH (valtype) > 8) return RETURN_VALUE_STRUCT_CONVENTION; |