Add a few more opcodes

Author: vrthra

byterun/pyobj.py

@@ -142,8 +142,8 @@ def set(self, value):
 class Frame(object):
     def __init__(self, f_code, f_globals, f_locals, f_closure, f_back):
         self.f_code = f_code
-        self.py36_opcodes = list(dis.get_instructions(self.f_code)) \
-            if six.PY3 and sys.version_info.minor >= 6 else None
+        if sys.version_info[:2] >= (3, 4):
+            self.opcodes = list(dis.get_instructions(self.f_code))
         self.f_globals = f_globals
         self.f_locals = f_locals
         self.f_back = f_back

byterun/pyvm2.py

@@ -171,8 +171,8 @@ def parse_byte_and_args(self):
         In Python3.6 the format is 2 bytes per instruction."""
         f = self.frame
         opoffset = f.f_lasti
-        if f.py36_opcodes:
-            currentOp = f.py36_opcodes[opoffset]
+        if sys.version_info >= (3, 6):
+            currentOp = f.opcodes[opoffset]
             byteCode = currentOp.opcode
             byteName = currentOp.opname
         else:
@@ -181,7 +181,7 @@ def parse_byte_and_args(self):
         f.f_lasti += 1
         arg = None
         arguments = []
-        if f.py36_opcodes and byteCode == dis.EXTENDED_ARG:
+        if sys.version_info >= (3, 6) and byteCode == dis.EXTENDED_ARG:
             # Prefixes any opcode which has an argument too big to fit into the
             # default two bytes. ext holds two additional bytes which, taken
             # together with the subsequent opcode’s argument, comprise a
@@ -191,7 +191,7 @@ def parse_byte_and_args(self):
             # Lib/dis.py:_unpack_opargs
             return self.parse_byte_and_args()
         if byteCode >= dis.HAVE_ARGUMENT:
-            if f.py36_opcodes:
+            if sys.version_info >= (3, 6):
                 intArg = currentOp.arg
             else:
                 arg = f.f_code.co_code[f.f_lasti:f.f_lasti+2]
@@ -208,12 +208,12 @@ def parse_byte_and_args(self):
             elif byteCode in dis.hasname:
                 arg = f.f_code.co_names[intArg]
             elif byteCode in dis.hasjrel:
-                if f.py36_opcodes:
+                if sys.version_info >= (3, 6):
                     arg = f.f_lasti + intArg//2
                 else:
                     arg = f.f_lasti + intArg
             elif byteCode in dis.hasjabs:
-                if f.py36_opcodes:
+                if sys.version_info >= (3, 6):
                     arg = intArg//2
                 else:
                     arg = intArg
@@ -598,30 +598,49 @@ def byte_BUILD_TUPLE_UNPACK_WITH_CALL(self, count):
         # This is similar to BUILD_TUPLE_UNPACK, but is used for f(*x, *y, *z)
         # call syntax. The stack item at position count + 1 should be the
         # corresponding callable f.
-        self.byte_BUILD_TUPLE_UNPACK(count)
-
+        self.build_container_flat(count, tuple)
 
     def byte_BUILD_TUPLE_UNPACK(self, count):
         # Pops count iterables from the stack, joins them in a single tuple,
         # and pushes the result. Implements iterable unpacking in
         # tuple displays (*x, *y, *z).
-        elts = self.popn(count)
-        self.push(tuple(e for l in elts for e in l))
+        self.build_container_flat(count, tuple)
 
     def byte_BUILD_TUPLE(self, count):
-        elts = self.popn(count)
-        self.push(tuple(elts))
+        self.build_container(count, tuple)
 
     def byte_BUILD_LIST_UNPACK(self, count):
+        # This is similar to BUILD_TUPLE_UNPACK, but a list instead of tuple.
+        # Implements iterable unpacking in list displays [*x, *y, *z].
+        self.build_container_flat(count, list)
+
+    def byte_BUILD_SET_UNPACK(self, count):
+        # This is similar to BUILD_TUPLE_UNPACK, but a set instead of tuple.
+        # Implements iterable unpacking in set displays {*x, *y, *z}.
+        self.build_container_flat(count, set)
+
+    def byte_BUILD_MAP_UNPACK(self, count):
+        # Pops count mappings from the stack, merges them to a single dict,
+        # and pushes the result. Implements dictionary unpacking in dictionary
+        # displays {**x, **y, **z}.
+        self.build_container(count, dict)
+
+    def byte_BUILD_MAP_UNPACK_WITH_CALL(self, count):
+        self.build_container(count, dict)
+
+    def build_container_flat(self, count, container_fn) :
+        elts = self.popn(count)
+        self.push(container_fn(e for l in elts for e in l))
+
+    def build_container(self, count, container_fn) :
         elts = self.popn(count)
-        self.push([e for l in elts for e in l])
+        self.push(container_fn(elts))
 
     def byte_BUILD_LIST(self, count):
         elts = self.popn(count)
         self.push(elts)
 
     def byte_BUILD_SET(self, count):
-        # TODO: Not documented in Py2 docs.
         elts = self.popn(count)
         self.push(set(elts))
 
@@ -636,7 +655,7 @@ def byte_BUILD_CONST_KEY_MAP(self, count):
 
     def byte_BUILD_MAP(self, count):
         # Pushes a new dictionary on to stack.
-        if sys.version_info[:2] < (3, 5):
+        if sys.version_info < (3, 5):
             self.push({})
             return
         # Pop 2*count items so that

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py33, py36
+envlist = py27, py33, py34, py36
 
 [testenv]
 commands =