Skip to content

Commit d8c3165

Browse files
committed
Allow multiple input files for interpreter cases generator
1 parent 7f1c721 commit d8c3165

File tree

5 files changed

+263
-226
lines changed

5 files changed

+263
-226
lines changed

Python/generated_cases.c.h

Lines changed: 127 additions & 127 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Python/opcode_metadata.h

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// This file is generated by Tools/cases_generator/generate_cases.py --metadata
2-
// from Python/bytecodes.c
3-
// Do not edit!
1+
/* This file is generated by Tools/cases_generator/generate_cases.py --metadata from
2+
Python/bytecodes.c
3+
Do not edit! */
44

55
#ifndef NEED_OPCODE_TABLES
66
extern int _PyOpcode_num_popped(int opcode, int oparg, bool jump);
@@ -22,22 +22,10 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
2222
return 0;
2323
case STORE_FAST:
2424
return 1;
25-
case LOAD_FAST__LOAD_FAST:
26-
return 0+0;
27-
case LOAD_FAST__LOAD_CONST:
28-
return 0+0;
29-
case STORE_FAST__LOAD_FAST:
30-
return 1+0;
31-
case STORE_FAST__STORE_FAST:
32-
return 1+1;
33-
case LOAD_CONST__LOAD_FAST:
34-
return 0+0;
3525
case POP_TOP:
3626
return 1;
3727
case PUSH_NULL:
3828
return 0;
39-
case END_FOR:
40-
return 1+1;
4129
case UNARY_NEGATIVE:
4230
return 1;
4331
case UNARY_NOT:
@@ -348,6 +336,18 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
348336
return 0;
349337
case CACHE:
350338
return 0;
339+
case LOAD_FAST__LOAD_FAST:
340+
return 0+0;
341+
case LOAD_FAST__LOAD_CONST:
342+
return 0+0;
343+
case STORE_FAST__LOAD_FAST:
344+
return 1+0;
345+
case STORE_FAST__STORE_FAST:
346+
return 1+1;
347+
case LOAD_CONST__LOAD_FAST:
348+
return 0+0;
349+
case END_FOR:
350+
return 1+1;
351351
default:
352352
return -1;
353353
}
@@ -374,22 +374,10 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
374374
return 1;
375375
case STORE_FAST:
376376
return 0;
377-
case LOAD_FAST__LOAD_FAST:
378-
return 1+1;
379-
case LOAD_FAST__LOAD_CONST:
380-
return 1+1;
381-
case STORE_FAST__LOAD_FAST:
382-
return 0+1;
383-
case STORE_FAST__STORE_FAST:
384-
return 0+0;
385-
case LOAD_CONST__LOAD_FAST:
386-
return 1+1;
387377
case POP_TOP:
388378
return 0;
389379
case PUSH_NULL:
390380
return 1;
391-
case END_FOR:
392-
return 0+0;
393381
case UNARY_NEGATIVE:
394382
return 1;
395383
case UNARY_NOT:
@@ -700,6 +688,18 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
700688
return 0;
701689
case CACHE:
702690
return 0;
691+
case LOAD_FAST__LOAD_FAST:
692+
return 1+1;
693+
case LOAD_FAST__LOAD_CONST:
694+
return 1+1;
695+
case STORE_FAST__LOAD_FAST:
696+
return 0+1;
697+
case STORE_FAST__STORE_FAST:
698+
return 0+0;
699+
case LOAD_CONST__LOAD_FAST:
700+
return 1+1;
701+
case END_FOR:
702+
return 0+0;
703703
default:
704704
return -1;
705705
}
@@ -727,14 +727,8 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
727727
[LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
728728
[LOAD_CONST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
729729
[STORE_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
730-
[LOAD_FAST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
731-
[LOAD_FAST__LOAD_CONST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
732-
[STORE_FAST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
733-
[STORE_FAST__STORE_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
734-
[LOAD_CONST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
735730
[POP_TOP] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
736731
[PUSH_NULL] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
737-
[END_FOR] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
738732
[UNARY_NEGATIVE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
739733
[UNARY_NOT] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
740734
[UNARY_INVERT] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
@@ -890,5 +884,11 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
890884
[SWAP] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
891885
[EXTENDED_ARG] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
892886
[CACHE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
887+
[LOAD_FAST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
888+
[LOAD_FAST__LOAD_CONST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
889+
[STORE_FAST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
890+
[STORE_FAST__STORE_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
891+
[LOAD_CONST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
892+
[END_FOR] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
893893
};
894894
#endif

0 commit comments

Comments
 (0)