OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ui_file_as_string in gdb/ada-valprint.c 

gdb/ChangeLog:
2016-11-08  Pedro Alves  <palves@redhat.com>

	* ada-valprint.c (ada_print_floating): Use ui_file_as_string and
	std::string.
This commit is contained in:
Pedro Alves 2016-11-08 15:26:44 +00:00
parent a0f86e7358
commit 77e1c7426a
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2016-11-08 Pedro Alves <palves@redhat.com>
* ada-valprint.c (ada_print_floating): Use ui_file_as_string and
std::string.
2016-11-08 Pedro Alves <palves@redhat.com>
* xtensa-tdep.c (xtensa_verify_config): Use ui_file_as_string and

53
gdb/ada-valprint.c
View File

@ -298,49 +298,50 @@ static void
ada_print_floating (const gdb_byte *valaddr, struct type *type,
struct ui_file *stream)
{
char *s, *result;
struct ui_file *tmp_stream = mem_fileopen ();
struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream);
print_floating (valaddr, type, tmp_stream);
result = ui_file_xstrdup (tmp_stream, NULL);
make_cleanup (xfree, result);
std::string s = ui_file_as_string (tmp_stream);
size_t skip_count = 0;
/* Modify for Ada rules. */
s = strstr (result, "inf");
if (s == NULL)
s = strstr (result, "Inf");
if (s == NULL)
s = strstr (result, "INF");
if (s != NULL)
strcpy (s, "Inf");
size_t pos = s.find ("inf");
if (pos == std::string::npos)
pos = s.find ("Inf");
if (pos == std::string::npos)
pos = s.find ("INF");
if (pos != std::string::npos)
s.replace (pos, 3, "Inf");
if (s == NULL)
if (pos == std::string::npos)
{
s = strstr (result, "nan");
if (s == NULL)
s = strstr (result, "NaN");
if (s == NULL)
s = strstr (result, "Nan");
if (s != NULL)
pos = s.find ("nan");
if (pos == std::string::npos)
pos = s.find ("NaN");
if (pos == std::string::npos)
pos = s.find ("Nan");
if (pos != std::string::npos)
{
s[0] = s[2] = 'N';
if (result[0] == '-')
result += 1;
s[pos] = s[pos + 2] = 'N';
if (s[0] == '-')
skip_count = 1;
}
}
if (s == NULL && strchr (result, '.') == NULL)
if (pos == std::string::npos
&& s.find ('.') == std::string::npos)
{
s = strchr (result, 'e');
if (s == NULL)
fprintf_filtered (stream, "%s.0", result);
pos = s.find ('e');
if (pos == std::string::npos)
fprintf_filtered (stream, "%s.0", s.c_str ());
else
fprintf_filtered (stream, "%.*s.0%s", (int) (s-result), result, s);
fprintf_filtered (stream, "%.*s.0%s", (int) pos, s.c_str (), &s[pos]);
}
else
fprintf_filtered (stream, "%s", result);
fprintf_filtered (stream, "%s", &s[skip_count]);
do_cleanups (cleanups);
}