mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 10:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-98831: rewrite PUSH_EXC_INFO and conditional jumps in the instruction definition DSL (#101481)

Browse source
This commit is contained in:
Irit Katriel 2023-02-01 19:38:06 +00:00 • committed by GitHub
parent 7840ff3cdb
commit b91b42d236
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 98 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Python/opcode_metadata.h
View file

@ -4,7 +4,7 @@
#ifndef NDEBUG
static int
_PyOpcode_num_popped(int opcode, int oparg) {
_PyOpcode_num_popped(int opcode, int oparg, bool jump) {
switch(opcode) {
case NOP:
return 0;
@ -233,17 +233,17 @@ _PyOpcode_num_popped(int opcode, int oparg) {
case JUMP_BACKWARD:
return 0;
case POP_JUMP_IF_FALSE:
return -1;
return 1;
case POP_JUMP_IF_TRUE:
return -1;
return 1;
case POP_JUMP_IF_NOT_NONE:
return -1;
return 1;
case POP_JUMP_IF_NONE:
return -1;
return 1;
case JUMP_IF_FALSE_OR_POP:
return -1;
return 1;
case JUMP_IF_TRUE_OR_POP:
return -1;
return 1;
case JUMP_BACKWARD_NO_INTERRUPT:
return 0;
case GET_LEN:
@ -277,7 +277,7 @@ _PyOpcode_num_popped(int opcode, int oparg) {
case WITH_EXCEPT_START:
return 4;
case PUSH_EXC_INFO:
return -1;
return 1;
case LOAD_ATTR_METHOD_WITH_VALUES:
return 1;
case LOAD_ATTR_METHOD_NO_DICT:
@ -350,7 +350,7 @@ _PyOpcode_num_popped(int opcode, int oparg) {
#ifndef NDEBUG
static int
_PyOpcode_num_pushed(int opcode, int oparg) {
_PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
switch(opcode) {
case NOP:
return 0;
@ -579,17 +579,17 @@ _PyOpcode_num_pushed(int opcode, int oparg) {
case JUMP_BACKWARD:
return 0;
case POP_JUMP_IF_FALSE:
return -1;
return 0;
case POP_JUMP_IF_TRUE:
return -1;
return 0;
case POP_JUMP_IF_NOT_NONE:
return -1;
return 0;
case POP_JUMP_IF_NONE:
return -1;
return 0;
case JUMP_IF_FALSE_OR_POP:
return -1;
return (jump ? 1 : 0);
case JUMP_IF_TRUE_OR_POP:
return -1;
return (jump ? 1 : 0);
case JUMP_BACKWARD_NO_INTERRUPT:
return 0;
case GET_LEN:
@ -623,7 +623,7 @@ _PyOpcode_num_pushed(int opcode, int oparg) {
case WITH_EXCEPT_START:
return 5;
case PUSH_EXC_INFO:
return -1;
return 2;
case LOAD_ATTR_METHOD_WITH_VALUES:
return ((oparg & 1) ? 1 : 0) + 1;
case LOAD_ATTR_METHOD_NO_DICT: