FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename read_string

Browse source 
This renames read_string to be an overload of target_read_string.
This makes it more consistent for the eventual merger with gdbserver.
This commit is contained in:
Tom Tromey 2022-04-13 06:25:07 -06:00
parent 94ea6ddb94
commit 3b1bdd53b5
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gdb/c-lang.c
View file

@ -352,7 +352,7 @@ c_get_string (struct value *value, gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
if (*length > 0)
fetchlimit = UINT_MAX;
err = read_string (addr, *length, width, fetchlimit,
err = target_read_string (addr, *length, width, fetchlimit,
byte_order, buffer, length);
if (err != 0)
memory_error (TARGET_XFER_E_IO, addr);

2
gdb/target.c
View file

@ -1406,7 +1406,7 @@ target_read_string (CORE_ADDR memaddr, int len, int *bytes_read)
bytes_read = &ignore;
/* Note that the endian-ness does not matter here. */
int errcode = read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE,
int errcode = target_read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE,
&buffer, bytes_read);
if (errcode != 0)
return {};

8
gdb/valprint.c
View file

@ -2050,8 +2050,10 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr,
failure happened. Check BYTES_READ to recognize this situation. */
int
read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
enum bfd_endian byte_order, gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
target_read_string (CORE_ADDR addr, int len, int width,
unsigned int fetchlimit,
enum bfd_endian byte_order,
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
int *bytes_read)
{
int errcode; /* Errno returned from bad reads. */
@ -2731,7 +2733,7 @@ val_print_string (struct type *elttype, const char *encoding,
fetchlimit = (len == -1 ? options->print_max : std::min ((unsigned) len,
options->print_max));
err = read_string (addr, len, width, fetchlimit, byte_order,
err = target_read_string (addr, len, width, fetchlimit, byte_order,
&buffer, &bytes_read);
addr += bytes_read;

2
gdb/valprint.h
View file

@ -165,7 +165,7 @@ extern void print_function_pointer_address (const struct value_print_options *op
CORE_ADDR address,
struct ui_file *stream);
extern int read_string (CORE_ADDR addr, int len, int width,
extern int target_read_string (CORE_ADDR addr, int len, int width,
unsigned int fetchlimit,
enum bfd_endian byte_order,
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,