gh-105481: add flags to each instr in the opcode metadata table, to replace opcode.hasarg/hasname/hasconst (#105482)

1 files changed, 210 insertions, 203 deletions

diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 7c0cbdb..faa5087 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -855,9 +855,16 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
 #endif
 
 enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT_IBC000, INSTR_FMT_IBC00000000, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC000 };
+#define HAS_ARG_FLAG (1)
+#define HAS_CONST_FLAG (2)
+#define HAS_NAME_FLAG (4)
+#define OPCODE_HAS_ARG(OP) (_PyOpcode_opcode_metadata[(OP)].flags & (HAS_ARG_FLAG))
+#define OPCODE_HAS_CONST(OP) (_PyOpcode_opcode_metadata[(OP)].flags & (HAS_CONST_FLAG))
+#define OPCODE_HAS_NAME(OP) (_PyOpcode_opcode_metadata[(OP)].flags & (HAS_NAME_FLAG))
 struct opcode_metadata {
     bool valid_entry;
     enum InstructionFormat instr_format;
+    int flags;
 };
 
 #define OPCODE_METADATA_FMT(OP) (_PyOpcode_opcode_metadata[(OP)].instr_format)
@@ -868,208 +875,208 @@ struct opcode_metadata {
 extern const struct opcode_metadata _PyOpcode_opcode_metadata[512];
 #else
 const struct opcode_metadata _PyOpcode_opcode_metadata[512] = {
-    [NOP] = { true, INSTR_FMT_IX },
-    [RESUME] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_RESUME] = { true, INSTR_FMT_IB },
-    [LOAD_CLOSURE] = { true, INSTR_FMT_IB },
-    [LOAD_FAST_CHECK] = { true, INSTR_FMT_IB },
-    [LOAD_FAST] = { true, INSTR_FMT_IB },
-    [LOAD_FAST_AND_CLEAR] = { true, INSTR_FMT_IB },
-    [LOAD_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
-    [LOAD_CONST] = { true, INSTR_FMT_IB },
-    [STORE_FAST] = { true, INSTR_FMT_IB },
-    [STORE_FAST_MAYBE_NULL] = { true, INSTR_FMT_IB },
-    [STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
-    [STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB },
-    [POP_TOP] = { true, INSTR_FMT_IX },
-    [PUSH_NULL] = { true, INSTR_FMT_IX },
-    [END_FOR] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_END_FOR] = { true, INSTR_FMT_IX },
-    [END_SEND] = { true, INSTR_FMT_IX },
-    [INSTRUMENTED_END_SEND] = { true, INSTR_FMT_IX },
-    [UNARY_NEGATIVE] = { true, INSTR_FMT_IX },
-    [UNARY_NOT] = { true, INSTR_FMT_IX },
-    [UNARY_INVERT] = { true, INSTR_FMT_IX },
-    [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IBC },
-    [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IB },
-    [BINARY_SUBSCR] = { true, INSTR_FMT_IXC },
-    [BINARY_SLICE] = { true, INSTR_FMT_IX },
-    [STORE_SLICE] = { true, INSTR_FMT_IX },
-    [BINARY_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC },
-    [BINARY_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC },
-    [BINARY_SUBSCR_DICT] = { true, INSTR_FMT_IXC },
-    [BINARY_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC },
-    [LIST_APPEND] = { true, INSTR_FMT_IB },
-    [SET_ADD] = { true, INSTR_FMT_IB },
-    [STORE_SUBSCR] = { true, INSTR_FMT_IXC },
-    [STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC },
-    [STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC },
-    [DELETE_SUBSCR] = { true, INSTR_FMT_IX },
-    [CALL_INTRINSIC_1] = { true, INSTR_FMT_IB },
-    [CALL_INTRINSIC_2] = { true, INSTR_FMT_IB },
-    [RAISE_VARARGS] = { true, INSTR_FMT_IB },
-    [INTERPRETER_EXIT] = { true, INSTR_FMT_IX },
-    [RETURN_VALUE] = { true, INSTR_FMT_IX },
-    [INSTRUMENTED_RETURN_VALUE] = { true, INSTR_FMT_IX },
-    [RETURN_CONST] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_RETURN_CONST] = { true, INSTR_FMT_IB },
-    [GET_AITER] = { true, INSTR_FMT_IX },
-    [GET_ANEXT] = { true, INSTR_FMT_IX },
-    [GET_AWAITABLE] = { true, INSTR_FMT_IB },
-    [SEND] = { true, INSTR_FMT_IBC },
-    [SEND_GEN] = { true, INSTR_FMT_IBC },
-    [INSTRUMENTED_YIELD_VALUE] = { true, INSTR_FMT_IX },
-    [YIELD_VALUE] = { true, INSTR_FMT_IX },
-    [POP_EXCEPT] = { true, INSTR_FMT_IX },
-    [RERAISE] = { true, INSTR_FMT_IB },
-    [END_ASYNC_FOR] = { true, INSTR_FMT_IX },
-    [CLEANUP_THROW] = { true, INSTR_FMT_IX },
-    [LOAD_ASSERTION_ERROR] = { true, INSTR_FMT_IX },
-    [LOAD_BUILD_CLASS] = { true, INSTR_FMT_IX },
-    [STORE_NAME] = { true, INSTR_FMT_IB },
-    [DELETE_NAME] = { true, INSTR_FMT_IB },
-    [UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC },
-    [UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC },
-    [UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC },
-    [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC },
-    [UNPACK_EX] = { true, INSTR_FMT_IB },
-    [STORE_ATTR] = { true, INSTR_FMT_IBC000 },
-    [DELETE_ATTR] = { true, INSTR_FMT_IB },
-    [STORE_GLOBAL] = { true, INSTR_FMT_IB },
-    [DELETE_GLOBAL] = { true, INSTR_FMT_IB },
-    [LOAD_LOCALS] = { true, INSTR_FMT_IB },
-    [LOAD_NAME] = { true, INSTR_FMT_IB },
-    [LOAD_FROM_DICT_OR_GLOBALS] = { true, INSTR_FMT_IB },
-    [LOAD_GLOBAL] = { true, INSTR_FMT_IBC000 },
-    [LOAD_GLOBAL_MODULE] = { true, INSTR_FMT_IBC000 },
-    [LOAD_GLOBAL_BUILTIN] = { true, INSTR_FMT_IBC000 },
-    [DELETE_FAST] = { true, INSTR_FMT_IB },
-    [MAKE_CELL] = { true, INSTR_FMT_IB },
-    [DELETE_DEREF] = { true, INSTR_FMT_IB },
-    [LOAD_FROM_DICT_OR_DEREF] = { true, INSTR_FMT_IB },
-    [LOAD_DEREF] = { true, INSTR_FMT_IB },
-    [STORE_DEREF] = { true, INSTR_FMT_IB },
-    [COPY_FREE_VARS] = { true, INSTR_FMT_IB },
-    [BUILD_STRING] = { true, INSTR_FMT_IB },
-    [BUILD_TUPLE] = { true, INSTR_FMT_IB },
-    [BUILD_LIST] = { true, INSTR_FMT_IB },
-    [LIST_EXTEND] = { true, INSTR_FMT_IB },
-    [SET_UPDATE] = { true, INSTR_FMT_IB },
-    [BUILD_SET] = { true, INSTR_FMT_IB },
-    [BUILD_MAP] = { true, INSTR_FMT_IB },
-    [SETUP_ANNOTATIONS] = { true, INSTR_FMT_IX },
-    [BUILD_CONST_KEY_MAP] = { true, INSTR_FMT_IB },
-    [DICT_UPDATE] = { true, INSTR_FMT_IB },
-    [DICT_MERGE] = { true, INSTR_FMT_IB },
-    [MAP_ADD] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC },
-    [LOAD_SUPER_METHOD] = { true, INSTR_FMT_IBC },
-    [LOAD_ZERO_SUPER_METHOD] = { true, INSTR_FMT_IBC },
-    [LOAD_ZERO_SUPER_ATTR] = { true, INSTR_FMT_IBC },
-    [LOAD_SUPER_ATTR_ATTR] = { true, INSTR_FMT_IBC },
-    [LOAD_SUPER_ATTR_METHOD] = { true, INSTR_FMT_IBC },
-    [LOAD_ATTR] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_METHOD] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_MODULE] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_SLOT] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_CLASS] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_PROPERTY] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = { true, INSTR_FMT_IBC00000000 },
-    [STORE_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IXC000 },
-    [STORE_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC000 },
-    [STORE_ATTR_SLOT] = { true, INSTR_FMT_IXC000 },
-    [COMPARE_OP] = { true, INSTR_FMT_IBC },
-    [COMPARE_OP_FLOAT] = { true, INSTR_FMT_IBC },
-    [COMPARE_OP_INT] = { true, INSTR_FMT_IBC },
-    [COMPARE_OP_STR] = { true, INSTR_FMT_IBC },
-    [IS_OP] = { true, INSTR_FMT_IB },
-    [CONTAINS_OP] = { true, INSTR_FMT_IB },
-    [CHECK_EG_MATCH] = { true, INSTR_FMT_IX },
-    [CHECK_EXC_MATCH] = { true, INSTR_FMT_IX },
-    [IMPORT_NAME] = { true, INSTR_FMT_IB },
-    [IMPORT_FROM] = { true, INSTR_FMT_IB },
-    [JUMP_FORWARD] = { true, INSTR_FMT_IB },
-    [JUMP_BACKWARD] = { true, INSTR_FMT_IB },
-    [JUMP] = { true, INSTR_FMT_IB },
-    [JUMP_NO_INTERRUPT] = { true, INSTR_FMT_IB },
-    [ENTER_EXECUTOR] = { true, INSTR_FMT_IB },
-    [POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB },
-    [POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB },
-    [POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB },
-    [POP_JUMP_IF_NONE] = { true, INSTR_FMT_IB },
-    [JUMP_BACKWARD_NO_INTERRUPT] = { true, INSTR_FMT_IB },
-    [GET_LEN] = { true, INSTR_FMT_IX },
-    [MATCH_CLASS] = { true, INSTR_FMT_IB },
-    [MATCH_MAPPING] = { true, INSTR_FMT_IX },
-    [MATCH_SEQUENCE] = { true, INSTR_FMT_IX },
-    [MATCH_KEYS] = { true, INSTR_FMT_IX },
-    [GET_ITER] = { true, INSTR_FMT_IX },
-    [GET_YIELD_FROM_ITER] = { true, INSTR_FMT_IX },
-    [FOR_ITER] = { true, INSTR_FMT_IBC },
-    [INSTRUMENTED_FOR_ITER] = { true, INSTR_FMT_IB },
-    [FOR_ITER_LIST] = { true, INSTR_FMT_IBC },
-    [FOR_ITER_TUPLE] = { true, INSTR_FMT_IBC },
-    [FOR_ITER_RANGE] = { true, INSTR_FMT_IBC },
-    [FOR_ITER_GEN] = { true, INSTR_FMT_IBC },
-    [BEFORE_ASYNC_WITH] = { true, INSTR_FMT_IX },
-    [BEFORE_WITH] = { true, INSTR_FMT_IX },
-    [WITH_EXCEPT_START] = { true, INSTR_FMT_IX },
-    [SETUP_FINALLY] = { true, INSTR_FMT_IX },
-    [SETUP_CLEANUP] = { true, INSTR_FMT_IX },
-    [SETUP_WITH] = { true, INSTR_FMT_IX },
-    [POP_BLOCK] = { true, INSTR_FMT_IX },
-    [PUSH_EXC_INFO] = { true, INSTR_FMT_IX },
-    [LOAD_ATTR_METHOD_WITH_VALUES] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_METHOD_NO_DICT] = { true, INSTR_FMT_IBC00000000 },
-    [LOAD_ATTR_METHOD_LAZY_DICT] = { true, INSTR_FMT_IBC00000000 },
-    [KW_NAMES] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_CALL] = { true, INSTR_FMT_IB },
-    [CALL] = { true, INSTR_FMT_IBC00 },
-    [CALL_BOUND_METHOD_EXACT_ARGS] = { true, INSTR_FMT_IBC00 },
-    [CALL_PY_EXACT_ARGS] = { true, INSTR_FMT_IBC00 },
-    [CALL_PY_WITH_DEFAULTS] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_TYPE_1] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_STR_1] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_TUPLE_1] = { true, INSTR_FMT_IBC00 },
-    [CALL_BUILTIN_CLASS] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_BUILTIN_O] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_BUILTIN_FAST] = { true, INSTR_FMT_IBC00 },
-    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_LEN] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_ISINSTANCE] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_LIST_APPEND] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = { true, INSTR_FMT_IBC00 },
-    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = { true, INSTR_FMT_IBC00 },
-    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = { true, INSTR_FMT_IBC00 },
-    [INSTRUMENTED_CALL_FUNCTION_EX] = { true, INSTR_FMT_IX },
-    [CALL_FUNCTION_EX] = { true, INSTR_FMT_IB },
-    [MAKE_FUNCTION] = { true, INSTR_FMT_IX },
-    [SET_FUNCTION_ATTRIBUTE] = { true, INSTR_FMT_IB },
-    [RETURN_GENERATOR] = { true, INSTR_FMT_IX },
-    [BUILD_SLICE] = { true, INSTR_FMT_IB },
-    [FORMAT_VALUE] = { true, INSTR_FMT_IB },
-    [COPY] = { true, INSTR_FMT_IB },
-    [BINARY_OP] = { true, INSTR_FMT_IBC },
-    [SWAP] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_INSTRUCTION] = { true, INSTR_FMT_IX },
-    [INSTRUMENTED_JUMP_FORWARD] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_JUMP_BACKWARD] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_POP_JUMP_IF_NONE] = { true, INSTR_FMT_IB },
-    [INSTRUMENTED_POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB },
-    [EXTENDED_ARG] = { true, INSTR_FMT_IB },
-    [CACHE] = { true, INSTR_FMT_IX },
-    [RESERVED] = { true, INSTR_FMT_IX },
+    [NOP] = { true, INSTR_FMT_IX, 0 },
+    [RESUME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_RESUME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_CLOSURE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_FAST_CHECK] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_FAST_AND_CLEAR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_FAST_LOAD_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_CONST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_CONST_FLAG },
+    [STORE_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_FAST_MAYBE_NULL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_TOP] = { true, INSTR_FMT_IX, 0 },
+    [PUSH_NULL] = { true, INSTR_FMT_IX, 0 },
+    [END_FOR] = { true, INSTR_FMT_IB, 0 },
+    [INSTRUMENTED_END_FOR] = { true, INSTR_FMT_IX, 0 },
+    [END_SEND] = { true, INSTR_FMT_IX, 0 },
+    [INSTRUMENTED_END_SEND] = { true, INSTR_FMT_IX, 0 },
+    [UNARY_NEGATIVE] = { true, INSTR_FMT_IX, 0 },
+    [UNARY_NOT] = { true, INSTR_FMT_IX, 0 },
+    [UNARY_INVERT] = { true, INSTR_FMT_IX, 0 },
+    [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IBC, 0 },
+    [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IB, 0 },
+    [BINARY_SUBSCR] = { true, INSTR_FMT_IXC, 0 },
+    [BINARY_SLICE] = { true, INSTR_FMT_IX, 0 },
+    [STORE_SLICE] = { true, INSTR_FMT_IX, 0 },
+    [BINARY_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, 0 },
+    [BINARY_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC, 0 },
+    [BINARY_SUBSCR_DICT] = { true, INSTR_FMT_IXC, 0 },
+    [BINARY_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC, 0 },
+    [LIST_APPEND] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [SET_ADD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_SUBSCR] = { true, INSTR_FMT_IXC, 0 },
+    [STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, 0 },
+    [STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC, 0 },
+    [DELETE_SUBSCR] = { true, INSTR_FMT_IX, 0 },
+    [CALL_INTRINSIC_1] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [CALL_INTRINSIC_2] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [RAISE_VARARGS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INTERPRETER_EXIT] = { true, INSTR_FMT_IX, 0 },
+    [RETURN_VALUE] = { true, INSTR_FMT_IX, 0 },
+    [INSTRUMENTED_RETURN_VALUE] = { true, INSTR_FMT_IX, 0 },
+    [RETURN_CONST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_CONST_FLAG },
+    [INSTRUMENTED_RETURN_CONST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_CONST_FLAG },
+    [GET_AITER] = { true, INSTR_FMT_IX, 0 },
+    [GET_ANEXT] = { true, INSTR_FMT_IX, 0 },
+    [GET_AWAITABLE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [SEND] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [SEND_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [INSTRUMENTED_YIELD_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [YIELD_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_EXCEPT] = { true, INSTR_FMT_IX, 0 },
+    [RERAISE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [END_ASYNC_FOR] = { true, INSTR_FMT_IX, 0 },
+    [CLEANUP_THROW] = { true, INSTR_FMT_IX, 0 },
+    [LOAD_ASSERTION_ERROR] = { true, INSTR_FMT_IX, 0 },
+    [LOAD_BUILD_CLASS] = { true, INSTR_FMT_IX, 0 },
+    [STORE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [DELETE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [UNPACK_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_ATTR] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [DELETE_ATTR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [STORE_GLOBAL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [DELETE_GLOBAL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_LOCALS] = { true, INSTR_FMT_IB, 0 },
+    [LOAD_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_FROM_DICT_OR_GLOBALS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_GLOBAL] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_GLOBAL_MODULE] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG },
+    [LOAD_GLOBAL_BUILTIN] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG },
+    [DELETE_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [MAKE_CELL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [DELETE_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_FROM_DICT_OR_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LOAD_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [STORE_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [COPY_FREE_VARS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BUILD_STRING] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BUILD_TUPLE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BUILD_LIST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [LIST_EXTEND] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [SET_UPDATE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BUILD_SET] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BUILD_MAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [SETUP_ANNOTATIONS] = { true, INSTR_FMT_IX, 0 },
+    [BUILD_CONST_KEY_MAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [DICT_UPDATE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [DICT_MERGE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [MAP_ADD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_SUPER_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_SUPER_METHOD] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_ZERO_SUPER_METHOD] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_ZERO_SUPER_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_SUPER_ATTR_ATTR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_SUPER_ATTR_METHOD] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_ATTR] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_METHOD] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_MODULE] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [LOAD_ATTR_SLOT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_CLASS] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_PROPERTY] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [STORE_ATTR_INSTANCE_VALUE] = { true, INSTR_FMT_IXC000, 0 },
+    [STORE_ATTR_WITH_HINT] = { true, INSTR_FMT_IBC000, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [STORE_ATTR_SLOT] = { true, INSTR_FMT_IXC000, 0 },
+    [COMPARE_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [COMPARE_OP_FLOAT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [COMPARE_OP_INT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [IS_OP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [CONTAINS_OP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [CHECK_EG_MATCH] = { true, INSTR_FMT_IX, 0 },
+    [CHECK_EXC_MATCH] = { true, INSTR_FMT_IX, 0 },
+    [IMPORT_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [IMPORT_FROM] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG },
+    [JUMP_FORWARD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [JUMP_BACKWARD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [JUMP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [JUMP_NO_INTERRUPT] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [ENTER_EXECUTOR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [POP_JUMP_IF_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [JUMP_BACKWARD_NO_INTERRUPT] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [GET_LEN] = { true, INSTR_FMT_IX, 0 },
+    [MATCH_CLASS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [MATCH_MAPPING] = { true, INSTR_FMT_IX, 0 },
+    [MATCH_SEQUENCE] = { true, INSTR_FMT_IX, 0 },
+    [MATCH_KEYS] = { true, INSTR_FMT_IX, 0 },
+    [GET_ITER] = { true, INSTR_FMT_IX, 0 },
+    [GET_YIELD_FROM_ITER] = { true, INSTR_FMT_IX, 0 },
+    [FOR_ITER] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [INSTRUMENTED_FOR_ITER] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [FOR_ITER_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [FOR_ITER_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [FOR_ITER_RANGE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [FOR_ITER_GEN] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [BEFORE_ASYNC_WITH] = { true, INSTR_FMT_IX, 0 },
+    [BEFORE_WITH] = { true, INSTR_FMT_IX, 0 },
+    [WITH_EXCEPT_START] = { true, INSTR_FMT_IX, 0 },
+    [SETUP_FINALLY] = { true, INSTR_FMT_IX, 0 },
+    [SETUP_CLEANUP] = { true, INSTR_FMT_IX, 0 },
+    [SETUP_WITH] = { true, INSTR_FMT_IX, 0 },
+    [POP_BLOCK] = { true, INSTR_FMT_IX, 0 },
+    [PUSH_EXC_INFO] = { true, INSTR_FMT_IX, 0 },
+    [LOAD_ATTR_METHOD_WITH_VALUES] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_METHOD_NO_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [LOAD_ATTR_METHOD_LAZY_DICT] = { true, INSTR_FMT_IBC00000000, HAS_ARG_FLAG },
+    [KW_NAMES] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_CONST_FLAG },
+    [INSTRUMENTED_CALL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [CALL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_BOUND_METHOD_EXACT_ARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_PY_EXACT_ARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_PY_WITH_DEFAULTS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_TYPE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_STR_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_TUPLE_1] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_BUILTIN_CLASS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_BUILTIN_O] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_BUILTIN_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_LEN] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_ISINSTANCE] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_LIST_APPEND] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG },
+    [INSTRUMENTED_CALL_FUNCTION_EX] = { true, INSTR_FMT_IX, 0 },
+    [CALL_FUNCTION_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [MAKE_FUNCTION] = { true, INSTR_FMT_IX, 0 },
+    [SET_FUNCTION_ATTRIBUTE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [RETURN_GENERATOR] = { true, INSTR_FMT_IX, 0 },
+    [BUILD_SLICE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [FORMAT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [BINARY_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG },
+    [SWAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_INSTRUCTION] = { true, INSTR_FMT_IX, 0 },
+    [INSTRUMENTED_JUMP_FORWARD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_JUMP_BACKWARD] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_POP_JUMP_IF_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [INSTRUMENTED_POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [EXTENDED_ARG] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [CACHE] = { true, INSTR_FMT_IX, 0 },
+    [RESERVED] = { true, INSTR_FMT_IX, 0 },
 };
 #endif