mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-24 02:24:46 +08:00
Use unique_xmalloc_ptr for read_string
This changes read_string's "buffer" out-parameter to be a unique_xmalloc_ptr, then updates the users. This allows for the removal of some cleanups. I chose unique_xmalloc_ptr rather than byte_vector here due to the way Guile unwinding seems to work. Tested by the buildbot. gdb/ChangeLog 2018-06-18 Tom Tromey <tom@tromey.com> * valprint.h (read_string): Update. * valprint.c (read_string): Change type of "buffer". (val_print_string): Update. * python/py-value.c (valpy_string): Update. * language.h (struct language_defn) <la_get_string>: Change type of "buffer". (default_get_string, c_get_string): Update. * language.c (default_get_string): Change type of "buffer". * guile/scm-value.c (gdbscm_value_to_string): Update. * c-lang.c (c_get_string): Change type of "buffer".
This commit is contained in:
Tom Tromey
parent
3f0dbd670b
commit
b4be9fadea
@ -1,3 +1,16 @@
|
||||
2018-06-18 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* valprint.h (read_string): Update.
|
||||
* valprint.c (read_string): Change type of "buffer".
|
||||
(val_print_string): Update.
|
||||
* python/py-value.c (valpy_string): Update.
|
||||
* language.h (struct language_defn) <la_get_string>: Change
|
||||
type of "buffer".
|
||||
(default_get_string, c_get_string): Update.
|
||||
* language.c (default_get_string): Change type of "buffer".
|
||||
* guile/scm-value.c (gdbscm_value_to_string): Update.
|
||||
* c-lang.c (c_get_string): Change type of "buffer".
|
||||
|
||||
2018-06-18 Tom Tromey <tom@tromey.com>
|
||||
|
||||
* ser-mingw.c (struct pipe_state_destroyer): New.
|
||||
|
||||
13
gdb/c-lang.c
13
gdb/c-lang.c
@ -234,7 +234,7 @@ c_printstr (struct ui_file *stream, struct type *type,
|
||||
target charset. */
|
||||
|
||||
void
|
||||
c_get_string (struct value *value, gdb_byte **buffer,
|
||||
c_get_string (struct value *value, gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *length, struct type **char_type,
|
||||
const char **charset)
|
||||
{
|
||||
@ -300,8 +300,8 @@ c_get_string (struct value *value, gdb_byte **buffer,
|
||||
/* I is now either a user-defined length, the number of non-null
|
||||
characters, or FETCHLIMIT. */
|
||||
*length = i * width;
|
||||
*buffer = (gdb_byte *) xmalloc (*length);
|
||||
memcpy (*buffer, contents, *length);
|
||||
buffer->reset ((gdb_byte *) xmalloc (*length));
|
||||
memcpy (buffer->get (), contents, *length);
|
||||
err = 0;
|
||||
}
|
||||
else
|
||||
@ -326,10 +326,7 @@ c_get_string (struct value *value, gdb_byte **buffer,
|
||||
err = read_string (addr, *length, width, fetchlimit,
|
||||
byte_order, buffer, length);
|
||||
if (err != 0)
|
||||
{
|
||||
xfree (*buffer);
|
||||
memory_error (TARGET_XFER_E_IO, addr);
|
||||
}
|
||||
memory_error (TARGET_XFER_E_IO, addr);
|
||||
}
|
||||
|
||||
/* If the LENGTH is specified at -1, we want to return the string
|
||||
@ -339,7 +336,7 @@ c_get_string (struct value *value, gdb_byte **buffer,
|
||||
if (req_length == -1)
|
||||
/* If the last character is null, subtract it from LENGTH. */
|
||||
if (*length > 0
|
||||
&& extract_unsigned_integer (*buffer + *length - width,
|
||||
&& extract_unsigned_integer (buffer->get () + *length - width,
|
||||
width, byte_order) == 0)
|
||||
*length -= width;
|
||||
|
||||
|
||||
@ -1106,7 +1106,7 @@ gdbscm_value_to_string (SCM self, SCM rest)
|
||||
char *encoding = NULL;
|
||||
SCM errors = SCM_BOOL_F;
|
||||
int length = -1;
|
||||
gdb_byte *buffer = NULL;
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> buffer;
|
||||
const char *la_encoding = NULL;
|
||||
struct type *char_type = NULL;
|
||||
SCM result;
|
||||
@ -1163,9 +1163,10 @@ gdbscm_value_to_string (SCM self, SCM rest)
|
||||
scm_dynwind_begin ((scm_t_dynwind_flags) 0);
|
||||
|
||||
gdbscm_dynwind_xfree (encoding);
|
||||
gdbscm_dynwind_xfree (buffer);
|
||||
gdb_byte *buffer_contents = buffer.release ();
|
||||
gdbscm_dynwind_xfree (buffer_contents);
|
||||
|
||||
result = scm_from_stringn ((const char *) buffer,
|
||||
result = scm_from_stringn ((const char *) buffer_contents,
|
||||
length * TYPE_LENGTH (char_type),
|
||||
(encoding != NULL && *encoding != '\0'
|
||||
? encoding
|
||||
|
||||
@ -691,8 +691,9 @@ default_print_array_index (struct value *index_value, struct ui_file *stream,
|
||||
}
|
||||
|
||||
void
|
||||
default_get_string (struct value *value, gdb_byte **buffer, int *length,
|
||||
struct type **char_type, const char **charset)
|
||||
default_get_string (struct value *value,
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *length, struct type **char_type, const char **charset)
|
||||
{
|
||||
error (_("Getting a string is unsupported in this language."));
|
||||
}
|
||||
|
||||
@ -366,8 +366,10 @@ struct language_defn
|
||||
characters, excluding any eventual terminating null character.
|
||||
Otherwise *LENGTH will include all characters - including any nulls.
|
||||
CHARSET will hold the encoding used in the string. */
|
||||
void (*la_get_string) (struct value *value, gdb_byte **buffer, int *length,
|
||||
struct type **chartype, const char **charset);
|
||||
void (*la_get_string) (struct value *value,
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *length, struct type **chartype,
|
||||
const char **charset);
|
||||
|
||||
/* Return an expression that can be used for a location
|
||||
watchpoint. TYPE is a pointer type that points to the memory
|
||||
@ -627,8 +629,10 @@ int default_pass_by_reference (struct type *type);
|
||||
void default_print_typedef (struct type *type, struct symbol *new_symbol,
|
||||
struct ui_file *stream);
|
||||
|
||||
void default_get_string (struct value *value, gdb_byte **buffer, int *length,
|
||||
struct type **char_type, const char **charset);
|
||||
void default_get_string (struct value *value,
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *length, struct type **char_type,
|
||||
const char **charset);
|
||||
|
||||
/* Default name hashing function. */
|
||||
|
||||
@ -638,8 +642,10 @@ void default_get_string (struct value *value, gdb_byte **buffer, int *length,
|
||||
comparison operators hash to the same value. */
|
||||
extern unsigned int default_search_name_hash (const char *search_name);
|
||||
|
||||
void c_get_string (struct value *value, gdb_byte **buffer, int *length,
|
||||
struct type **char_type, const char **charset);
|
||||
void c_get_string (struct value *value,
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *length, struct type **char_type,
|
||||
const char **charset);
|
||||
|
||||
/* The default implementation of la_symbol_name_matcher. Matches with
|
||||
strncmp_iw. */
|
||||
|
||||
@ -517,9 +517,8 @@ static PyObject *
|
||||
valpy_string (PyObject *self, PyObject *args, PyObject *kw)
|
||||
{
|
||||
int length = -1;
|
||||
gdb_byte *buffer;
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> buffer;
|
||||
struct value *value = ((value_object *) self)->value;
|
||||
PyObject *unicode;
|
||||
const char *encoding = NULL;
|
||||
const char *errors = NULL;
|
||||
const char *user_encoding = NULL;
|
||||
@ -542,12 +541,9 @@ valpy_string (PyObject *self, PyObject *args, PyObject *kw)
|
||||
END_CATCH
|
||||
|
||||
encoding = (user_encoding && *user_encoding) ? user_encoding : la_encoding;
|
||||
unicode = PyUnicode_Decode ((const char *) buffer,
|
||||
length * TYPE_LENGTH (char_type),
|
||||
encoding, errors);
|
||||
xfree (buffer);
|
||||
|
||||
return unicode;
|
||||
return PyUnicode_Decode ((const char *) buffer.get (),
|
||||
length * TYPE_LENGTH (char_type),
|
||||
encoding, errors);
|
||||
}
|
||||
|
||||
/* A helper function that implements the various cast operators. */
|
||||
|
||||
@ -2096,10 +2096,10 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr,
|
||||
return (nread);
|
||||
}
|
||||
|
||||
/* Read a string from the inferior, at ADDR, with LEN characters of WIDTH bytes
|
||||
each. Fetch at most FETCHLIMIT characters. BUFFER will be set to a newly
|
||||
allocated buffer containing the string, which the caller is responsible to
|
||||
free, and BYTES_READ will be set to the number of bytes read. Returns 0 on
|
||||
/* Read a string from the inferior, at ADDR, with LEN characters of
|
||||
WIDTH bytes each. Fetch at most FETCHLIMIT characters. BUFFER
|
||||
will be set to a newly allocated buffer containing the string, and
|
||||
BYTES_READ will be set to the number of bytes read. Returns 0 on
|
||||
success, or a target_xfer_status on failure.
|
||||
|
||||
If LEN > 0, reads the lesser of LEN or FETCHLIMIT characters
|
||||
@ -2122,20 +2122,18 @@ partial_memory_read (CORE_ADDR memaddr, gdb_byte *myaddr,
|
||||
|
||||
int
|
||||
read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
|
||||
enum bfd_endian byte_order, gdb_byte **buffer, int *bytes_read)
|
||||
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. */
|
||||
gdb_byte *bufptr; /* Pointer to next available byte in
|
||||
buffer. */
|
||||
struct cleanup *old_chain = NULL; /* Top of the old cleanup chain. */
|
||||
|
||||
/* Loop until we either have all the characters, or we encounter
|
||||
some error, such as bumping into the end of the address space. */
|
||||
|
||||
*buffer = NULL;
|
||||
|
||||
old_chain = make_cleanup (free_current_contents, buffer);
|
||||
buffer->reset (nullptr);
|
||||
|
||||
if (len > 0)
|
||||
{
|
||||
@ -2143,8 +2141,8 @@ read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
|
||||
one operation. */
|
||||
unsigned int fetchlen = std::min ((unsigned) len, fetchlimit);
|
||||
|
||||
*buffer = (gdb_byte *) xmalloc (fetchlen * width);
|
||||
bufptr = *buffer;
|
||||
buffer->reset ((gdb_byte *) xmalloc (fetchlen * width));
|
||||
bufptr = buffer->get ();
|
||||
|
||||
nfetch = partial_memory_read (addr, bufptr, fetchlen * width, &errcode)
|
||||
/ width;
|
||||
@ -2173,12 +2171,12 @@ read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
|
||||
nfetch = std::min ((unsigned long) chunksize, fetchlimit - bufsize);
|
||||
|
||||
if (*buffer == NULL)
|
||||
*buffer = (gdb_byte *) xmalloc (nfetch * width);
|
||||
buffer->reset ((gdb_byte *) xmalloc (nfetch * width));
|
||||
else
|
||||
*buffer = (gdb_byte *) xrealloc (*buffer,
|
||||
(nfetch + bufsize) * width);
|
||||
buffer->reset ((gdb_byte *) xrealloc (buffer->release (),
|
||||
(nfetch + bufsize) * width));
|
||||
|
||||
bufptr = *buffer + bufsize * width;
|
||||
bufptr = buffer->get () + bufsize * width;
|
||||
bufsize += nfetch;
|
||||
|
||||
/* Read as much as we can. */
|
||||
@ -2210,24 +2208,23 @@ read_string (CORE_ADDR addr, int len, int width, unsigned int fetchlimit,
|
||||
}
|
||||
}
|
||||
while (errcode == 0 /* no error */
|
||||
&& bufptr - *buffer < fetchlimit * width /* no overrun */
|
||||
&& bufptr - buffer->get () < fetchlimit * width /* no overrun */
|
||||
&& !found_nul); /* haven't found NUL yet */
|
||||
}
|
||||
else
|
||||
{ /* Length of string is really 0! */
|
||||
/* We always allocate *buffer. */
|
||||
*buffer = bufptr = (gdb_byte *) xmalloc (1);
|
||||
buffer->reset ((gdb_byte *) xmalloc (1));
|
||||
bufptr = buffer->get ();
|
||||
errcode = 0;
|
||||
}
|
||||
|
||||
/* bufptr and addr now point immediately beyond the last byte which we
|
||||
consider part of the string (including a '\0' which ends the string). */
|
||||
*bytes_read = bufptr - *buffer;
|
||||
*bytes_read = bufptr - buffer->get ();
|
||||
|
||||
QUIT;
|
||||
|
||||
discard_cleanups (old_chain);
|
||||
|
||||
return errcode;
|
||||
}
|
||||
|
||||
@ -2793,8 +2790,7 @@ val_print_string (struct type *elttype, const char *encoding,
|
||||
int found_nul; /* Non-zero if we found the nul char. */
|
||||
unsigned int fetchlimit; /* Maximum number of chars to print. */
|
||||
int bytes_read;
|
||||
gdb_byte *buffer = NULL; /* Dynamically growable fetch buffer. */
|
||||
struct cleanup *old_chain = NULL; /* Top of the old cleanup chain. */
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> buffer; /* Dynamically growable fetch buffer. */
|
||||
struct gdbarch *gdbarch = get_type_arch (elttype);
|
||||
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
|
||||
int width = TYPE_LENGTH (elttype);
|
||||
@ -2812,7 +2808,6 @@ val_print_string (struct type *elttype, const char *encoding,
|
||||
|
||||
err = read_string (addr, len, width, fetchlimit, byte_order,
|
||||
&buffer, &bytes_read);
|
||||
old_chain = make_cleanup (xfree, buffer);
|
||||
|
||||
addr += bytes_read;
|
||||
|
||||
@ -2823,8 +2818,8 @@ val_print_string (struct type *elttype, const char *encoding,
|
||||
/* Determine found_nul by looking at the last character read. */
|
||||
found_nul = 0;
|
||||
if (bytes_read >= width)
|
||||
found_nul = extract_unsigned_integer (buffer + bytes_read - width, width,
|
||||
byte_order) == 0;
|
||||
found_nul = extract_unsigned_integer (buffer.get () + bytes_read - width,
|
||||
width, byte_order) == 0;
|
||||
if (len == -1 && !found_nul)
|
||||
{
|
||||
gdb_byte *peekbuf;
|
||||
@ -2852,7 +2847,7 @@ val_print_string (struct type *elttype, const char *encoding,
|
||||
and then the error message. */
|
||||
if (err == 0 || bytes_read > 0)
|
||||
{
|
||||
LA_PRINT_STRING (stream, elttype, buffer, bytes_read / width,
|
||||
LA_PRINT_STRING (stream, elttype, buffer.get (), bytes_read / width,
|
||||
encoding, force_ellipsis, options);
|
||||
}
|
||||
|
||||
@ -2866,7 +2861,6 @@ val_print_string (struct type *elttype, const char *encoding,
|
||||
}
|
||||
|
||||
gdb_flush (stream);
|
||||
do_cleanups (old_chain);
|
||||
|
||||
return (bytes_read / width);
|
||||
}
|
||||
|
||||
@ -150,7 +150,8 @@ extern void print_function_pointer_address (const struct value_print_options *op
|
||||
|
||||
extern int read_string (CORE_ADDR addr, int len, int width,
|
||||
unsigned int fetchlimit,
|
||||
enum bfd_endian byte_order, gdb_byte **buffer,
|
||||
enum bfd_endian byte_order,
|
||||
gdb::unique_xmalloc_ptr<gdb_byte> *buffer,
|
||||
int *bytes_read);
|
||||
|
||||
extern void val_print_optimized_out (const struct value *val,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user