Get rid of some obsolete opcodes.

diff --git a/Include/opcode.h b/Include/opcode.h
index 52c8744cf22ae96e6ec3af86b520ad2f8d36b1b2..8b6890fe27932431933cd42a77308376206949c3 100644 (file)
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -99,12 +99,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #define DELETE_NAME    91      /* "" */
 #define UNPACK_TUPLE   92      /* Number of tuple items */
 #define UNPACK_LIST    93      /* Number of list items */
-#define UNPACK_ARG     94      /* Number of arguments */
 #define STORE_ATTR     95      /* Index in name list */
 #define DELETE_ATTR    96      /* "" */
 #define STORE_GLOBAL   97      /* "" */
 #define DELETE_GLOBAL  98      /* "" */
-#define UNPACK_VARARG  99      /* Minimal number of arguments */
 
 #define LOAD_CONST     100     /* Index in const list */
 #define LOAD_NAME      101     /* Index in name list */
@@ -122,11 +120,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #define JUMP_ABSOLUTE  113     /* Target byte offset from beginning of code */
 #define FOR_LOOP       114     /* Number of bytes to skip */
 
-#define LOAD_LOCAL     115     /* Index in name list */
 #define LOAD_GLOBAL    116     /* Index in name list */
 
-#define SET_FUNC_ARGS  117     /* Argcount */
-
 #define SETUP_LOOP     120     /* Target address (absolute) */
 #define SETUP_EXCEPT   121     /* "" */
 #define SETUP_FINALLY  122     /* "" */

diff --git a/Lib/dis.py b/Lib/dis.py
index a012c17b477f85e33336e0036887d565b73cba19..c997880a69549b973a41f3114fe476425b32b099 100644 (file)
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -208,12 +208,10 @@ name_op('STORE_NAME', 90) # Index in name list
 name_op('DELETE_NAME', 91)     # "" 
 def_op('UNPACK_TUPLE', 92)     # Number of tuple items 
 def_op('UNPACK_LIST', 93)      # Number of list items 
-def_op('UNPACK_ARG', 94)       # Number of arguments expected
 name_op('STORE_ATTR', 95)      # Index in name list 
 name_op('DELETE_ATTR', 96)     # ""
 name_op('STORE_GLOBAL', 97)    # ""
 name_op('DELETE_GLOBAL', 98)   # ""
-name_op('UNPACK_VARARG', 99)   # Minimal number of arguments
 
 def_op('LOAD_CONST', 100)      # Index in const list 
 hasconst.append(100)
@@ -233,11 +231,8 @@ jrel_op('JUMP_IF_TRUE', 112)       # ""
 jabs_op('JUMP_ABSOLUTE', 113)  # Target byte offset from beginning of code 
 jrel_op('FOR_LOOP', 114)       # Number of bytes to skip 
 
-name_op('LOAD_LOCAL', 115)     # Index in name list
 name_op('LOAD_GLOBAL', 116)    # Index in name list
 
-def_op('SET_FUNC_ARGS', 117)   # Argcount
-
 jrel_op('SETUP_LOOP', 120)     # Distance to target address
 jrel_op('SETUP_EXCEPT', 121)   # ""
 jrel_op('SETUP_FINALLY', 122)  # ""