[2/2] gdb: make avr_integer_to_address generate code or data address based on type

Message ID 20200524142040.209234-2-simon.marchi@polymtl.ca
State New
Headers show
Series
  • [1/2] gdb/testsuite: add simavr.exp board
Related show

Commit Message

Simon Marchi via Gdb-patches May 24, 2020, 2:20 p.m.
From: Cristiano De Alti <cristiano_dealti@hotmail.com>


I (Simon Marchi) am re-sending this patch written by Cristiano De Alti:

    https://sourceware.org/legacy-ml/gdb-patches/2016-03/msg00318.html

The commit message is new but the code has not changed.

The AVR architecture is a Harvard one, meaning it has different memory
spaces for code and data.  In GDB, this is dealt with by having the data
(SRAM) addresses start at 0x00800000.  When interpreting an integer as
an address (converting to a CORE_ADDR), we currently always generate a
data address.  This doesn't work for some cases described below, where
the integer is meant to represent a code address.

This patch changes avr_integer_to_address so that it generates the
correct type of address (code or data) based on the passed type.

Using the simavr.exp board, I didn't see any regressions when running
the gdb.base/*.exp tests.  A few tests go from fail to pass, but none
from pass to fail.  There are a few new fails and unresolved, but it's
just because some tests manage to make more progress before failing in a
different way.

In practice, it fixes disassembling by address, as described in the PR:

    - (gdb) disassemble 0x12a,0x12b
    - Dump of assembler code from 0x12a to 0x12b:
    -    0x0000012a <main+0>: push    r28
    - End of assembler dump.

    + (gdb) disassemble 0x12a,0x12b
    + Dump of assembler code from 0x80012a to 0x80012b:
    +    0x0080012a:  nop
    + End of assembler dump.

And also, setting a breakpoint by address:

    - (gdb) p &main
    - $1 = (int (*)(void)) 0x12a <main>
    - (gdb) b *0x12a
    - Breakpoint 1 at 0x80012a

    + (gdb) p &main
    + $1 = (int (*)(void)) 0x12a <main>
    + (gdb) b *0x12a
    + Breakpoint 1 at 0x12a: file test-avr.c, line 3.
    + Note: automatically using hardware breakpoints for read-only addresses.

gdb/ChangeLog:

	PR gdb/13519
	* avr-tdep.c (avr_integer_to_address): Return data or code
	address accordingly to the second 'type' argument of the
	function.
---
 gdb/avr-tdep.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.26.2

Comments

Simon Marchi via Gdb-patches May 24, 2020, 4:36 p.m. | #1
On 5/24/20 3:20 PM, Simon Marchi via Gdb-patches wrote:
> From: Cristiano De Alti <cristiano_dealti@hotmail.com>

> 

> I (Simon Marchi) am re-sending this patch written by Cristiano De Alti:

> 

>     https://sourceware.org/legacy-ml/gdb-patches/2016-03/msg00318.html

> 

> The commit message is new but the code has not changed.

> 

> The AVR architecture is a Harvard one, meaning it has different memory

> spaces for code and data.  In GDB, this is dealt with by having the data

> (SRAM) addresses start at 0x00800000.  When interpreting an integer as

> an address (converting to a CORE_ADDR), we currently always generate a

> data address.  This doesn't work for some cases described below, where

> the integer is meant to represent a code address.

> 

> This patch changes avr_integer_to_address so that it generates the

> correct type of address (code or data) based on the passed type.

> 

> Using the simavr.exp board, I didn't see any regressions when running

> the gdb.base/*.exp tests.  A few tests go from fail to pass, but none

> from pass to fail.  There are a few new fails and unresolved, but it's

> just because some tests manage to make more progress before failing in a

> different way.

> 

> In practice, it fixes disassembling by address, as described in the PR:

> 

>     - (gdb) disassemble 0x12a,0x12b

>     - Dump of assembler code from 0x12a to 0x12b:

>     -    0x0000012a <main+0>: push    r28

>     - End of assembler dump.

> 

>     + (gdb) disassemble 0x12a,0x12b

>     + Dump of assembler code from 0x80012a to 0x80012b:

>     +    0x0080012a:  nop

>     + End of assembler dump.

> 

> And also, setting a breakpoint by address:

> 

>     - (gdb) p &main

>     - $1 = (int (*)(void)) 0x12a <main>

>     - (gdb) b *0x12a

>     - Breakpoint 1 at 0x80012a

> 

>     + (gdb) p &main

>     + $1 = (int (*)(void)) 0x12a <main>

>     + (gdb) b *0x12a

>     + Breakpoint 1 at 0x12a: file test-avr.c, line 3.

>     + Note: automatically using hardware breakpoints for read-only addresses.

> 

> gdb/ChangeLog:

> 

> 	PR gdb/13519

> 	* avr-tdep.c (avr_integer_to_address): Return data or code

> 	address accordingly to the second 'type' argument of the

> 	function.


Thank you for writing the commit log.  LGTM.

Pedro Alves

Patch

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index fd602e35e50d..74ab531711e9 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -363,7 +363,10 @@  avr_integer_to_address (struct gdbarch *gdbarch,
 {
   ULONGEST addr = unpack_long (type, buf);
 
-  return avr_make_saddr (addr);
+  if (TYPE_DATA_SPACE (type))
+    return avr_make_saddr (addr);
+  else
+    return avr_make_iaddr (addr);
 }
 
 static CORE_ADDR