michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: logging: dictionary: Handle string stripping

Browse source 
Add support for getting strings from section which is not part
of the binary.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruściński 2023-10-25 15:25:18 +02:00 • committed by Carles Cufí
commit f172a1a5ee
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/logging/dictionary/database_gen.py
View file

@ -49,6 +49,11 @@ STATIC_STRING_SECTIONS = [
'pinned.rodata', 'pinned.rodata',
] ]
# Sections that contains static strings but are not part of the binary (allocable).
REMOVED_STRING_SECTIONS = [
'log_strings'
]
# Regulation expression to match DWARF location # Regulation expression to match DWARF location
DT_LOCATION_REGEX = re.compile(r"\(DW_OP_addr: ([0-9a-f]+)") DT_LOCATION_REGEX = re.compile(r"\(DW_OP_addr: ([0-9a-f]+)")
@ -94,7 +99,7 @@ def parse_args():
return argparser.parse_args() return argparser.parse_args()
def extract_elf_code_data_sections(elf): def extract_elf_code_data_sections(elf, wildcards = None):
"""Find all sections in ELF file""" """Find all sections in ELF file"""
sections = {} sections = {}
@ -103,9 +108,9 @@ def extract_elf_code_data_sections(elf):
# since they actually have code/data. # since they actually have code/data.
# #
# On contrary, BSS is allocated but NOBITS. # On contrary, BSS is allocated but NOBITS.
if ( if (((wildcards is not None) and (sect.name in wildcards)) or
(sect['sh_flags'] & SH_FLAGS.SHF_ALLOC) == SH_FLAGS.SHF_ALLOC ((sect['sh_flags'] & SH_FLAGS.SHF_ALLOC) == SH_FLAGS.SHF_ALLOC
and sect['sh_type'] == 'SHT_PROGBITS' and sect['sh_type'] == 'SHT_PROGBITS')
): ):
sections[sect.name] = { sections[sect.name] = {
'name' : sect.name, 'name' : sect.name,
@ -453,7 +458,7 @@ def extract_static_strings(elf, database, section_extraction=False):
""" """
string_mappings = {} string_mappings = {}
elf_sections = extract_elf_code_data_sections(elf) elf_sections = extract_elf_code_data_sections(elf, REMOVED_STRING_SECTIONS)
# Extract strings using ELF DWARF information # Extract strings using ELF DWARF information
str_vars = extract_string_variables(elf) str_vars = extract_string_variables(elf)