[v2] gdb/printcmd.c: Fix printing of Thumb minimal symbols.

Message ID 51B052C9.4060703@linaro.org
State Accepted
Headers show

Commit Message

Will Newton June 6, 2013, 9:13 a.m.
In build_address_symbolic we call gdbarch_addr_bits_remove for
symbols in the symbol table but not for minimal symbols. This
causes a failure in gdb.cp/virtfunc.exp on ARM, as the address
of the virtual thunk is given an offset of 1 when in Thumb mode.

gdb/ChangeLog:

2013-06-05  Will Newton  <will.newton@linaro.org>

	* printcmd.c (build_address_symbolic): Call
	gdbarch_addr_bits_remove for text minimal symbols.
---
 gdb/printcmd.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Changes since v1:
 - Also check for minimal symbols of type mst_solib_trampoline.

Comments

Pedro Alves June 6, 2013, 10:37 a.m. | #1
On 06/06/2013 10:13 AM, Will Newton wrote:
> 
> In build_address_symbolic we call gdbarch_addr_bits_remove for
> symbols in the symbol table but not for minimal symbols. This
> causes a failure in gdb.cp/virtfunc.exp on ARM, as the address
> of the virtual thunk is given an offset of 1 when in Thumb mode.
> 
> gdb/ChangeLog:
> 
> 2013-06-05  Will Newton  <will.newton@linaro.org>
> 
> 	* printcmd.c (build_address_symbolic): Call
> 	gdbarch_addr_bits_remove for text minimal symbols.

OK, thanks.

Patch

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 7beb334..99d4dba 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -689,6 +689,17 @@  build_address_symbolic (struct gdbarch *gdbarch,
     {
       if (SYMBOL_VALUE_ADDRESS (msymbol) > name_location || symbol == NULL)
 	{
+	  /* If this is a function (i.e. a code address), strip out any
+	     non-address bits.  For instance, display a pointer to the
+	     first instruction of a Thumb function as <function>; the
+	     second instruction will be <function+2>, even though the
+	     pointer is <function+3>.  This matches the ISA behavior.  */
+	  if (MSYMBOL_TYPE (msymbol) == mst_text
+	      || MSYMBOL_TYPE (msymbol) == mst_text_gnu_ifunc
+	      || MSYMBOL_TYPE (msymbol) == mst_file_text
+	      || MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
+	    addr = gdbarch_addr_bits_remove (gdbarch, addr);
+
 	  /* The msymbol is closer to the address than the symbol;
 	     use the msymbol instead.  */
 	  symbol = 0;