Skip to content

Improve exception handling #21

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 2 commits into from
Oct 3, 2018
Merged

Improve exception handling #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7da4075
Improve exception handling
Oct 2, 2018
49a118e
Make the `return` in `disassemble_all` explicit
Oct 2, 2018
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
25 changes: 17 additions & 8 deletions pyevmasm/evmasm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ class UnknownMnemonicError(Exception):
class UnknownOpcodeError(Exception):
pass

class AssembleError(Exception):
pass

class ParseError(Exception):
pass


class InstructionTable(dict):
"""
Expand Down Expand Up @@ -365,7 +371,7 @@ def parse_operand(self, buf):
operand |= next(buf)
self._operand = operand
except StopIteration:
raise Exception("Not enough data for decoding")
raise ParseError("Not enough data for decoding")

@property
def operand_size(self):
Expand Down Expand Up @@ -557,8 +563,8 @@ def assemble_one(asmcode, pc=0):
assert len(asmcode) == 2
instr.operand = int(asmcode[1], 0)
return instr
except BaseException:
raise Exception("Something wrong at pc %d" % pc)
except:
raise AssembleError("Something wrong at pc %d" % pc)


def assemble_all(asmcode, pc=0):
Expand Down Expand Up @@ -627,10 +633,13 @@ def disassemble_one(bytecode, pc=0):
instruction = instruction_table[opcode]
instruction.pc = pc

if instruction.has_operand:
instruction.parse_operand(bytecode)

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


def disassemble_all(bytecode, pc=0):
Expand Down Expand Up @@ -672,7 +681,7 @@ def disassemble_all(bytecode, pc=0):
while True:
instr = disassemble_one(bytecode, pc=pc)
if not instr:
return
raise StopIteration
pc += instr.size
yield instr

Expand Down