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

Return std::string from memory_error_message

Browse source 
This changes memory_error_message to return a std::string and fixes up
the callers.  This removes some cleanups.

ChangeLog
2017-09-03  Tom Tromey  <tom@tromey.com>

	* valprint.c (val_print_string): Update.
	* gdbcore.h (memory_error_message): Return std::string.
	* corefile.c (memory_error_message): Return std::string.
	(memory_error): Update.
	* breakpoint.c (insert_bp_location): Update.
This commit is contained in:
Tom Tromey 2017-08-05 16:23:18 -06:00
parent 0e30d99180
commit 1ccbe9985f
5 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2017-09-03 Tom Tromey <tom@tromey.com>
* valprint.c (val_print_string): Update.
* gdbcore.h (memory_error_message): Return std::string.
* corefile.c (memory_error_message): Return std::string.
(memory_error): Update.
* breakpoint.c (insert_bp_location): Update.
2017-09-03 Simon Marchi <simon.marchi@ericsson.com>
* target/waitstatus.h (target_waitstatus_to_string): Change

6
gdb/breakpoint.c
View file

@ -2889,16 +2889,14 @@ insert_bp_location (struct bp_location *bl,
{
if (bp_err_message == NULL)
{
char *message
std::string message
= memory_error_message (TARGET_XFER_E_IO,
bl->gdbarch, bl->address);
struct cleanup *old_chain = make_cleanup (xfree, message);
fprintf_unfiltered (tmp_error_stream,
"Cannot insert breakpoint %d.\n"
"%s\n",
bl->owner->number, message);
do_cleanups (old_chain);
bl->owner->number, message.c_str ());
}
else
{

16
gdb/corefile.c
View file

@ -186,7 +186,7 @@ Use the \"file\" or \"exec-file\" command."));
}
char *
std::string
memory_error_message (enum target_xfer_status err,
struct gdbarch *gdbarch, CORE_ADDR memaddr)
{
@ -195,11 +195,11 @@ memory_error_message (enum target_xfer_status err,
case TARGET_XFER_E_IO:
/* Actually, address between memaddr and memaddr + len was out of
bounds. */
return xstrprintf (_("Cannot access memory at address %s"),
paddress (gdbarch, memaddr));
return string_printf (_("Cannot access memory at address %s"),
paddress (gdbarch, memaddr));
case TARGET_XFER_UNAVAILABLE:
return xstrprintf (_("Memory at address %s unavailable."),
paddress (gdbarch, memaddr));
return string_printf (_("Memory at address %s unavailable."),
paddress (gdbarch, memaddr));
default:
internal_error (__FILE__, __LINE__,
"unhandled target_xfer_status: %s (%s)",
@ -213,12 +213,10 @@ memory_error_message (enum target_xfer_status err,
void
memory_error (enum target_xfer_status err, CORE_ADDR memaddr)
{
char *str;
enum errors exception = GDB_NO_ERROR;
/* Build error string. */
str = memory_error_message (err, target_gdbarch (), memaddr);
make_cleanup (xfree, str);
std::string str = memory_error_message (err, target_gdbarch (), memaddr);
/* Choose the right error to throw. */
switch (err)
@ -232,7 +230,7 @@ memory_error (enum target_xfer_status err, CORE_ADDR memaddr)
}
/* Throw it. */
throw_error (exception, ("%s"), str);
throw_error (exception, ("%s"), str.c_str ());
}
/* Helper function. */

8
gdb/gdbcore.h
View file

@ -37,11 +37,11 @@ extern int have_core_file_p (void);
extern void memory_error (enum target_xfer_status status, CORE_ADDR memaddr);
/* The string 'memory_error' would use as exception message. Space
for the result is malloc'd, caller must free. */
/* The string 'memory_error' would use as exception message. */
extern char *memory_error_message (enum target_xfer_status err,
struct gdbarch *gdbarch, CORE_ADDR memaddr);
extern std::string memory_error_message (enum target_xfer_status err,
struct gdbarch *gdbarch,
CORE_ADDR memaddr);
/* Like target_read_memory, but report an error if can't read. */

7
gdb/valprint.c
View file

@ -2988,13 +2988,10 @@ val_print_string (struct type *elttype, const char *encoding,
if (err != 0)
{
char *str;
str = memory_error_message (TARGET_XFER_E_IO, gdbarch, addr);
make_cleanup (xfree, str);
std::string str = memory_error_message (TARGET_XFER_E_IO, gdbarch, addr);
fprintf_filtered (stream, "<error: ");
fputs_filtered (str, stream);
fputs_filtered (str.c_str (), stream);
fprintf_filtered (stream, ">");
}