GH-96421: Insert shim frame on entry to interpreter (GH-96319)

* Adds EXIT_INTERPRETER instruction to exit PyEval_EvalDefault()

* Simplifies RETURN_VALUE, YIELD_VALUE and RETURN_GENERATOR instructions as they no longer need to check for entry frames.

1 files changed, 64 insertions, 63 deletions

diff --git a/Include/opcode.h b/Include/opcode.h
index 9fbdbe5..c18d9c0 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -11,6 +11,7 @@ extern "C" {
 #define CACHE                                    0
 #define POP_TOP                                  1
 #define PUSH_NULL                                2
+#define INTERPRETER_EXIT                         3
 #define END_FOR                                  4
 #define NOP                                      9
 #define UNARY_POSITIVE                          10
@@ -128,69 +129,69 @@ extern "C" {
 #define JUMP_NO_INTERRUPT                      261
 #define LOAD_METHOD                            262
 #define MAX_PSEUDO_OPCODE                      262
-#define BINARY_OP_ADD_FLOAT                      3
-#define BINARY_OP_ADD_INT                        5
-#define BINARY_OP_ADD_UNICODE                    6
-#define BINARY_OP_GENERIC                        7
-#define BINARY_OP_INPLACE_ADD_UNICODE            8
-#define BINARY_OP_MULTIPLY_FLOAT                13
-#define BINARY_OP_MULTIPLY_INT                  14
-#define BINARY_OP_SUBTRACT_FLOAT                16
-#define BINARY_OP_SUBTRACT_INT                  17
-#define BINARY_SUBSCR_DICT                      18
-#define BINARY_SUBSCR_GETITEM                   19
-#define BINARY_SUBSCR_LIST_INT                  20
-#define BINARY_SUBSCR_TUPLE_INT                 21
-#define CALL_PY_EXACT_ARGS                      22
-#define CALL_PY_WITH_DEFAULTS                   23
-#define CALL_BOUND_METHOD_EXACT_ARGS            24
-#define CALL_BUILTIN_CLASS                      28
-#define CALL_BUILTIN_FAST_WITH_KEYWORDS         29
-#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  34
-#define CALL_NO_KW_BUILTIN_FAST                 38
-#define CALL_NO_KW_BUILTIN_O                    39
-#define CALL_NO_KW_ISINSTANCE                   40
-#define CALL_NO_KW_LEN                          41
-#define CALL_NO_KW_LIST_APPEND                  42
-#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST       43
-#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS     44
-#define CALL_NO_KW_METHOD_DESCRIPTOR_O          45
-#define CALL_NO_KW_STR_1                        46
-#define CALL_NO_KW_TUPLE_1                      47
-#define CALL_NO_KW_TYPE_1                       48
-#define COMPARE_OP_FLOAT_JUMP                   56
-#define COMPARE_OP_GENERIC                      57
-#define COMPARE_OP_INT_JUMP                     58
-#define COMPARE_OP_STR_JUMP                     59
-#define FOR_ITER_LIST                           62
-#define FOR_ITER_RANGE                          64
-#define FOR_ITER_GEN                            65
-#define LOAD_ATTR_CLASS                         66
-#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN       67
-#define LOAD_ATTR_INSTANCE_VALUE                72
-#define LOAD_ATTR_MODULE                        73
-#define LOAD_ATTR_PROPERTY                      76
-#define LOAD_ATTR_SLOT                          77
-#define LOAD_ATTR_WITH_HINT                     78
-#define LOAD_ATTR_METHOD_LAZY_DICT              79
-#define LOAD_ATTR_METHOD_NO_DICT                80
-#define LOAD_ATTR_METHOD_WITH_DICT              81
-#define LOAD_ATTR_METHOD_WITH_VALUES            86
-#define LOAD_CONST__LOAD_FAST                  113
-#define LOAD_FAST__LOAD_CONST                  121
-#define LOAD_FAST__LOAD_FAST                   141
-#define LOAD_GLOBAL_BUILTIN                    143
-#define LOAD_GLOBAL_MODULE                     153
-#define STORE_ATTR_INSTANCE_VALUE              154
-#define STORE_ATTR_SLOT                        158
-#define STORE_ATTR_WITH_HINT                   159
-#define STORE_FAST__LOAD_FAST                  160
-#define STORE_FAST__STORE_FAST                 161
-#define STORE_SUBSCR_DICT                      166
-#define STORE_SUBSCR_LIST_INT                  167
-#define UNPACK_SEQUENCE_LIST                   168
-#define UNPACK_SEQUENCE_TUPLE                  169
-#define UNPACK_SEQUENCE_TWO_TUPLE              170
+#define BINARY_OP_ADD_FLOAT                      5
+#define BINARY_OP_ADD_INT                        6
+#define BINARY_OP_ADD_UNICODE                    7
+#define BINARY_OP_GENERIC                        8
+#define BINARY_OP_INPLACE_ADD_UNICODE           13
+#define BINARY_OP_MULTIPLY_FLOAT                14
+#define BINARY_OP_MULTIPLY_INT                  16
+#define BINARY_OP_SUBTRACT_FLOAT                17
+#define BINARY_OP_SUBTRACT_INT                  18
+#define BINARY_SUBSCR_DICT                      19
+#define BINARY_SUBSCR_GETITEM                   20
+#define BINARY_SUBSCR_LIST_INT                  21
+#define BINARY_SUBSCR_TUPLE_INT                 22
+#define CALL_PY_EXACT_ARGS                      23
+#define CALL_PY_WITH_DEFAULTS                   24
+#define CALL_BOUND_METHOD_EXACT_ARGS            28
+#define CALL_BUILTIN_CLASS                      29
+#define CALL_BUILTIN_FAST_WITH_KEYWORDS         34
+#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  38
+#define CALL_NO_KW_BUILTIN_FAST                 39
+#define CALL_NO_KW_BUILTIN_O                    40
+#define CALL_NO_KW_ISINSTANCE                   41
+#define CALL_NO_KW_LEN                          42
+#define CALL_NO_KW_LIST_APPEND                  43
+#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST       44
+#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS     45
+#define CALL_NO_KW_METHOD_DESCRIPTOR_O          46
+#define CALL_NO_KW_STR_1                        47
+#define CALL_NO_KW_TUPLE_1                      48
+#define CALL_NO_KW_TYPE_1                       56
+#define COMPARE_OP_FLOAT_JUMP                   57
+#define COMPARE_OP_GENERIC                      58
+#define COMPARE_OP_INT_JUMP                     59
+#define COMPARE_OP_STR_JUMP                     62
+#define FOR_ITER_LIST                           64
+#define FOR_ITER_RANGE                          65
+#define FOR_ITER_GEN                            66
+#define LOAD_ATTR_CLASS                         67
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN       72
+#define LOAD_ATTR_INSTANCE_VALUE                73
+#define LOAD_ATTR_MODULE                        76
+#define LOAD_ATTR_PROPERTY                      77
+#define LOAD_ATTR_SLOT                          78
+#define LOAD_ATTR_WITH_HINT                     79
+#define LOAD_ATTR_METHOD_LAZY_DICT              80
+#define LOAD_ATTR_METHOD_NO_DICT                81
+#define LOAD_ATTR_METHOD_WITH_DICT              86
+#define LOAD_ATTR_METHOD_WITH_VALUES           113
+#define LOAD_CONST__LOAD_FAST                  121
+#define LOAD_FAST__LOAD_CONST                  141
+#define LOAD_FAST__LOAD_FAST                   143
+#define LOAD_GLOBAL_BUILTIN                    153
+#define LOAD_GLOBAL_MODULE                     154
+#define STORE_ATTR_INSTANCE_VALUE              158
+#define STORE_ATTR_SLOT                        159
+#define STORE_ATTR_WITH_HINT                   160
+#define STORE_FAST__LOAD_FAST                  161
+#define STORE_FAST__STORE_FAST                 166
+#define STORE_SUBSCR_DICT                      167
+#define STORE_SUBSCR_LIST_INT                  168
+#define UNPACK_SEQUENCE_LIST                   169
+#define UNPACK_SEQUENCE_TUPLE                  170
+#define UNPACK_SEQUENCE_TWO_TUPLE              173
 #define DO_TRACING                             255
 
 #define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\