Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5134ef4

Browse files
authored
GH-98831: Identify instructions that don't use oparg (#100957)
For these the instr_format field uses IX instead of IB.Register instructions use IX, IB, IBBX, IBBB, etc.Also: Include the closing '}' in Block.tokens, for completeness
1 parent6bde3d2 commit5134ef4

File tree

3 files changed

+70
-60
lines changed

3 files changed

+70
-60
lines changed

‎Python/opcode_metadata.h

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// from Python/bytecodes.c
33
// Do not edit!
44
enumDirection {DIR_NONE,DIR_READ,DIR_WRITE };
5-
enumInstructionFormat {INSTR_FMT_IB,INSTR_FMT_IBC,INSTR_FMT_IBC000,INSTR_FMT_IBCIB,INSTR_FMT_IBIB };
5+
enumInstructionFormat {INSTR_FMT_IB,INSTR_FMT_IBC,INSTR_FMT_IBC000,INSTR_FMT_IBCIB,INSTR_FMT_IBIB,INSTR_FMT_IX,INSTR_FMT_IXC,INSTR_FMT_IXC000 };
66
staticconststruct {
77
shortn_popped;
88
shortn_pushed;
@@ -12,7 +12,7 @@ static const struct {
1212
boolvalid_entry;
1313
enumInstructionFormatinstr_format;
1414
}_PyOpcode_opcode_metadata[256]= {
15-
[NOP]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
15+
[NOP]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
1616
[RESUME]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
1717
[LOAD_CLOSURE]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
1818
[LOAD_FAST_CHECK]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
@@ -24,53 +24,53 @@ static const struct {
2424
[STORE_FAST__LOAD_FAST]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBIB },
2525
[STORE_FAST__STORE_FAST]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBIB },
2626
[LOAD_CONST__LOAD_FAST]= {0,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBIB },
27-
[POP_TOP]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
28-
[PUSH_NULL]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
27+
[POP_TOP]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
28+
[PUSH_NULL]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
2929
[END_FOR]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
30-
[UNARY_NEGATIVE]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
31-
[UNARY_NOT]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
32-
[UNARY_INVERT]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
33-
[BINARY_OP_MULTIPLY_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
34-
[BINARY_OP_MULTIPLY_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
35-
[BINARY_OP_SUBTRACT_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
36-
[BINARY_OP_SUBTRACT_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
37-
[BINARY_OP_ADD_UNICODE]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
38-
[BINARY_OP_INPLACE_ADD_UNICODE]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
39-
[BINARY_OP_ADD_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
40-
[BINARY_OP_ADD_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
41-
[BINARY_SUBSCR]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
42-
[BINARY_SLICE]= {3,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
43-
[STORE_SLICE]= {4,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
44-
[BINARY_SUBSCR_LIST_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
45-
[BINARY_SUBSCR_TUPLE_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
46-
[BINARY_SUBSCR_DICT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
47-
[BINARY_SUBSCR_GETITEM]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
30+
[UNARY_NEGATIVE]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
31+
[UNARY_NOT]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
32+
[UNARY_INVERT]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
33+
[BINARY_OP_MULTIPLY_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
34+
[BINARY_OP_MULTIPLY_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
35+
[BINARY_OP_SUBTRACT_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
36+
[BINARY_OP_SUBTRACT_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
37+
[BINARY_OP_ADD_UNICODE]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
38+
[BINARY_OP_INPLACE_ADD_UNICODE]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
39+
[BINARY_OP_ADD_FLOAT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
40+
[BINARY_OP_ADD_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
41+
[BINARY_SUBSCR]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
42+
[BINARY_SLICE]= {3,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
43+
[STORE_SLICE]= {4,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
44+
[BINARY_SUBSCR_LIST_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
45+
[BINARY_SUBSCR_TUPLE_INT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
46+
[BINARY_SUBSCR_DICT]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
47+
[BINARY_SUBSCR_GETITEM]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
4848
[LIST_APPEND]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
4949
[SET_ADD]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
50-
[STORE_SUBSCR]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
51-
[STORE_SUBSCR_LIST_INT]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
52-
[STORE_SUBSCR_DICT]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
53-
[DELETE_SUBSCR]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
50+
[STORE_SUBSCR]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
51+
[STORE_SUBSCR_LIST_INT]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
52+
[STORE_SUBSCR_DICT]= {3,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC },
53+
[DELETE_SUBSCR]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
5454
[CALL_INTRINSIC_1]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
5555
[RAISE_VARARGS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
56-
[INTERPRETER_EXIT]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
57-
[RETURN_VALUE]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
58-
[GET_AITER]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
59-
[GET_ANEXT]= {1,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
56+
[INTERPRETER_EXIT]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
57+
[RETURN_VALUE]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
58+
[GET_AITER]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
59+
[GET_ANEXT]= {1,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
6060
[GET_AWAITABLE]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
6161
[SEND]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
6262
[YIELD_VALUE]= {1,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
63-
[POP_EXCEPT]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
63+
[POP_EXCEPT]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
6464
[RERAISE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
65-
[PREP_RERAISE_STAR]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
66-
[END_ASYNC_FOR]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
67-
[CLEANUP_THROW]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
68-
[LOAD_ASSERTION_ERROR]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
69-
[LOAD_BUILD_CLASS]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
65+
[PREP_RERAISE_STAR]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
66+
[END_ASYNC_FOR]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
67+
[CLEANUP_THROW]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
68+
[LOAD_ASSERTION_ERROR]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
69+
[LOAD_BUILD_CLASS]= {0,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
7070
[STORE_NAME]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
7171
[DELETE_NAME]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
7272
[UNPACK_SEQUENCE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
73-
[UNPACK_SEQUENCE_TWO_TUPLE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
73+
[UNPACK_SEQUENCE_TWO_TUPLE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
7474
[UNPACK_SEQUENCE_TUPLE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
7575
[UNPACK_SEQUENCE_LIST]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
7676
[UNPACK_EX]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
@@ -96,7 +96,7 @@ static const struct {
9696
[SET_UPDATE]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
9797
[BUILD_SET]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
9898
[BUILD_MAP]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
99-
[SETUP_ANNOTATIONS]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
99+
[SETUP_ANNOTATIONS]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
100100
[BUILD_CONST_KEY_MAP]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
101101
[DICT_UPDATE]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
102102
[DICT_MERGE]= {1,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
@@ -109,17 +109,17 @@ static const struct {
109109
[LOAD_ATTR_CLASS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
110110
[LOAD_ATTR_PROPERTY]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
111111
[LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
112-
[STORE_ATTR_INSTANCE_VALUE]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
112+
[STORE_ATTR_INSTANCE_VALUE]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
113113
[STORE_ATTR_WITH_HINT]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
114-
[STORE_ATTR_SLOT]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC000 },
114+
[STORE_ATTR_SLOT]= {2,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IXC000 },
115115
[COMPARE_OP]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
116116
[COMPARE_OP_FLOAT_JUMP]= {3,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBCIB },
117117
[COMPARE_OP_INT_JUMP]= {3,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBCIB },
118118
[COMPARE_OP_STR_JUMP]= {3,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBCIB },
119119
[IS_OP]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
120120
[CONTAINS_OP]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
121-
[CHECK_EG_MATCH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
122-
[CHECK_EXC_MATCH]= {2,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
121+
[CHECK_EG_MATCH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
122+
[CHECK_EXC_MATCH]= {2,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
123123
[IMPORT_NAME]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
124124
[IMPORT_FROM]= {1,2,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
125125
[JUMP_FORWARD]= {0,0,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
@@ -131,25 +131,25 @@ static const struct {
131131
[JUMP_IF_FALSE_OR_POP]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
132132
[JUMP_IF_TRUE_OR_POP]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
133133
[JUMP_BACKWARD_NO_INTERRUPT]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
134-
[GET_LEN]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
134+
[GET_LEN]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
135135
[MATCH_CLASS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
136-
[MATCH_MAPPING]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
137-
[MATCH_SEQUENCE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
138-
[MATCH_KEYS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
139-
[GET_ITER]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
140-
[GET_YIELD_FROM_ITER]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
136+
[MATCH_MAPPING]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
137+
[MATCH_SEQUENCE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
138+
[MATCH_KEYS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
139+
[GET_ITER]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
140+
[GET_YIELD_FROM_ITER]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
141141
[FOR_ITER]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
142142
[FOR_ITER_LIST]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
143143
[FOR_ITER_TUPLE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
144144
[FOR_ITER_RANGE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
145145
[FOR_ITER_GEN]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
146-
[BEFORE_ASYNC_WITH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
147-
[BEFORE_WITH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
148-
[WITH_EXCEPT_START]= {4,5,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
149-
[PUSH_EXC_INFO]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
150-
[LOAD_ATTR_METHOD_WITH_VALUES]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
151-
[LOAD_ATTR_METHOD_NO_DICT]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
152-
[LOAD_ATTR_METHOD_LAZY_DICT]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
146+
[BEFORE_ASYNC_WITH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
147+
[BEFORE_WITH]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
148+
[WITH_EXCEPT_START]= {4,5,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
149+
[PUSH_EXC_INFO]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
150+
[LOAD_ATTR_METHOD_WITH_VALUES]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
151+
[LOAD_ATTR_METHOD_NO_DICT]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
152+
[LOAD_ATTR_METHOD_LAZY_DICT]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
153153
[CALL_BOUND_METHOD_EXACT_ARGS]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
154154
[KW_NAMES]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
155155
[CALL]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
@@ -171,12 +171,12 @@ static const struct {
171171
[CALL_NO_KW_METHOD_DESCRIPTOR_FAST]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
172172
[CALL_FUNCTION_EX]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
173173
[MAKE_FUNCTION]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
174-
[RETURN_GENERATOR]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
174+
[RETURN_GENERATOR]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
175175
[BUILD_SLICE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
176176
[FORMAT_VALUE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
177177
[COPY]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
178178
[BINARY_OP]= {2,1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IBC },
179179
[SWAP]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
180180
[EXTENDED_ARG]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
181-
[CACHE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IB },
181+
[CACHE]= {-1,-1,DIR_NONE,DIR_NONE,DIR_NONE, true,INSTR_FMT_IX },
182182
};

‎Tools/cases_generator/generate_cases.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,14 @@ def __init__(self, inst: parser.InstDef):
168168
break
169169
self.unmoved_names=frozenset(unmoved_names)
170170
ifself.register:
171-
fmt="IBBB"
171+
num_regs=len(self.input_effects)+len(self.output_effects)
172+
num_dummies= (num_regs//2)*2+1-num_regs
173+
fmt="I"+"B"*num_regs+"X"*num_dummies
172174
else:
173-
fmt="IB"
175+
ifvariable_used(inst.block,"oparg"):
176+
fmt="IB"
177+
else:
178+
fmt="IX"
174179
cache="C"
175180
forceinself.cache_effects:
176181
for_inrange(ce.size):
@@ -894,6 +899,11 @@ def always_exits(lines: list[str]) -> bool:
894899
)
895900

896901

902+
defvariable_used(block:parser.Block,name:str)->bool:
903+
"""Determine whether a variable with a given name is used in a block."""
904+
returnany(token.kind=="IDENTIFIER"andtoken.text==namefortokeninblock.tokens)
905+
906+
897907
defmain():
898908
"""Parse command line, parse input, analyze, write output."""
899909
args=arg_parser.parse_args()# Prints message and sys.exit(2) on error

‎Tools/cases_generator/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,13 @@ def c_blob(self) -> list[lx.Token]:
338338
tokens:list[lx.Token]= []
339339
level=0
340340
whiletkn:=self.next(raw=True):
341+
tokens.append(tkn)
341342
iftkn.kindin (lx.LBRACE,lx.LPAREN,lx.LBRACKET):
342343
level+=1
343344
eliftkn.kindin (lx.RBRACE,lx.RPAREN,lx.RBRACKET):
344345
level-=1
345346
iflevel<=0:
346347
break
347-
tokens.append(tkn)
348348
returntokens
349349

350350

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp