From cc9f16aa882eb22cb2128c5eb8237fd453ab2988 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 29 Jul 2015 12:43:10 +0100 Subject: [PATCH] PR record/18691: Fix fails in solib-precsave.exp We see the following regressions in testing on x86_64-linux, reverse-step^M Cannot access memory at address 0x2aaaaaed26c0^M (gdb) FAIL: gdb.reverse/solib-precsave.exp: reverse-step into solib function one when GDB reverse step into a function, GDB wants to skip prologue so it requests TARGET_OBJECT_CODE_MEMORY to read some code memory in memory_xfer_partial_1. However in dcache_read_memory_partial, the object becomes TARGET_OBJECT_MEMORY return ops->to_xfer_partial (ops, TARGET_OBJECT_MEMORY, NULL, myaddr, NULL, memaddr, len, xfered_len); in reverse debugging, ops->to_xfer_partial is record_full_core_xfer_partial and it will return TARGET_XFER_E_IO because it can't find any records. The test fails. At this moment, the delegate relationship is like dcache -> record-core -> core -> exec and we want to GDB read memory across targets, which means if the requested memory isn't found in record-core, GDB can read memory from core, and exec even further if needed. I find raw_memory_xfer_partial is exactly what I want. gdb: 2015-07-29 Yao Qi PR record/18691 * dcache.c (dcache_read_memory_partial): Call raw_memory_xfer_partial. * target.c (raw_memory_xfer_partial): Make it non-static. * target.h (raw_memory_xfer_partial): Declare. --- gdb/ChangeLog | 8 ++++++++ gdb/dcache.c | 5 ++--- gdb/target.c | 2 +- gdb/target.h | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f0220f5275..56ebcc6ee9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2015-07-29 Yao Qi + + PR record/18691 + * dcache.c (dcache_read_memory_partial): Call + raw_memory_xfer_partial. + * target.c (raw_memory_xfer_partial): Make it non-static. + * target.h (raw_memory_xfer_partial): Declare. + 2015-07-28 Simon Marchi * c-valprint.c (c_val_print_array): Consider addressable memory diff --git a/gdb/dcache.c b/gdb/dcache.c index 3c8319f929..f87c529cfc 100644 --- a/gdb/dcache.c +++ b/gdb/dcache.c @@ -498,9 +498,8 @@ dcache_read_memory_partial (struct target_ops *ops, DCACHE *dcache, { /* Even though reading the whole line failed, we may be able to read a piece starting where the caller wanted. */ - return ops->to_xfer_partial (ops, TARGET_OBJECT_MEMORY, NULL, - myaddr, NULL, memaddr, len, - xfered_len); + return raw_memory_xfer_partial (ops, myaddr, NULL, memaddr, len, + xfered_len); } else { diff --git a/gdb/target.c b/gdb/target.c index 4e2d005968..01bac7e186 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1060,7 +1060,7 @@ memory_xfer_check_region (gdb_byte *readbuf, const gdb_byte *writebuf, instance, could have some of memory but delegate other bits to the target below it. So, we must manually try all targets. */ -static enum target_xfer_status +enum target_xfer_status raw_memory_xfer_partial (struct target_ops *ops, gdb_byte *readbuf, const gdb_byte *writebuf, ULONGEST memaddr, LONGEST len, ULONGEST *xfered_len) diff --git a/gdb/target.h b/gdb/target.h index 32234f7bba..cad5c52cc2 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -265,6 +265,11 @@ typedef enum target_xfer_status ULONGEST len, ULONGEST *xfered_len); +enum target_xfer_status + raw_memory_xfer_partial (struct target_ops *ops, gdb_byte *readbuf, + const gdb_byte *writebuf, ULONGEST memaddr, + LONGEST len, ULONGEST *xfered_len); + /* Request that OPS transfer up to LEN addressable units of the target's OBJECT. When reading from a memory object, the size of an addressable unit is architecture dependent and can be found using -- 2.34.1