Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

decoder.py: allowing to use it live #9108

Merged
merged 7 commits into from
Mar 31, 2024
Merged

decoder.py: allowing to use it live #9108

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f02e2c7
decoder.py: allowing to use it live
d-a-v Mar 26, 2024
c11ee7c
clean dup check
d-a-v Mar 27, 2024
2d0ba97
review: use shutil.which()
d-a-v Mar 28, 2024
7c5366b
per review: hide duplicate system log, remove previous dup management
d-a-v Mar 28, 2024
44341e8
fix variable name
d-a-v Mar 28, 2024
d1557c9
Update tools/decoder.py
mcspr Mar 31, 2024
f7b20ea
Merge branch 'master' into livedecoder
mcspr Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion tools/decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import sys
import re
import subprocess
import shutil

# https://github.com/me-no-dev/EspExceptionDecoder/blob/349d17e4c9896306e2c00b4932be3ba510cad208/src/EspExceptionDecoder.java#L59-L90
EXCEPTION_CODES = (
Expand Down Expand Up @@ -104,7 +105,10 @@ def decode_lines(format_addresses, elf, lines):

STACK_LINE_RE = re.compile(r"^[0-9a-f]{8}:\s\s+")

IGNORE_FIRMWARE_RE = re.compile(r"^(epc1=0x........, |Fatal exception )")

CUT_HERE_STRING = "CUT HERE FOR EXCEPTION DECODER"
DECODE_IT = "DECODE IT"
EXCEPTION_STRING = "Exception ("
EPC_STRING = "epc1="

Expand Down Expand Up @@ -132,6 +136,8 @@ def format_address(address):
stack_addresses = print_all_addresses(stack_addresses)
last_stack = line.strip()
# 3fffffb0: feefeffe feefeffe 3ffe85d8 401004ed
elif IGNORE_FIRMWARE_RE.match(line):
continue
elif in_stack and STACK_LINE_RE.match(line):
_, addrs = line.split(":")
addrs = ANY_ADDR_RE.findall(addrs)
Expand Down Expand Up @@ -163,8 +169,10 @@ def format_address(address):
in_stack = True
# ignore
elif "<<<stack<<<" in line:
in_stack = False
stack_addresses = print_all_addresses(stack_addresses)
continue
elif CUT_HERE_STRING in line:
elif CUT_HERE_STRING in line or DECODE_IT in line:
continue
else:
line = line.strip()
Expand All @@ -181,6 +189,8 @@ def select_tool(toolchain_path, tool, func):
path = f"xtensa-lx106-elf-{tool}"
if toolchain_path:
path = os.path.join(toolchain_path, path)
if not shutil.which(path):
raise FileNotFoundError(path)
mcspr marked this conversation as resolved.
Show resolved Hide resolved

def formatter(func, path):
def wrapper(elf, addresses):
Expand Down