This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] gdb.trace: Use g packet order in tfile_fetch_registers.
- From: Marcin KoÅcielnicki <koriakin at 0x04 dot net>
- To: palves at redhat dot com
- Cc: gdb-patches at sourceware dot org, Marcin KoÅcielnicki <koriakin at 0x04 dot net>
- Date: Wed, 10 Feb 2016 15:12:12 +0100
- Subject: [PATCH] gdb.trace: Use g packet order in tfile_fetch_registers.
- Authentication-results: sourceware.org; auth=none
- References: <56BB4101 dot 5050902 at redhat dot com>
tfile_fetch_registers currently wrongly fetches registers using
gdb order instead of g packet order. On x86_64 with AVX, this causes
problems with ymm*h and orig_rax registers: gdb has ymm*h first, while
g packet has orig_rax first.
gdb/ChangeLog:
* tracefile-tfile.c (tfile_fetch_registers): Use g packet order
instead of gdb order.
gdb/doc/ChangeLog:
* gdb.texinfo (Trace File Format): Remove misleading information
about register block ordering.
---
Removed misleading documentation bit. OK to push now?
gdb/ChangeLog | 5 +++++
gdb/doc/ChangeLog | 5 +++++
gdb/doc/gdb.texinfo | 3 +--
gdb/tracefile-tfile.c | 11 ++++++-----
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0454696..fd7dd9d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-02-10 Marcin KoÅcielnicki <koriakin@0x04.net>
+ * tracefile-tfile.c (tfile_fetch_registers): Use g packet order
+ instead of gdb order.
+
+2016-02-10 Marcin KoÅcielnicki <koriakin@0x04.net>
+
* tracefile-tfile.c (trace_tdesc): New static variable.
(trace_tdesc_alloc): New static variable.
(trace_tdesc_len): New static variable.
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 05d2694..75b24ef 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-10 Marcin KoÅcielnicki <koriakin@0x04.net>
+
+ * gdb.texinfo (Trace File Format): Remove misleading information
+ about register block ordering.
+
2016-02-01 Doug Evans <dje@google.com>
* gdb.texinfo (Value Sizes): Fix typo.
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 2d09d13..9db234e 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -41048,8 +41048,7 @@ endianness.
@item R @var{bytes}
Register block. The number and ordering of bytes matches that of a
@code{g} packet in the remote protocol. Note that these are the
-actual bytes, in target order and @value{GDBN} register order, not a
-hexadecimal encoding.
+actual bytes, in target order, not a hexadecimal encoding.
@item M @var{address} @var{length} @var{bytes}...
Memory block. This is a contiguous block of memory, at the 8-byte
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 139d90a..a6c3c9c 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -30,6 +30,7 @@
#include "filenames.h"
#include "xml-tdesc.h"
#include "target-descriptions.h"
+#include "remote.h"
#ifndef O_LARGEFILE
#define O_LARGEFILE 0
@@ -857,7 +858,7 @@ tfile_fetch_registers (struct target_ops *ops,
struct regcache *regcache, int regno)
{
struct gdbarch *gdbarch = get_regcache_arch (regcache);
- int offset, regn, regsize;
+ int offset, regn, regsize, dummy;
/* An uninitialized reg size says we're not going to be
successful at getting register blocks. */
@@ -870,11 +871,12 @@ tfile_fetch_registers (struct target_ops *ops,
tfile_read (regs, trace_regblock_size);
- /* Assume the block is laid out in GDB register number order,
- each register with the size that it has in GDB. */
- offset = 0;
for (regn = 0; regn < gdbarch_num_regs (gdbarch); regn++)
{
+ if (!remote_register_number_and_offset (get_regcache_arch (regcache),
+ regn, &dummy, &offset))
+ continue;
+
regsize = register_size (gdbarch, regn);
/* Make sure we stay within block bounds. */
if (offset + regsize > trace_regblock_size)
@@ -891,7 +893,6 @@ tfile_fetch_registers (struct target_ops *ops,
regcache_raw_supply (regcache, regn, regs + offset);
}
}
- offset += regsize;
}
}
else
--
2.7.0