espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 00:59:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ada support for wide strings

Browse Source 
This adds some basic support for Wide_String and Wide_Wide_String to
the Ada expression evaluator.  In particular, a string literal may be
converted to a wide or wide-wide string depending on context.

The patch updates an existing test case.  Note that another test,
namely something like:

    ptype Wide_Wide_String'("literal")

... would be nice to add, but when tested against a distro GNAT, this
did not work (probably due to lack of debuginfo); so, I haven't
included it here.
This commit is contained in:
Tom Tromey
2022-03-08 10:54:44 -07:00
parent 16b6c36154
commit fc18a21b65
3 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
gdb/ada-lang.c
View File

@ -10603,12 +10603,63 @@ ada_string_operation::evaluate (struct type *expect_type,
struct expression *exp,
enum noside noside)
{
value *result = string_operation::evaluate (expect_type, exp, noside);
/* The result type will have code OP_STRING, bashed there from
OP_ARRAY. Bash it back. */
if (value_type (result)->code () == TYPE_CODE_STRING)
value_type (result)->set_code (TYPE_CODE_ARRAY);
return result;
struct type *char_type;
if (expect_type != nullptr && ada_is_string_type (expect_type))
char_type = ada_array_element_type (expect_type, 1);
else
char_type = language_string_char_type (exp->language_defn, exp->gdbarch);
const std::string &str = std::get<0> (m_storage);
const char *encoding;
switch (TYPE_LENGTH (char_type))
{
case 1:
{
/* Simply copy over the data -- this isn't perhaps strictly
correct according to the encodings, but it is gdb's
historical behavior. */
struct type *stringtype
= lookup_array_range_type (char_type, 1, str.length ());
struct value *val = allocate_value (stringtype);
memcpy (value_contents_raw (val).data (), str.c_str (),
str.length ());
return val;
}
case 2:
if (gdbarch_byte_order (exp->gdbarch) == BFD_ENDIAN_BIG)
encoding = "UTF-16BE";
else
encoding = "UTF-16LE";
break;
case 4:
if (gdbarch_byte_order (exp->gdbarch) == BFD_ENDIAN_BIG)
encoding = "UTF-32BE";
else
encoding = "UTF-32LE";
break;
default:
error (_("unexpected character type size %s"),
pulongest (TYPE_LENGTH (char_type)));
}
auto_obstack converted;
convert_between_encodings (host_charset (), encoding,
(const gdb_byte *) str.c_str (),
str.length (), 1,
&converted, translit_none);
struct type *stringtype
= lookup_array_range_type (char_type, 1,
obstack_object_size (&converted)
/ TYPE_LENGTH (char_type));
struct value *val = allocate_value (stringtype);
memcpy (value_contents_raw (val).data (),
obstack_base (&converted),
obstack_object_size (&converted));
return val;
}
value *