JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-22 09:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for UTF character base types

Browse Source 
Previously `drgn` did not recognize the	`DW_ATE_UTF` encoding for base
types, and consequently could not handle `char8_t`, `char16_t`, or
`char32_t`. This has been remedied, and a corresponding test case added
to prevent regressions.

Signed-off-by: Kevin Svetlitski <svetlitski@fb.com>
This commit is contained in:
Kevin Svetlitski 2022-07-06 09:11:10 -07:00 committed by Omar Sandoval
parent 2bd861f719
commit 661d6a186c
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libdrgn/dwarf_info.c
View File

@ -5461,6 +5461,7 @@ drgn_base_type_from_dwarf(struct drgn_debug_info *dbinfo,
byte_order, lang, ret);
case DW_ATE_unsigned:
case DW_ATE_unsigned_char:
case DW_ATE_UTF:
return drgn_int_type_create(dbinfo->prog, name, size, false,
byte_order, lang, ret);
/* We don't support complex types yet. */

70
tests/test_dwarf.py
View File

@ -64,6 +64,30 @@ unsigned_char_die = DwarfDie(
DwarfAttrib(DW_AT.name, DW_FORM.string, "unsigned char"),
),
)
utf8_char_die = DwarfDie(
DW_TAG.base_type,
(
DwarfAttrib(DW_AT.byte_size, DW_FORM.data1, 1),
DwarfAttrib(DW_AT.encoding, DW_FORM.data1, DW_ATE.UTF),
DwarfAttrib(DW_AT.name, DW_FORM.string, "char8_t"),
),
)
utf16_char_die = DwarfDie(
DW_TAG.base_type,
(
DwarfAttrib(DW_AT.byte_size, DW_FORM.data1, 2),
DwarfAttrib(DW_AT.encoding, DW_FORM.data1, DW_ATE.UTF),
DwarfAttrib(DW_AT.name, DW_FORM.string, "char16_t"),
),
)
utf32_char_die = DwarfDie(
DW_TAG.base_type,
(
DwarfAttrib(DW_AT.byte_size, DW_FORM.data1, 4),
DwarfAttrib(DW_AT.encoding, DW_FORM.data1, DW_ATE.UTF),
DwarfAttrib(DW_AT.name, DW_FORM.string, "char32_t"),
),
)
short_die = DwarfDie(
DW_TAG.base_type,
(
@ -159,6 +183,9 @@ base_type_dies = (
char_die,
signed_char_die,
unsigned_char_die,
utf8_char_die,
utf16_char_die,
utf32_char_die,
short_die,
unsigned_short_die,
int_die,
@ -3385,6 +3412,49 @@ class TestTypes(TestCase):
),
)
def test_utf_chars(self):
# char8_t foo(char16_t a, char32_t b)
prog = dwarf_program(
wrap_test_type_dies(
(
DwarfDie(
DW_TAG.subroutine_type,
(DwarfAttrib(DW_AT.type, DW_FORM.ref4, 1),),
(
DwarfDie(
DW_TAG.formal_parameter,
(
DwarfAttrib(DW_AT.type, DW_FORM.ref4, 2),
DwarfAttrib(DW_AT.name, DW_FORM.string, "a"),
),
),
DwarfDie(
DW_TAG.formal_parameter,
(
DwarfAttrib(DW_AT.type, DW_FORM.ref4, 3),
DwarfAttrib(DW_AT.name, DW_FORM.string, "b"),
),
),
),
),
utf8_char_die,
utf16_char_die,
utf32_char_die,
)
)
)
self.assertIdentical(
prog.type("TEST").type,
prog.function_type(
prog.int_type("char8_t", 1, False),
(
TypeParameter(prog.int_type("char16_t", 2, False), "a"),
TypeParameter(prog.int_type("char32_t", 4, False), "b"),
),
False,
),
)
def test_function_unspecified_parameters(self):
# int foo()
prog = dwarf_program(