@@ -803,8 +803,8 @@ dummy_func(
803
803
}
804
804
805
805
macro (RETURN_VALUE ) =
806
- SAVE_IP + // Tier 2 only; special-cased oparg
807
- SAVE_CURRENT_IP + // Sets frame->prev_instr
806
+ _SET_IP + // Tier 2 only; special-cased oparg
807
+ _SAVE_CURRENT_IP + // Sets frame->prev_instr
808
808
_POP_FRAME ;
809
809
810
810
inst (INSTRUMENTED_RETURN_VALUE , (retval -- )) {
@@ -828,8 +828,8 @@ dummy_func(
828
828
829
829
macro (RETURN_CONST ) =
830
830
LOAD_CONST +
831
- SAVE_IP + // Tier 2 only; special-cased oparg
832
- SAVE_CURRENT_IP + // Sets frame->prev_instr
831
+ _SET_IP + // Tier 2 only; special-cased oparg
832
+ _SAVE_CURRENT_IP + // Sets frame->prev_instr
833
833
_POP_FRAME ;
834
834
835
835
inst (INSTRUMENTED_RETURN_CONST , (-- )) {
@@ -2310,7 +2310,7 @@ dummy_func(
2310
2310
JUMPBY (oparg * flag );
2311
2311
}
2312
2312
2313
- op (IS_NONE , (value -- b )) {
2313
+ op (_IS_NONE , (value -- b )) {
2314
2314
if (Py_IsNone (value )) {
2315
2315
b = Py_True ;
2316
2316
}
@@ -2320,9 +2320,9 @@ dummy_func(
2320
2320
}
2321
2321
}
2322
2322
2323
- macro (POP_JUMP_IF_NONE ) = IS_NONE + POP_JUMP_IF_TRUE ;
2323
+ macro (POP_JUMP_IF_NONE ) = _IS_NONE + POP_JUMP_IF_TRUE ;
2324
2324
2325
- macro (POP_JUMP_IF_NOT_NONE ) = IS_NONE + POP_JUMP_IF_FALSE ;
2325
+ macro (POP_JUMP_IF_NOT_NONE ) = _IS_NONE + POP_JUMP_IF_FALSE ;
2326
2326
2327
2327
inst (JUMP_BACKWARD_NO_INTERRUPT , (-- )) {
2328
2328
/* This bytecode is used in the `yield from` or `await` loop.
@@ -3069,8 +3069,8 @@ dummy_func(
3069
3069
_CHECK_FUNCTION_EXACT_ARGS +
3070
3070
_CHECK_STACK_SPACE +
3071
3071
_INIT_CALL_PY_EXACT_ARGS +
3072
- SAVE_IP + // Tier 2 only; special-cased oparg
3073
- SAVE_CURRENT_IP + // Sets frame->prev_instr
3072
+ _SET_IP + // Tier 2 only; special-cased oparg
3073
+ _SAVE_CURRENT_IP + // Sets frame->prev_instr
3074
3074
_PUSH_FRAME ;
3075
3075
3076
3076
macro (CALL_PY_EXACT_ARGS ) =
@@ -3079,8 +3079,8 @@ dummy_func(
3079
3079
_CHECK_FUNCTION_EXACT_ARGS +
3080
3080
_CHECK_STACK_SPACE +
3081
3081
_INIT_CALL_PY_EXACT_ARGS +
3082
- SAVE_IP + // Tier 2 only; special-cased oparg
3083
- SAVE_CURRENT_IP + // Sets frame->prev_instr
3082
+ _SET_IP + // Tier 2 only; special-cased oparg
3083
+ _SAVE_CURRENT_IP + // Sets frame->prev_instr
3084
3084
_PUSH_FRAME ;
3085
3085
3086
3086
inst (CALL_PY_WITH_DEFAULTS , (unused /1 , func_version /2 , callable , self_or_null , args [oparg ] -- unused )) {
@@ -3851,33 +3851,33 @@ dummy_func(
3851
3851
}
3852
3852
}
3853
3853
3854
- op (JUMP_TO_TOP , (-- )) {
3854
+ op (_JUMP_TO_TOP , (-- )) {
3855
3855
pc = 0 ;
3856
3856
CHECK_EVAL_BREAKER ();
3857
3857
}
3858
3858
3859
- op (SAVE_IP , (-- )) {
3859
+ op (_SET_IP , (-- )) {
3860
3860
frame -> prev_instr = ip_offset + oparg ;
3861
3861
}
3862
3862
3863
- op (SAVE_CURRENT_IP , (-- )) {
3863
+ op (_SAVE_CURRENT_IP , (-- )) {
3864
3864
#if TIER_ONE
3865
3865
frame -> prev_instr = next_instr - 1 ;
3866
3866
#endif
3867
3867
#if TIER_TWO
3868
- // Relies on a preceding SAVE_IP
3868
+ // Relies on a preceding _SET_IP
3869
3869
frame -> prev_instr -- ;
3870
3870
#endif
3871
3871
}
3872
3872
3873
- op (EXIT_TRACE , (-- )) {
3873
+ op (_EXIT_TRACE , (-- )) {
3874
3874
frame -> prev_instr -- ; // Back up to just before destination
3875
3875
_PyFrame_SetStackPointer (frame , stack_pointer );
3876
3876
Py_DECREF (self );
3877
3877
return frame ;
3878
3878
}
3879
3879
3880
- op (INSERT , (unused [oparg ], top -- top , unused [oparg ])) {
3880
+ op (_INSERT , (unused [oparg ], top -- top , unused [oparg ])) {
3881
3881
// Inserts TOS at position specified by oparg;
3882
3882
memmove (& stack_pointer [-1 - oparg ], & stack_pointer [- oparg ], oparg * sizeof (stack_pointer [0 ]));
3883
3883
}
0 commit comments