feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/gdb_panic_server_py2.7' into 'master'

Browse Source 
tools/gdb_panic_server.py: fix compatibility with python 2.7

See merge request espressif/esp-idf!12128
This commit is contained in:
Ivan Grokhotkov
2021-01-29 08:34:48 +08:00
parent bb1f75179b f3cef33791
commit 8b96dcb5ff
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gdb_panic_server.py
View File

@@ -112,7 +112,7 @@ def get_stack_addr_and_data(res): # type: (ParseResults) -> typing.Tuple[int, b
stack_base_addr = 0 # First reported address in the dump stack_base_addr = 0 # First reported address in the dump
base_addr = 0 # keeps track of the address for the given line of the dump base_addr = 0 # keeps track of the address for the given line of the dump
bytes_in_line = 0 # bytes of stack parsed on the previous line; used to validate the next base address bytes_in_line = 0 # bytes of stack parsed on the previous line; used to validate the next base address
stack_data = b'' # accumulates all the dumped stack data stack_data = bytes(b'') # accumulates all the dumped stack data
for line in res.stack_dump.lines: for line in res.stack_dump.lines:
# update and validate the base address # update and validate the base address
prev_base_addr = base_addr prev_base_addr = base_addr
@@ -124,7 +124,7 @@ def get_stack_addr_and_data(res): # type: (ParseResults) -> typing.Tuple[int, b
# convert little-endian hex words to byte representation # convert little-endian hex words to byte representation
words = [int(w, 16) for w in line.data] words = [int(w, 16) for w in line.data]
line_data = b''.join([struct.pack('<I', w) for w in words]) line_data = bytes(b''.join([struct.pack('<I', w) for w in words]))
bytes_in_line = len(line_data) bytes_in_line = len(line_data)
# accumulate in the whole stack data # accumulate in the whole stack data