public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Remove the byte order parameter to target_read_string
@ 2022-04-14 18:21 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-04-14 18:21 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9da74023eb9378315d6b7e1bae02f52cfecc8bd1
commit 9da74023eb9378315d6b7e1bae02f52cfecc8bd1
Author: Tom Tromey <tromey@adacore.com>
Date: Wed Apr 13 06:32:28 2022 -0600
Remove the byte order parameter to target_read_string
target_read_string takes a byte order parameter, but only uses this to
check whether a given character is zero. This is readily done without
requiring the parameter, so remove it.
Diff:
---
gdb/c-lang.c | 2 +-
gdb/target.c | 3 +--
gdb/valprint.c | 12 +++++++-----
gdb/valprint.h | 1 -
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index a7ecf8f91da..be9ee073f58 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -353,7 +353,7 @@ c_get_string (struct value *value, gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
fetchlimit = UINT_MAX;
err = target_read_string (addr, *length, width, fetchlimit,
- byte_order, buffer, length);
+ buffer, length);
if (err != 0)
memory_error (TARGET_XFER_E_IO, addr);
}
diff --git a/gdb/target.c b/gdb/target.c
index 6542305f0d0..5a416d5ee3a 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1406,8 +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 = target_read_string (memaddr, -1, 1, len, BFD_ENDIAN_LITTLE,
- &buffer, bytes_read);
+ int errcode = target_read_string (memaddr, -1, 1, len, &buffer, bytes_read);
if (errcode != 0)
return {};
diff --git a/gdb/valprint.c b/gdb/valprint.c
index a4c0f7b343d..8f9954778c5 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -2052,7 +2052,6 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr,
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)
{
@@ -2122,12 +2121,15 @@ target_read_string (CORE_ADDR addr, int len, int width,
limit = bufptr + nfetch * width;
while (bufptr < limit)
{
- unsigned long c;
+ bool found_nonzero = false;
+
+ for (int i = 0; !found_nonzero && i < width; ++i)
+ if (bufptr[i] != 0)
+ found_nonzero = true;
- c = extract_unsigned_integer (bufptr, width, byte_order);
addr += width;
bufptr += width;
- if (c == 0)
+ if (!found_nonzero)
{
/* We don't care about any error which happened after
the NUL terminator. */
@@ -2733,7 +2735,7 @@ val_print_string (struct type *elttype, const char *encoding,
fetchlimit = (len == -1 ? options->print_max : std::min ((unsigned) len,
options->print_max));
- err = target_read_string (addr, len, width, fetchlimit, byte_order,
+ err = target_read_string (addr, len, width, fetchlimit,
&buffer, &bytes_read);
addr += bytes_read;
diff --git a/gdb/valprint.h b/gdb/valprint.h
index 2f4a5022b3e..b12495b10c1 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -167,7 +167,6 @@ extern void print_function_pointer_address (const struct value_print_options *op
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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-14 18:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-14 18:21 [binutils-gdb] Remove the byte order parameter to target_read_string Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).