summaryrefslogtreecommitdiffstats
path: root/Python/opcode_metadata.h
diff options
context:
space:
mode:
authorMark Shannon <mark@hotpy.org>2023-06-08 11:35:34 (GMT)
committerGitHub <noreply@github.com>2023-06-08 11:35:34 (GMT)
commite830289c52cecd99e5e2291972d648e9b3452a51 (patch)
tree096949cf5c51cb557f8d844940771cd7e2ee3a4e /Python/opcode_metadata.h
parent410c2f13e50ea53074cb1fb8074ac0c4d3564cc8 (diff)
downloadcpython-e830289c52cecd99e5e2291972d648e9b3452a51.zip
cpython-e830289c52cecd99e5e2291972d648e9b3452a51.tar.gz
cpython-e830289c52cecd99e5e2291972d648e9b3452a51.tar.bz2
GH-105229: Remove remaining two-codeunit superinstructions (GH-105326)
* Remove LOAD_CONST__LOAD_FAST and LOAD_FAST__LOAD_CONST superinstructions.
Diffstat (limited to 'Python/opcode_metadata.h')
-rw-r--r--Python/opcode_metadata.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index ce9c2e7..2c4d1aa 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -33,10 +33,6 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case STORE_FAST_STORE_FAST:
return 2;
- case LOAD_FAST__LOAD_CONST:
- return 0+0;
- case LOAD_CONST__LOAD_FAST:
- return 0+0;
case POP_TOP:
return 1;
case PUSH_NULL:
@@ -431,10 +427,6 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 1;
case STORE_FAST_STORE_FAST:
return 0;
- case LOAD_FAST__LOAD_CONST:
- return 1+1;
- case LOAD_CONST__LOAD_FAST:
- return 1+1;
case POP_TOP:
return 0;
case PUSH_NULL:
@@ -799,7 +791,7 @@ _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_IBIB, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC000 };
+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 };
struct opcode_metadata {
bool valid_entry;
enum InstructionFormat instr_format;
@@ -821,8 +813,6 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
[STORE_FAST] = { true, INSTR_FMT_IB },
[STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
[STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB },
- [LOAD_FAST__LOAD_CONST] = { true, INSTR_FMT_IBIB },
- [LOAD_CONST__LOAD_FAST] = { true, INSTR_FMT_IBIB },
[POP_TOP] = { true, INSTR_FMT_IX },
[PUSH_NULL] = { true, INSTR_FMT_IX },
[END_FOR] = { true, INSTR_FMT_IB },