mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-23 13:21:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the byte order parameter to target_read_string

Browse Source 
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.
This commit is contained in:
Tom Tromey 2022-04-13 06:32:28 -06:00
parent 3b1bdd53b5
commit 9da74023eb
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/c-lang.c
View File

@ -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);
}

3
gdb/target.c
View File

@ -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 {};

12
gdb/valprint.c
View File

@ -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;

1
gdb/valprint.h
View File

@ -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);