diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f0220f5275d..56ebcc6ee9a 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 3c8319f929f..f87c529cfcd 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 4e2d0059680..01bac7e1861 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 32234f7bba3..cad5c52cc25 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