michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: dictionary: Support unsigned integers

Browse source 
Add unsigned integer support to the log parser.

This does not change the underlying log format,
it only allows the log parser to more accurately
read the log format.

Signed-off-by: Georges Oates_Larsen <georges.larsen@nordicsemi.no>
This commit is contained in:
Georges Oates_Larsen 2024-09-30 15:40:22 -07:00 • committed by Fabio Baltieri
commit a4599219b7
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/logging/dictionary/dictionary_parser/data_types.py
View file

@ -30,14 +30,19 @@ class DataTypes():
if database.is_tgt_64bit():
self.add_data_type(self.LONG, "q")
self.add_data_type(self.ULONG, "Q")
self.add_data_type(self.LONG_LONG, "q")
self.add_data_type(self.ULONG_LONG, "Q")
self.add_data_type(self.PTR, "Q")
else:
self.add_data_type(self.LONG, "i")
self.add_data_type(self.ULONG, "I")
self.add_data_type(self.LONG_LONG, "q")
self.add_data_type(self.ULONG_LONG, "Q")
self.add_data_type(self.PTR, "I")
self.add_data_type(self.INT, "i")
self.add_data_type(self.UINT, "I")
self.add_data_type(self.DOUBLE, "d")
self.add_data_type(self.LONG_DOUBLE, "d")

10
scripts/logging/dictionary/dictionary_parser/log_parser_v1.py
View file

@ -141,14 +141,16 @@ class LogParserV1(LogParser):
# intmax_t, size_t or ptrdiff_t
arg_data_type = DataTypes.LONG
elif fmt in ('c', 'd', 'i', 'o', 'u') or str.lower(fmt) == 'x':
elif fmt in ('c', 'd', 'i', 'o', 'u', 'x', 'X'):
unsigned = fmt in ('c', 'o', 'u', 'x', 'X')
if fmt_str[idx - 1] == 'l':
if fmt_str[idx - 2] == 'l':
arg_data_type = DataTypes.LONG_LONG
arg_data_type = DataTypes.ULONG_LONG if unsigned else DataTypes.LONG_LONG
else:
arg_data_type = DataTypes.LONG
arg_data_type = DataTypes.ULONG if unsigned else DataTypes.LONG
else:
arg_data_type = DataTypes.INT
arg_data_type = DataTypes.UINT if unsigned else DataTypes.INT
is_parsing = False
do_extract = True

10
scripts/logging/dictionary/dictionary_parser/log_parser_v3.py
View file

@ -146,14 +146,16 @@ class LogParserV3(LogParser):
# intmax_t, size_t or ptrdiff_t
arg_data_type = DataTypes.LONG
elif fmt in ('c', 'd', 'i', 'o', 'u') or str.lower(fmt) == 'x':
elif fmt in ('c', 'd', 'i', 'o', 'u', 'x', 'X'):
unsigned = fmt in ('c', 'o', 'u', 'x', 'X')
if fmt_str[idx - 1] == 'l':
if fmt_str[idx - 2] == 'l':
arg_data_type = DataTypes.LONG_LONG
arg_data_type = DataTypes.ULONG_LONG if unsigned else DataTypes.LONG_LONG
else:
arg_data_type = DataTypes.LONG
arg_data_type = DataTypes.ULONG if unsigned else DataTypes.LONG
else:
arg_data_type = DataTypes.INT
arg_data_type = DataTypes.UINT if unsigned else DataTypes.INT
is_parsing = False
do_extract = True