Skip to content

Commit 9c3fd3e

Browse files
ShaharNavehShaharNaveh
committed
fmt
1 parent 27cab7e commit 9c3fd3e

1 file changed

Lines changed: 175 additions & 31 deletions

File tree

‎crates/compiler-core/src/bytecode/instruction.rs‎

Lines changed: 175 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,50 @@ define_opcodes!(
170170
{ name: UnaryNot, id: 42, display: "UNARY_NOT"},
171171
{ name: WithExceptStart, id: 43, display: "WITH_EXCEPT_START"},
172172
{ name: BinaryOp, id: 44, display: "BINARY_OP", oparg: { name: op, typ: BinaryOperator }},
173-
{ name: BuildInterpolation, id: 45, display: "BUILD_INTERPOLATION", oparg: { name: format, typ: u32 }},
173+
{
174+
name: BuildInterpolation,
175+
id: 45,
176+
display: "BUILD_INTERPOLATION",
177+
oparg: { name: format, typ: u32 }
178+
},
174179
{ name: BuildList, id: 46, display: "BUILD_LIST", oparg: { name: count, typ: u32 }},
175180
{ name: BuildMap, id: 47, display: "BUILD_MAP", oparg: { name: count, typ: u32 }},
176181
{ name: BuildSet, id: 48, display: "BUILD_SET", oparg: { name: count, typ: u32 }},
177-
{ name: BuildSlice, id: 49, display: "BUILD_SLICE", oparg: { name: argc, typ: BuildSliceArgCount }},
182+
{
183+
name: BuildSlice,
184+
id: 49,
185+
display: "BUILD_SLICE",
186+
oparg: { name: argc, typ: BuildSliceArgCount }
187+
},
178188
{ name: BuildString, id: 50, display: "BUILD_STRING", oparg: { name: count, typ: u32 }},
179189
{ name: BuildTuple, id: 51, display: "BUILD_TUPLE", oparg: { name: count, typ: u32 }},
180190
{ name: Call, id: 52, display: "CALL", oparg: { name: argc, typ: u32 }},
181-
{ name: CallIntrinsic1, id: 53, display: "CALL_INTRINSIC_1", oparg: { name: func, typ: IntrinsicFunction1 }},
182-
{ name: CallIntrinsic2, id: 54, display: "CALL_INTRINSIC_2", oparg: { name: func, typ: IntrinsicFunction2 }},
191+
{
192+
name: CallIntrinsic1,
193+
id: 53,
194+
display: "CALL_INTRINSIC_1",
195+
oparg: { name: func, typ: IntrinsicFunction1 }
196+
},
197+
{
198+
name: CallIntrinsic2,
199+
id: 54,
200+
display: "CALL_INTRINSIC_2",
201+
oparg: { name: func, typ: IntrinsicFunction2 }
202+
},
183203
{ name: CallKw, id: 55, display: "CALL_KW", oparg: { name: argc, typ: u32 }},
184-
{ name: CompareOp, id: 56, display: "COMPARE_OP", oparg: { name: opname, typ: ComparisonOperator }},
204+
{
205+
name: CompareOp,
206+
id: 56,
207+
display: "COMPARE_OP",
208+
oparg: { name: opname, typ: ComparisonOperator }
209+
},
185210
{ name: ContainsOp, id: 57, display: "CONTAINS_OP", oparg: { name: invert, typ: Invert }},
186-
{ name: ConvertValue, id: 58, display: "CONVERT_VALUE", oparg: { name: oparg, typ: ConvertValueOparg }},
211+
{
212+
name: ConvertValue,
213+
id: 58,
214+
display: "CONVERT_VALUE",
215+
oparg: { name: oparg, typ: ConvertValueOparg }
216+
},
187217
{ name: Copy, id: 59, display: "COPY", oparg: { name: i, typ: u32 }},
188218
{ name: CopyFreeVars, id: 60, display: "COPY_FREE_VARS", oparg: { name: n, typ: u32 }},
189219
{ name: DeleteAttr, id: 61, display: "DELETE_ATTR", oparg: { name: namei, typ: NameIdx }},
@@ -201,52 +231,141 @@ define_opcodes!(
201231
{ name: ImportName, id: 73, display: "IMPORT_NAME", oparg: { name: namei, typ: NameIdx }},
202232
{ name: IsOp, id: 74, display: "IS_OP", oparg: { name: invert, typ: Invert }},
203233
{ name: JumpBackward, id: 75, display: "JUMP_BACKWARD", oparg: { name: delta, typ: Label }},
204-
{ name: JumpBackwardNoInterrupt, id: 76, display: "JUMP_BACKWARD_NO_INTERRUPT", oparg: { name: delta, typ: Label }},
234+
{
235+
name: JumpBackwardNoInterrupt,
236+
id: 76,
237+
display: "JUMP_BACKWARD_NO_INTERRUPT",
238+
oparg: { name: delta, typ: Label }
239+
},
205240
{ name: JumpForward, id: 77, display: "JUMP_FORWARD", oparg: { name: delta, typ: Label }},
206241
{ name: ListAppend, id: 78, display: "LIST_APPEND", oparg: { name: i, typ: u32 }},
207242
{ name: ListExtend, id: 79, display: "LIST_EXTEND", oparg: { name: i, typ: u32 }},
208243
{ name: LoadAttr, id: 80, display: "LOAD_ATTR", oparg: { name: namei, typ: LoadAttr }},
209-
{ name: LoadCommonConstant, id: 81, display: "LOAD_COMMON_CONSTANT", oparg: { name: idx, typ: CommonConstant }},
210-
{ name: LoadConst, id: 82, display: "LOAD_CONST", oparg: { name: consti, typ: oparg::ConstIdx }},
244+
{
245+
name: LoadCommonConstant,
246+
id: 81,
247+
display: "LOAD_COMMON_CONSTANT",
248+
oparg: { name: idx, typ: CommonConstant }
249+
},
250+
{
251+
name: LoadConst,
252+
id: 82,
253+
display: "LOAD_CONST",
254+
oparg: { name: consti, typ: oparg::ConstIdx }
255+
},
211256
{ name: LoadDeref, id: 83, display: "LOAD_DEREF", oparg: { name: i, typ: oparg::VarNum }},
212-
{ name: LoadFast, id: 84, display: "LOAD_FAST", oparg: { name: var_num, typ: oparg::VarNum }},
213-
{ name: LoadFastAndClear, id: 85, display: "LOAD_FAST_AND_CLEAR", oparg: { name: var_num, typ: oparg::VarNum }},
214-
{ name: LoadFastBorrow, id: 86, display: "LOAD_FAST_BORROW", oparg: { name: var_num, typ: oparg::VarNum }},
215-
{ name: LoadFastBorrowLoadFastBorrow, id: 87, display: "LOAD_FAST_BORROW_LOAD_FAST_BORROW", oparg: { name: var_nums, typ: oparg::VarNums }},
216-
{ name: LoadFastCheck, id: 88, display: "LOAD_FAST_CHECK", oparg: { name: var_num, typ: oparg::VarNum }},
217-
{ name: LoadFastLoadFast, id: 89, display: "LOAD_FAST_LOAD_FAST", oparg: { name: var_nums, typ: oparg::VarNums }},
218-
{ name: LoadFromDictOrDeref, id: 90, display: "LOAD_FROM_DICT_OR_DEREF", oparg: { name: i, typ: oparg::VarNum }},
219-
{ name: LoadFromDictOrGlobals, id: 91, display: "LOAD_FROM_DICT_OR_GLOBALS", oparg: { name: i, typ: NameIdx }},
257+
{
258+
name: LoadFast,
259+
id: 84,
260+
display: "LOAD_FAST",
261+
oparg: { name: var_num, typ: oparg::VarNum }
262+
},
263+
{
264+
name: LoadFastAndClear,
265+
id: 85, display: "LOAD_FAST_AND_CLEAR",
266+
oparg: { name: var_num, typ: oparg::VarNum }
267+
},
268+
{
269+
name: LoadFastBorrow,
270+
id: 86,
271+
display: "LOAD_FAST_BORROW",
272+
oparg: { name: var_num, typ: oparg::VarNum }
273+
},
274+
{
275+
name: LoadFastBorrowLoadFastBorrow,
276+
id: 87,
277+
display: "LOAD_FAST_BORROW_LOAD_FAST_BORROW",
278+
oparg: { name: var_nums, typ: oparg::VarNums }
279+
},
280+
{
281+
name: LoadFastCheck,
282+
id: 88,
283+
display: "LOAD_FAST_CHECK",
284+
oparg: { name: var_num, typ: oparg::VarNum }
285+
},
286+
{
287+
name: LoadFastLoadFast,
288+
id: 89,
289+
display: "LOAD_FAST_LOAD_FAST",
290+
oparg: { name: var_nums, typ: oparg::VarNums }
291+
},
292+
{
293+
name: LoadFromDictOrDeref,
294+
id: 90,
295+
display: "LOAD_FROM_DICT_OR_DEREF",
296+
oparg: { name: i, typ: oparg::VarNum }
297+
},
298+
{
299+
name: LoadFromDictOrGlobals,
300+
id: 91,
301+
display: "LOAD_FROM_DICT_OR_GLOBALS",
302+
oparg: { name: i, typ: NameIdx }
303+
},
220304
{ name: LoadGlobal, id: 92, display: "LOAD_GLOBAL", oparg: { name: namei, typ: NameIdx }},
221305
{ name: LoadName, id: 93, display: "LOAD_NAME", oparg: { name: namei, typ: NameIdx }},
222306
{ name: LoadSmallInt, id: 94, display: "LOAD_SMALL_INT", oparg: { name: i, typ: u32 }},
223-
{ name: LoadSpecial, id: 95, display: "LOAD_SPECIAL", oparg: { name: method, typ: SpecialMethod }},
224-
{ name: LoadSuperAttr, id: 96, display: "LOAD_SUPER_ATTR", oparg: { name: namei, typ: LoadSuperAttr }},
307+
{
308+
name: LoadSpecial,
309+
id: 95,
310+
display: "LOAD_SPECIAL",
311+
oparg: { name: method, typ: SpecialMethod }
312+
},
313+
{
314+
name: LoadSuperAttr,
315+
id: 96,
316+
display: "LOAD_SUPER_ATTR",
317+
oparg: { name: namei, typ: LoadSuperAttr }
318+
},
225319
{ name: MakeCell, id: 97, display: "MAKE_CELL", oparg: { name: i, typ: oparg::VarNum }},
226320
{ name: MapAdd, id: 98, display: "MAP_ADD", oparg: { name: i, typ: u32 }},
227321
{ name: MatchClass, id: 99, display: "MATCH_CLASS", oparg: { name: count, typ: u32 }},
228322
{ name: PopJumpIfFalse, id: 100, display: "POP_JUMP_IF_FALSE", oparg: { name: delta, typ: Label }},
229323
{ name: PopJumpIfNone, id: 101, display: "POP_JUMP_IF_NONE", oparg: { name: delta, typ: Label }},
230-
{ name: PopJumpIfNotNone, id: 102, display: "POP_JUMP_IF_NOT_NONE", oparg: { name: delta, typ: Label }},
324+
{
325+
name: PopJumpIfNotNone,
326+
id: 102,
327+
display: "POP_JUMP_IF_NOT_NONE",
328+
oparg: { name: delta, typ: Label }
329+
},
231330
{ name: PopJumpIfTrue, id: 103, display: "POP_JUMP_IF_TRUE", oparg: { name: delta, typ: Label }},
232331
{ name: RaiseVarargs, id: 104, display: "RAISE_VARARGS", oparg: { name: argc, typ: RaiseKind }},
233332
{ name: Reraise, id: 105, display: "RERAISE", oparg: { name: depth, typ: u32 }},
234333
{ name: Send, id: 106, display: "SEND", oparg: { name: delta, typ: Label }},
235334
{ name: SetAdd, id: 107, display: "SET_ADD", oparg: { name: i, typ: u32 }},
236-
{ name: SetFunctionAttribute, id: 108, display: "SET_FUNCTION_ATTRIBUTE", oparg: { name: flag, typ: MakeFunctionFlag }},
335+
{
336+
name: SetFunctionAttribute,
337+
id: 108,
338+
display: "SET_FUNCTION_ATTRIBUTE",
339+
oparg: { name: flag, typ: MakeFunctionFlag }
340+
},
237341
{ name: SetUpdate, id: 109, display: "SET_UPDATE", oparg: { name: i, typ: u32 }},
238342
{ name: StoreAttr, id: 110, display: "STORE_ATTR", oparg: { name: namei, typ: NameIdx }},
239343
{ name: StoreDeref, id: 111, display: "STORE_DEREF", oparg: { name: i, typ: oparg::VarNum }},
240344
{ name: StoreFast, id: 112, display: "STORE_FAST", oparg: { name: var_num, typ: oparg::VarNum }},
241-
{ name: StoreFastLoadFast, id: 113, display: "STORE_FAST_LOAD_FAST", oparg: { name: var_nums, typ: oparg::VarNums }},
242-
{ name: StoreFastStoreFast, id: 114, display: "STORE_FAST_STORE_FAST", oparg: { name: var_nums, typ: oparg::VarNums }},
345+
{
346+
name: StoreFastLoadFast,
347+
id: 113,
348+
display: "STORE_FAST_LOAD_FAST",
349+
oparg: { name: var_nums, typ: oparg::VarNums }
350+
},
351+
{
352+
name: StoreFastStoreFast,
353+
id: 114,
354+
display: "STORE_FAST_STORE_FAST",
355+
oparg: { name: var_nums, typ: oparg::VarNums }
356+
},
243357
{ name: StoreGlobal, id: 115, display: "STORE_GLOBAL", oparg: { name: namei, typ: NameIdx }},
244358
{ name: StoreName, id: 116, display: "STORE_NAME", oparg: { name: namei, typ: NameIdx }},
245359
{ name: Swap, id: 117, display: "SWAP", oparg: { name: i, typ: u32 }},
246360
{ name: UnpackEx, id: 118, display: "UNPACK_EX", oparg: { name: counts, typ: UnpackExArgs }},
247361
{ name: UnpackSequence, id: 119, display: "UNPACK_SEQUENCE", oparg: { name: count, typ: u32 }},
248362
{ name: YieldValue, id: 120, display: "YIELD_VALUE", oparg: { name: arg, typ: u32 }},
249-
{ name: Resume, id: 128, display: "RESUME", oparg: { name: context, typ: oparg::ResumeContext }},
363+
{
364+
name: Resume,
365+
id: 128,
366+
display: "RESUME",
367+
oparg: { name: context, typ: oparg::ResumeContext }
368+
},
250369
{ name: BinaryOpAddFloat, id: 129, display: "BINARY_OP_ADD_FLOAT"},
251370
{ name: BinaryOpAddInt, id: 130, display: "BINARY_OP_ADD_INT"},
252371
{ name: BinaryOpAddUnicode, id: 131, display: "BINARY_OP_ADD_UNICODE"},
@@ -275,7 +394,11 @@ define_opcodes!(
275394
{ name: CallLen, id: 154, display: "CALL_LEN"},
276395
{ name: CallListAppend, id: 155, display: "CALL_LIST_APPEND"},
277396
{ name: CallMethodDescriptorFast, id: 156, display: "CALL_METHOD_DESCRIPTOR_FAST"},
278-
{ name: CallMethodDescriptorFastWithKeywords, id: 157, display: "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS"},
397+
{
398+
name: CallMethodDescriptorFastWithKeywords,
399+
id: 157,
400+
display: "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS"
401+
},
279402
{ name: CallMethodDescriptorNoargs, id: 158, display: "CALL_METHOD_DESCRIPTOR_NOARGS"},
280403
{ name: CallMethodDescriptorO, id: 159, display: "CALL_METHOD_DESCRIPTOR_O"},
281404
{ name: CallNonPyGeneral, id: 160, display: "CALL_NON_PY_GENERAL"},
@@ -296,15 +419,27 @@ define_opcodes!(
296419
{ name: JumpBackwardJit, id: 175, display: "JUMP_BACKWARD_JIT"},
297420
{ name: JumpBackwardNoJit, id: 176, display: "JUMP_BACKWARD_NO_JIT"},
298421
{ name: LoadAttrClass, id: 177, display: "LOAD_ATTR_CLASS"},
299-
{ name: LoadAttrClassWithMetaclassCheck, id: 178, display: "LOAD_ATTR_CLASS_WITH_METACLASS_CHECK"},
300-
{ name: LoadAttrGetattributeOverridden, id: 179, display: "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN"},
422+
{
423+
name: LoadAttrClassWithMetaclassCheck,
424+
id: 178,
425+
display: "LOAD_ATTR_CLASS_WITH_METACLASS_CHECK"
426+
},
427+
{
428+
name: LoadAttrGetattributeOverridden,
429+
id: 179,
430+
display: "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN"
431+
},
301432
{ name: LoadAttrInstanceValue, id: 180, display: "LOAD_ATTR_INSTANCE_VALUE"},
302433
{ name: LoadAttrMethodLazyDict, id: 181, display: "LOAD_ATTR_METHOD_LAZY_DICT"},
303434
{ name: LoadAttrMethodNoDict, id: 182, display: "LOAD_ATTR_METHOD_NO_DICT"},
304435
{ name: LoadAttrMethodWithValues, id: 183, display: "LOAD_ATTR_METHOD_WITH_VALUES"},
305436
{ name: LoadAttrModule, id: 184, display: "LOAD_ATTR_MODULE"},
306437
{ name: LoadAttrNondescriptorNoDict, id: 185, display: "LOAD_ATTR_NONDESCRIPTOR_NO_DICT"},
307-
{ name: LoadAttrNondescriptorWithValues, id: 186, display: "LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES"},
438+
{
439+
name: LoadAttrNondescriptorWithValues,
440+
id: 186,
441+
display: "LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES"
442+
},
308443
{ name: LoadAttrProperty, id: 187, display: "LOAD_ATTR_PROPERTY"},
309444
{ name: LoadAttrSlot, id: 188, display: "LOAD_ATTR_SLOT"},
310445
{ name: LoadAttrWithHint, id: 189, display: "LOAD_ATTR_WITH_HINT"},
@@ -340,7 +475,11 @@ define_opcodes!(
340475
{ name: InstrumentedPopJumpIfTrue, id: 241, display: "INSTRUMENTED_POP_JUMP_IF_TRUE"},
341476
{ name: InstrumentedPopJumpIfFalse, id: 242, display: "INSTRUMENTED_POP_JUMP_IF_FALSE"},
342477
{ name: InstrumentedPopJumpIfNone, id: 243, display: "INSTRUMENTED_POP_JUMP_IF_NONE"},
343-
{ name: InstrumentedPopJumpIfNotNone, id: 244, display: "INSTRUMENTED_POP_JUMP_IF_NOT_NONE"},
478+
{
479+
name: InstrumentedPopJumpIfNotNone,
480+
id: 244,
481+
display: "INSTRUMENTED_POP_JUMP_IF_NOT_NONE"
482+
},
344483
{ name: InstrumentedResume, id: 245, display: "INSTRUMENTED_RESUME"},
345484
{ name: InstrumentedReturnValue, id: 246, display: "INSTRUMENTED_RETURN_VALUE"},
346485
{ name: InstrumentedYieldValue, id: 247, display: "INSTRUMENTED_YIELD_VALUE"},
@@ -1294,7 +1433,12 @@ define_opcodes!(
12941433
{ name: Jump, id: 257, display: "JUMP", oparg: { name: delta, typ: Label }},
12951434
{ name: JumpIfFalse, id: 258, display: "JUMP_IF_FALSE", oparg: { name: delta, typ: Label }},
12961435
{ name: JumpIfTrue, id: 259, display: "JUMP_IF_TRUE", oparg: { name: delta, typ: Label }},
1297-
{ name: JumpNoInterrupt, id: 260, display: "JUMP_NO_INTERRUPT", oparg: { name: delta, typ: Label }},
1436+
{
1437+
name: JumpNoInterrupt,
1438+
id: 260,
1439+
display: "JUMP_NO_INTERRUPT",
1440+
oparg: { name: delta, typ: Label }
1441+
},
12981442
{ name: LoadClosure, id: 261, display: "LOAD_CLOSURE", oparg: { name: i, typ: NameIdx }},
12991443
{ name: PopBlock, id: 262, display: "POP_BLOCK" },
13001444
{ name: SetupCleanup, id: 263, display: "SETUP_CLEANUP", oparg: { name: delta, typ: Label }},
@@ -1304,7 +1448,7 @@ define_opcodes!(
13041448
name: StoreFastMaybeNull,
13051449
id: 266,
13061450
display: "STORE_FAST_MAYBE_NULL",
1307-
oparg: { name: var_num, typ: NameIdx }
1451+
oparg: { name: var_num, typ: oparg::VarNum }
13081452
},
13091453
]
13101454
);

0 commit comments

Comments
 (0)