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

Add an option to make disassembly more forgiving #19

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add an option to make disassembly more forgiving #19

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25ad20d
Add an option to make disassembly more forgiving
feliam Sep 29, 2018
fe8a8b8
Forgot import
feliam Sep 29, 2018
9f737ff
Bugfix.. choose INVALID when undef
feliam Oct 1, 2018
012c64f
Merge branch 'master' into dev-silent
feliam Oct 19, 2018
e496ab6
merge
feliam Oct 22, 2018
9879473
Merge branch 'master' into dev-silent
feliam Mar 23, 2020
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
20 changes: 15 additions & 5 deletions pyevmasm/evmasm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,15 @@ def assemble_all(asmcode, pc=0, fork=DEFAULT_FORK):
pc += instr.size


def disassemble_one(bytecode, pc=0, fork=DEFAULT_FORK):
def disassemble_one(bytecode, pc=0, silent=False, fork=DEFAULT_FORK):
""" Disassemble a single instruction from a bytecode

:param bytecode: the bytecode stream
:type bytecode: str | bytes | bytearray | iterator
:param pc: program counter of the instruction(optional)
:type pc: int
:param silent: if True disassemble unrecognized instructions as INVALID or incomplete intruction operands as zero
:type silent: bool
:param fork: fork name (optional)
:type fork: str
:return: an Instruction object
Expand Down Expand Up @@ -484,26 +486,32 @@ def disassemble_one(bytecode, pc=0, fork=DEFAULT_FORK):

try:
if instruction.has_operand:
# comlete intruction operand with zeroes
if silent:
from itertools import chain, repeat
bytecode = chain(bytecode, repeat(0))

instruction.parse_operand(bytecode)
except ParseError:
instruction = None
finally:
return instruction


def disassemble_all(bytecode, pc=0, fork=DEFAULT_FORK):
def disassemble_all(bytecode, pc=0, silent=False, fork=DEFAULT_FORK):
""" Disassemble all instructions in bytecode

:param bytecode: an evm bytecode (binary)
:type bytecode: str | bytes | bytearray | iterator
:param pc: program counter of the first instruction(optional)
:type pc: int
:param silent: if True disassemble unrecognized instructions as INVALID or incomplete intruction operands as zero
:type silent: bool
:param fork: fork name (optional)
:type fork: str
:return: An generator of Instruction objects
:rtype: list[Instruction]

Example use::

>>> for inst in disassemble_all(bytecode):
... print(instr)
Expand All @@ -529,20 +537,22 @@ def disassemble_all(bytecode, pc=0, fork=DEFAULT_FORK):

bytecode = iter(bytecode)
while True:
instr = disassemble_one(bytecode, pc=pc, fork=fork)
instr = disassemble_one(bytecode, pc=pc, silent=silent, fork=fork)
if not instr:
return
pc += instr.size
yield instr


def disassemble(bytecode, pc=0, fork=DEFAULT_FORK):
def disassemble(bytecode, pc=0, silent=False, fork=DEFAULT_FORK):
""" Disassemble an EVM bytecode

:param bytecode: binary representation of an evm bytecode
:type bytecode: str | bytes | bytearray
:param pc: program counter of the first instruction(optional)
:type pc: int
:param silent: if True disassemble unrecognized instructions as INVALID or incomplete intruction operands as zero
:type silent: bool
:param fork: fork name (optional)
:type fork: str
:return: the text representation of the assembler code
Expand Down