diff --git a/tools/trap/cli/logParser.py b/tools/trap/cli/logParser.py index 5742a5de78..703e33e034 100755 --- a/tools/trap/cli/logParser.py +++ b/tools/trap/cli/logParser.py @@ -497,7 +497,7 @@ def parse_call_stack(self): stack_val = 0x00000000 current_line = "" - print('\nStack_address\t Symbol_address\t Symbol_location Symbol_name\t\tFile_name') + print('Stack_address\t Symbol_address\t Symbol location {: <45} File_name'.format("Symbol_name")) # Parse the contents based on tokens in log file. with open(self.log_file) as searchfile: @@ -580,7 +580,7 @@ def print_wrong_sp(self): if (self.is_kernel_text_address(hex(stack_val))): if (format_print): print('\t- SP is out of the stack range. Debug symbols corresponding to the wrong stack pointer addresses are given below:') - print('Stack_address\t Symbol_address\t Symbol location Symbol_name\t\tFile_name') + print('Stack_address\t Symbol_address\t Symbol location {: <45} File_name'.format("Symbol_name")) format_print = False #If yes, print it's corresponding symbol utils.print_symbol(stack_addr, stack_val, 0, self.bin_path, self.app_name) @@ -589,7 +589,7 @@ def print_wrong_sp(self): if (is_app_symbol): if (format_print): print('\t- SP is out of the stack range. Debug symbols corresponding to the wrong stack pointer addresses are given below:') - print('Stack_address\t Symbol_address\t Symbol location Symbol_name\t\tFile_name') + print('Stack_address\t Symbol_address\t Symbol location {: <45} File_name'.format("Symbol_name")) format_print = False #If yes, print it's corresponding symbol if not self.xip_enabled: diff --git a/tools/trap/cli/utils.py b/tools/trap/cli/utils.py index c4e28a7dcf..f9e14ecc68 100755 --- a/tools/trap/cli/utils.py +++ b/tools/trap/cli/utils.py @@ -93,23 +93,13 @@ def print_symbol(stack_addr, search_addr, is_app_symbol, bin_path, app_name): break else: if (is_app_symbol): - pos = (asymbol_lookup_table[is_app_symbol][mid - 1][1]).find('\t') - sname = (asymbol_lookup_table[is_app_symbol][mid - 1][1])[:pos] + sname = (asymbol_lookup_table[is_app_symbol][mid - 1][1]) fname = subprocess.getoutput("arm-none-eabi-addr2line -e " + bin_path + app_name[is_app_symbol - 1] + "_dbg " + hex(search_addr)) - if ":?" in fname: - print('Symbol not found for address: {0}'.format(hex(search_addr))) - return - else: - print("{:8}\t {:8}\t {} binary {:20} {}".format(hex(stack_addr), hex(search_addr), app_name[is_app_symbol - 1], sname, fname)) + print("{:8}\t {:8}\t {} binary {: <45} {}".format(hex(stack_addr), hex(search_addr), app_name[is_app_symbol - 1], (sname[:20] + "..." + sname[-20:]) if len(sname) > 40 else sname, "File not found" if ":?" in fname else fname)) else: - pos = (ksymbol_lookup_table[mid - 1][1]).find('\t') - sname = (ksymbol_lookup_table[mid - 1][1])[:pos] + sname = (ksymbol_lookup_table[mid - 1][1]) fname = subprocess.getoutput("arm-none-eabi-addr2line -e " + bin_path + "tinyara.axf " + hex(search_addr)) - if ":?" in fname: - print('Symbol not found for address: {0}'.format(hex(search_addr))) - return - else: - print("{:8}\t {:8}\t kernel binary {:20} {}".format(hex(stack_addr), hex(search_addr), sname, fname)) + print("{:8}\t {:8}\t kernel binary {: <45} {}".format(hex(stack_addr), hex(search_addr), (sname[:20] + "..." + sname[-20:]) if len(sname) > 40 else sname , "File not found" if ":?" in fname else fname)) break if (search_addr < addr):