gdb.trace: Fix string collection for 64-bit platforms.

String collection always used ref32 to fetch the string pointer.  Make it
use gen_fetch instead.

As a side effect, this patch changes dup+const+trace+pop sequence used
for collecting the string's address to a trace_quick opcode.  This
results in a shorter agent expression.

This appeared to work on x86_64 since it's a little-endian platform, and
malloc (used in gdb.trace/collection.exp) returns addresses in low 4GB.
Noticed and tested on s390x-ibm-linux-gnu, also tested on
i686-unknown-linux-gnu and x86_64-unknown-linux-gnu.

gdb/ChangeLog:

	* ax-gdb.c (gen_traced_pop): Use gen_fetch for string collection.
This commit is contained in:
Marcin Kościelnicki 2016-01-21 16:58:12 +01:00
parent dfc4394024
commit f906b85701
2 changed files with 15 additions and 12 deletions

View File

@ -1,3 +1,7 @@
2016-01-21 Marcin Kościelnicki <koriakin@0x04.net>
* ax-gdb.c (gen_traced_pop): Use gen_fetch for string collection.
2016-01-21 Andrew Burgess <andrew.burgess@embecosm.com>
* disasm.c (maybe_add_dis_line_entry): Rename to...

View File

@ -394,12 +394,17 @@ gen_traced_pop (struct gdbarch *gdbarch,
case axs_lvalue_memory:
{
if (string_trace)
ax_simple (ax, aop_dup);
/* Initialize the TYPE_LENGTH if it is a typedef. */
check_typedef (value->type);
if (string_trace)
{
gen_fetch (ax, value->type);
ax_const_l (ax, ax->trace_string);
ax_simple (ax, aop_tracenz);
}
else
{
/* There's no point in trying to use a trace_quick bytecode
here, since "trace_quick SIZE pop" is three bytes, whereas
"const8 SIZE trace" is also three bytes, does the same
@ -407,12 +412,6 @@ gen_traced_pop (struct gdbarch *gdbarch,
work correctly for objects with large sizes. */
ax_const_l (ax, TYPE_LENGTH (value->type));
ax_simple (ax, aop_trace);
if (string_trace)
{
ax_simple (ax, aop_ref32);
ax_const_l (ax, ax->trace_string);
ax_simple (ax, aop_tracenz);
}
}
break;