diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/avr-tdep.c | 17 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b0c79b5653b..f2659151539 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-07-25 Pierre Langlois <pierre.langlois@embecosm.com> + + * avr-tdep.c (avr_address_to_pointer): Clarify the conversion in the + comments. + (avr_pointer_to_address): Likewise. + 2014-07-24 Tom Tromey <tromey@redhat.com> * monitor.c (compile_pattern): Update. diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index be0b543e6ff..1f268f25639 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -308,7 +308,7 @@ avr_address_to_pointer (struct gdbarch *gdbarch, /* Is it a data address in flash? */ if (AVR_TYPE_ADDRESS_CLASS_FLASH (type)) { - /* A data address in flash is always byte addressed. */ + /* A data pointer in flash is byte addressed. */ store_unsigned_integer (buf, TYPE_LENGTH (type), byte_order, avr_convert_iaddr_to_raw (addr)); } @@ -316,8 +316,8 @@ avr_address_to_pointer (struct gdbarch *gdbarch, else if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_METHOD) { - /* A code address, either a function pointer or the program counter, is - word (16 bits) addressed. */ + /* A code pointer is word (16 bits) addressed. We shift the address down + by 1 bit to convert it to a pointer. */ store_unsigned_integer (buf, TYPE_LENGTH (type), byte_order, avr_convert_iaddr_to_raw (addr >> 1)); } @@ -339,12 +339,19 @@ avr_pointer_to_address (struct gdbarch *gdbarch, /* Is it a data address in flash? */ if (AVR_TYPE_ADDRESS_CLASS_FLASH (type)) - return avr_make_iaddr (addr); + { + /* A data pointer in flash is already byte addressed. */ + 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 || TYPE_CODE_SPACE (TYPE_TARGET_TYPE (type))) - return avr_make_iaddr (addr << 1); + { + /* A code pointer is word (16 bits) addressed so we shift it up + by 1 bit to convert it to an address. */ + return avr_make_iaddr (addr << 1); + } else return avr_make_saddr (addr); } |