-
-
Notifications
You must be signed in to change notification settings - Fork 8.4k
tools/mpy-tool.py: Allow dumping MPY segments into their own files. #17306
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.
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
base: master
Are you sure you want to change the base?
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #17306 +/- ##
=======================================
Coverage 98.38% 98.38%
=======================================
Files 171 171
Lines 22296 22296
=======================================
Hits 21937 21937
Misses 359 359 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Code size report:
|
1a8b588
to
ad32c30
Compare
I think it is worth having this, and for your explanation above to be added to the tools documentation. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, this looks good. I would have used this more than once myself if it existing already :)
Please rebase on latest master, that will pick up changed ruff rules (namely double quotes).
tools/mpy-tool.py
Outdated
def parse_extract_segments_arg(arg): | ||
kinds = set() | ||
if arg is not None: | ||
for kind in arg.lower().split(','): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you use arg.upper().split(","):
then it could be simply:
try:
kinds.add(getattr(MPYSegment, kind))
except AttributeError:
raise Exception("unknown kind")
Then, this function could be written inline in the one below. (A little simpler to have everything self contained in one function, IMO.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I'm used to use lower
to work around internationalisation issues in input (f.ex the Turkish I problem).
I agree this is probably not really needed here, but old habits tend to die hard don't they.
tools/mpy-tool.py
Outdated
segments = [] | ||
for module in compiled_modules: | ||
for segment in module.mpy_segments: | ||
if not kinds or segment.kind in kinds: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you didn't want to bother validating kinds_arg
, this could simply be if not kinds or segment.kind in kinds_arg
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Validation is probably the easier option here, as the extract operation would still proceed with mpy-tool.py -e module --extract-only= file.mpy
. This can be interpreted either as "don't extract any segment" or maybe "extract all segments", and in both cases this is still the wrong set of arguments to pass.
Same thing if you accidentally type cod
instead of code
. Since there's no output during the extraction process, as the final user I'd appreciate more having an error telling me I messed up rather than falsely assume the mpy file had no raw code segments in there, for example.
The alternative would be to add a custom argparse argument type that performs its own validation, which would probably be more code overall.
tools/mpy-tool.py
Outdated
@@ -1795,6 +1844,14 @@ def main(args=None): | |||
default=16, | |||
help="mpz digit size used by target (default 16)", | |||
) | |||
cmd_parser.add_argument( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest moving this up to just after the --merge
option, so they appear together in the help output (the action commands will then come before the tweaking options).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense, thanks! This will be addressed in the next PR iteration.
This commit lets "tools/mpy-tool.py" extract MPY segments into their own files, one file per segment. A pair of new command line arguments were added, namely "-e"/"--extract" that takes a filename prefix to use as a base for the generated files' name, and "--extract-only" that - combined with "--extract" - allows selecting which kinds of segment should be dumped to the filesystem. So, for example, assuming there's a file called "module.mpy", running "./mpy-tool.py --extract segments module.mpy" would yield a series of files with names like "segments_0_module.py_QSTR_module.py.bin", "segments_1_module.py_META__module_.bin", "segments_2_module.py_QSTR_function.bin", etc. In short the file name format is "<base>_<count>_<sourcefile>_<segmentkind>_<segmentname>.bin", with <segmentkind> being META, QSTR, OBJ, or CODE. Source file names and segment names will only contain characters in the range "a-zA-Z0-9_-." to avoid having output file names with unexpected characters. The "--extract-only" option can accept one or more kinds, separated by commas and treated as case insensitive strings. The supported kinds match what is currently handled by the "MPYSegment" class in "tools/mpy-tool.py": "META", "QSTR", "OBJ", and "CODE". The absence of this command line option implies dumping every segment found. If "--extract" is passed along with "--merge", dumping is performed after the merge process takes place, in order to dump all possible segments that match the requested segment kinds. Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
ad32c30
to
ce834b8
Compare
Turns out I already had the segment kind strings mapped somewhere else in the new code, so I just reused those to simplify the validation. I believe the patch is now shorter overall, and it should also be compliant with the new ruff formatting rules too. |
Summary
This PR lets
tools/mpy-tool.py
extract MPY segments into their own files, one file per segment.This is something I wrote some time ago but I guess it cannot hurt to be upstreamed. When debugging issues related with compiled code generated by
@micropython.viper
or@micropython.native
, it is of great help being able to get hold of generated code segments to pass to objdump or ghidra/idapro/cutter/etc., without having to dump memory from gdb or writing custom file/hex dumpers.A pair of new command line arguments were added, namely "-e"/"--extract" that takes a filename prefix to use as a base for the generated files' name, and "--extract-only" that - combined with "--extract" - allows selecting which kind of segments should be dumped to the filesystem.
So, for example, assuming there's a file called "module.mpy", running "./mpy-tool.py --extract segments module.mpy" would yield a series of files with names like "segments_0_module.py_QSTR_module.py.bin", "segments_1_module.py_META__module_.bin",
"segments_2_module.py_QSTR_function.bin", etc. In short the file name format is
<base>_<count>_<sourcefile>_<segmentkind>_<segmentname>.bin
, with<segmentkind>
being META, QSTR, OBJ, or CODE. Source file names and segment names will only contain characters in the range "a-zA-Z0-9_-." to avoid having output file names with unexpected characters.The "--extract-only" option can accept one or more kinds, separated by commas and treated as case insensitive strings. The supported kinds match what is currently handled by the "MPYSegment" class in "tools/mpy-tool.py": "META", "QSTR", "OBJ", and "CODE". The absence of this command line option implies dumping every segment found.
If "--extract" is passed along with "--merge", dumping is performed after the merge process takes place, in order to dump all possible segments that match the requested segment kinds.
Testing
Besides my own usage, I've attached a zipfile containing the compiled version of
tests/micropython/native_try_deep.py
for x64 and its dumped output. To reproduce those files the commands to run are:To check that the
CODE
segments actually contain executable code, runningobjdump -b binary -M x86-64 -m i386:x86-64 --adjust-vma=0x1000 -z --start-address=0x1008 -D native_try_deep_7_native_try_deep.py_CODE_f.bin
should dump valid x64 code to STDOUT, as generated bympy-cross
(it skips the first two header words).native_try_deep.zip
Trade-offs and Alternatives
Given that this bit of code isn't executed unless explicitly required and for a niche scenario, the only issue it has would be that it increases the overall code complexity by a tiny amount and potential security issues when the output file prefix is used in a malicious way.
As far as alternatives go, I used to run
mpy-tool.py -x -d <mpyfile>
to figure out the binary code start offset by looking at the hex pairs on screen (and good luck if somebody remapped their terminal colour scheme :) no idea if the output is colourblind safe though). After a while I wrote my own cut-downmpy-tool.py
equivalent to run as a ghidra plugin, but then it would require keeping up with MPY format changes and whatnot, and I wasn't sure it would work in all possible cases.Having
mpy-tool.py
dump the segments itself is probably the best compromise for the time being, it is tool-agnostic and doesn't require anything special to get it working.