diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-04-13 06:25:07 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-04-14 12:12:34 -0600 |
| commit | 3b1bdd53b5a9f0798a9315fa9309d2979045aeaf (patch) | |
| tree | 10402986d9c10151e109f8df304b0cded1903ed2 | |
| parent | 94ea6ddb944d985890632708865ffef4436f98c3 (diff) | |
| download | gdb-3b1bdd53b5a9f0798a9315fa9309d2979045aeaf.zip gdb-3b1bdd53b5a9f0798a9315fa9309d2979045aeaf.tar.gz gdb-3b1bdd53b5a9f0798a9315fa9309d2979045aeaf.tar.bz2 | |
Rename read_string
This renames read_string to be an overload of target_read_string.
This makes it more consistent for the eventual merger with gdbserver.
| -rw-r--r-- | gdb/c-lang.c | 4 | ||||
| -rw-r--r-- | gdb/target.c | 4 | ||||
| -rw-r--r-- | gdb/valprint.c | 12 | ||||
| -rw-r--r-- | gdb/valprint.h | 10 |
4 files changed, 16 insertions, 14 deletions
diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 014dbef..a7ecf8f 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -352,8 +352,8 @@ 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, - byte_order, buffer, length); + err = target_read_string (addr, *length, width, fetchlimit, + byte_order, buffer, length); if (err != 0) memory_error (TARGET_XFER_E_IO, addr); } diff --git a/gdb/target.c b/gdb/target.c index f33bf34..6542305 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1406,8 +1406,8 @@ 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, - &buffer, bytes_read); + int errcode = target_read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE, + &buffer, bytes_read); if (errcode != 0) return {}; diff --git a/gdb/valprint.c b/gdb/valprint.c index 65b85cf..a4c0f7b 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -2050,9 +2050,11 @@ 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, - int *bytes_read) +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. */ unsigned int nfetch; /* Chars to fetch / chars fetched. */ @@ -2731,8 +2733,8 @@ 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, - &buffer, &bytes_read); + err = target_read_string (addr, len, width, fetchlimit, byte_order, + &buffer, &bytes_read); addr += bytes_read; diff --git a/gdb/valprint.h b/gdb/valprint.h index 0586836..2f4a502 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -165,11 +165,11 @@ 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, - unsigned int fetchlimit, - enum bfd_endian byte_order, - gdb::unique_xmalloc_ptr<gdb_byte> *buffer, - int *bytes_read); +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, + int *bytes_read); /* Helper function to check the validity of some bits of a value. |