Refactor EVMAsm;

  * remove EVMAsm class as all methods were @staticmethod
  * cleanup and update docstrings
  * fixup tests
  * update tox
  * update setuptools

Author: defunctio

docs/api.rst

@@ -1,9 +1,10 @@
 API Reference
 =============
 
-EVMAsm
+evmasm
 ------
-.. autoclass:: pyevmasm.evmasm.EVMAsm
-    :members:
-.. autoclass:: pyevmasm.evmasm::EVMAsm.Instruction
+.. automodule:: pyevmasm.evmasm
     :members:
+.. py:data:: instruction
+
+    Instance of InstructionTable for EVM. (see; InstructionTable)

pyevmasm/__init__.py

@@ -1 +1,3 @@
-from .evmasm import EVMAsm
+from .evmasm import instruction_table, Instruction  # noqa: F401
+from .evmasm import assemble, assemble_all, assemble_hex, assemble_one
+from .evmasm import disassemble, disassemble_all, disassemble_hex, disassemble_one

pyevmasm/__main__.py

@@ -3,7 +3,7 @@
 import sys
 import binascii
 
-from .evmasm import EVMAsm
+from .evmasm import assemble_hex, disassemble_all, instruction_table, assemble_all
 
 
 def main():
@@ -12,41 +12,60 @@ def main():
     group_action.add_argument('-a', '--assemble', action='store_true', help='Assemble EVM instructions to opcodes')
     group_action.add_argument('-d', '--disassemble', action='store_true', help='Disassemble EVM to opcodes')
     group_action.add_argument('-t', '--print-opcode-table', action='store_true', help='List supported EVM opcodes')
-    parser.add_argument('-i', '--input', nargs='?', type=argparse.FileType('r'), default=sys.stdin,
+    parser.add_argument('-bi', '--binary-input', action='store_true', help='Binary input mode (-d only)')
+    parser.add_argument('-bo', '--binary-output', action='store_true', help='Binary output mode (-a only)')
+    parser.add_argument('-i', '--input', nargs='?', default=sys.stdin, type=argparse.FileType('r'),
                         help='Input file, default=stdin')
-    parser.add_argument('-o', '--output', nargs='?', type=argparse.FileType('w'), default=sys.stdout,
+    parser.add_argument('-o', '--output', nargs='?', default=sys.stdout, type=argparse.FileType('w'),
                         help='Output file, default=stdout')
 
     args = parser.parse_args(sys.argv[1:])
 
     if args.print_opcode_table:
-        table = EVMAsm._get_reverse_table()
-        for mnemonic in table.keys():
-            # This relies on the internal format 
-            (opcode, name, immediate_operand_size, pops, pushes, gas, description) = table[mnemonic]
-            print("%02x: %-16s %s" % (opcode, mnemonic, description))
+        for instr in instruction_table:
+            print('0x{:02x}: {:16s} {:s}'.format(instr.opcode, instr.name, instr.description))
         sys.exit(0)
 
     if args.assemble:
-        asm = args.input.read().strip().rstrip()
-        args.output.write(EVMAsm.assemble_hex(asm) + "\n")
+        try:
+            asm = args.input.read().strip().rstrip()
+        except KeyboardInterrupt:
+            sys.exit(0)
+        if args.binary_output:
+            for i in assemble_all(asm):
+                if sys.version_info >= (3, 2):
+                    args.output.buffer.write(i.bytes)
+                else:
+                    args.output.write(i.bytes)
+        else:
+            args.output.write(assemble_hex(asm) + "\n")
 
     if args.disassemble:
-        buf = args.input.read().strip().rstrip()
-        if buf[:3] == 'EVM':  # binja prefix
-            buf = buf[3:]
-        elif buf[:2] == '0x':  # hex prefixed
-            buf = binascii.unhexlify(buf[2:])
-        else:  # detect all hex buffer
-            buf_set = set()
-            for c in buf:
-                buf_set.add(c.lower())
-
-            hex_set = set(list('0123456789abcdef'))
-            if buf_set <= hex_set:  # subset
-                buf = binascii.unhexlify(buf)
-
-        insns = list(EVMAsm.disassemble_all(buf))
+        if args.binary_input and sys.version_info >= (3, 2):
+            buf = args.input.buffer.read()
+        else:
+            try:
+                buf = args.input.read().strip().rstrip()
+            except KeyboardInterrupt:
+                sys.exit(0)
+            except UnicodeDecodeError:
+                print('Input is binary? try using -b.')
+                sys.exit(1)
+
+            if buf[:3] == 'EVM':  # binja prefix
+                buf = buf[3:]
+            elif buf[:2] == '0x':  # hex prefixed
+                buf = binascii.unhexlify(buf[2:])
+            else:  # detect all hex buffer
+                buf_set = set()
+                for c in buf:
+                    buf_set.add(c.lower())
+
+                hex_set = set(list('0123456789abcdef'))
+                if buf_set <= hex_set:  # subset
+                    buf = binascii.unhexlify(buf)
+
+        insns = list(disassemble_all(buf))
         for i in insns:
             args.output.write("%08x: %s\n" % (i.pc, str(i)))