8000 gh-90997: bpo-46841: Disassembly of quickened code by penguin-wwy · Pull Request #32099 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-90997: bpo-46841: Disassembly of quickened code #32099

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

Merged
merged 16 commits into from
Apr 19, 2022
Merged

gh-90997: bpo-46841: Disassembly of quickened code #32099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
34e7e3c
Disassembly of quickened code
penguin-wwy Mar 23, 2022
ceabedb
Reset `deoptmap` and fix test_dis
penguin-wwy Mar 24, 2022
9cef324
Clean code
penguin-wwy Mar 24, 2022
733bdd4
Fix assert for deopt code
penguin-wwy Mar 24, 2022
bd59be2
Revert `co_code`
penguin-wwy Mar 24, 2022
f72c1fb
Rename kwarg name and use `_co_code_adaptive`
penguin-wwy Mar 24, 2022
c14ab90
Fix test__opcode
penguin-wwy Mar 24, 2022
026715a
Add News
penguin-wwy Mar 25, 2022
9ab5fac
Merge branch 'main' of https://github.com/python/cpython into dis_qui…
penguin-wwy Mar 29, 2022
88ab80c
Merge branch 'main' of https://github.com/python/cpython into dis_qui…
penguin-wwy Apr 1, 2022
2a4bb97
Move deoptmap to dis module
penguin-wwy Apr 1, 2022
794536f
Add code quicken in test_dis
penguin-wwy Apr 2, 2022
e896538
Get quickened in dis
penguin-wwy Apr 6, 2022
659d570
Merge branch 'main' of https://github.com/python/cpython into dis_qui…
penguin-wwy Apr 6, 2022
ca9a734
Merge branch 'main' of https://github.com/python/cpython into dis_qui…
penguin-wwy Apr 14, 2022
82b053f
Fix test_dis
penguin-wwy Apr 18, 2022
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
Prev Previous commit
Next Next commit
Add News
  • Loading branch information
@penguin-wwy
penguin-wwy committed Mar 25, 2022
commit 026715a29cc0eb9df26e3bd77a26d9ef9f06d682
24 changes: 13 additions & 11 deletions Lib/dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@

CACHE = opmap["CACHE"]

def deoptop(op):
name = opname[op]
return opmap[deoptmap[name]] if name in deoptmap else op

def _try_compile(source, name):
"""Attempts to compile the given source, first as an expression and
then as a statement if the first approach fails.
Expand Down Expand Up @@ -165,6 +161,13 @@ def _get_code_object(x):
raise TypeError("don't know how to disassemble %s objects" %
type(x).__name__)

def _deoptop(op):
name = opname[op]
return opmap[deoptmap[name]] if name in deoptmap else op

def _get_code_array(co, adaptive):
return co._co_code_adaptive.tobytes() if adaptive else co.co_code

def code_info(x):
"""Formatted details of methods, functions, or code."""
return _format_code_info(_get_code_object(x))
Expand Down Expand Up @@ -322,8 +325,7 @@ def get_instructions(x, *, first_line=None, show_caches=False, adaptive=False):
line_offset = first_line - co.co_firstlineno
else:
line_offset = 0
code_bytes = co._co_code_adaptive.tobytes() if adaptive else co.co_code
return _get_instructions_bytes(code_bytes,
return _get_instructions_bytes(_get_code_array(co, adaptive),
co._varname_from_oparg,
co.co_names, co.co_consts,
linestarts, line_offset,
Expand Down Expand Up @@ -432,7 +434,7 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
argval = None
argrepr = ''
positions = Positions(*next(co_positions, ()))
deop = deoptop(op)
deop = _deoptop(op)
cache_counter = _inline_cache_entries[deop]
if arg is not None:
# Set argval to the dereferenced value of the argument when
Expand Down Expand Up @@ -480,7 +482,7 @@ def disassemble(co, lasti=-1, *, file=None, show_caches=False, adaptive=False):
"""Disassemble a code object."""
linestarts = dict(findlinestarts(co))
exception_entries = parse_exception_table(co)
_disassemble_bytes(co._co_code_adaptive.tobytes() if adaptive else co.co_code,
_disassemble_bytes(_get_code_array(co, adaptive),
lasti, co._varname_from_oparg,
co.co_names, co.co_consts, linestarts, file=file,
exception_entries=exception_entries,
Expand Down Expand Up @@ -555,7 +557,7 @@ def _unpack_opargs(code):
extended_arg = 0
for i in range(0, len(code), 2):
op = code[i]
if deoptop(op) >= HAVE_ARGUMENT:
if _deoptop(op) >= HAVE_ARGUMENT:
arg = code[i+1] | extended_arg
extended_arg = (arg << 8) if op == EXTENDED_ARG else 0
# The oparg is stored as a signed integer
Expand Down Expand Up @@ -663,7 +665,7 @@ def __init__(self, x, *, first_line=None, current_offset=None, show_caches=False

def __iter__(self):
co = self.codeobj
return _get_instructions_bytes(co._co_code_adaptive.tobytes() if self.adaptive else co.co_code,
return _get_instructions_bytes(_get_code_array(co, self.adaptive),
co._varname_from_oparg,
co.co_names, co.co_consts,
self._linestarts,
Expand Down Expand Up @@ -697,7 +699,7 @@ def dis(self):
else:
offset = -1
with io.StringIO() as output:
_disassemble_bytes(co._co_code_adaptive.tobytes() if self.adaptive else co.co_code,
_disassemble_bytes(_get_code_array(co, self.adaptive),
varname_from_oparg=co._varname_from_oparg,
names=co.co_names, co_consts=co.co_consts,
linestarts=self._linestarts,
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2022-03-25-22-18-45.bpo-46841.NUEsXW.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disassembly of quickened code.
0