@@ -678,7 +678,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
678
678
#ifdef Py_STATS
679
679
int lastopcode = 0 ;
680
680
#endif
681
- uint16_t opcode ; /* Current opcode */
681
+ uint8_t opcode ; /* Current opcode */
682
682
int oparg ; /* Current opcode argument, if any */
683
683
#ifdef LLTRACE
684
684
int lltrace = 0 ;
@@ -983,30 +983,31 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
983
983
984
984
OPT_STAT_INC (traces_executed );
985
985
_PyUOpInstruction * next_uop = current_executor -> trace ;
986
+ uint16_t uopcode ;
986
987
uint64_t operand ;
987
988
#ifdef Py_STATS
988
989
uint64_t trace_uop_execution_counter = 0 ;
989
990
#endif
990
991
991
992
for (;;) {
992
- opcode = next_uop -> opcode ;
993
+ uopcode = next_uop -> opcode ;
993
994
oparg = next_uop -> oparg ;
994
995
operand = next_uop -> operand ;
995
996
DPRINTF (3 ,
996
997
"%4d: uop %s, oparg %d, operand %" PRIu64 ", stack_level %d\n" ,
997
998
(int )(next_uop - current_executor -> trace ),
998
- opcode < 256 ? _PyOpcode_OpName [opcode ] : _PyOpcode_uop_name [opcode ],
999
+ uopcode < 256 ? _PyOpcode_OpName [uopcode ] : _PyOpcode_uop_name [uopcode ],
999
1000
oparg ,
1000
1001
operand ,
1001
1002
(int )(stack_pointer - _PyFrame_Stackbase (frame )));
1002
1003
next_uop ++ ;
1003
1004
OPT_STAT_INC (uops_executed );
1004
- UOP_STAT_INC (opcode , execution_count );
1005
+ UOP_STAT_INC (uopcode , execution_count );
1005
1006
#ifdef Py_STATS
1006
1007
trace_uop_execution_counter ++ ;
1007
1008
#endif
1008
1009
1009
- switch (opcode ) {
1010
+ switch (uopcode ) {
1010
1011
1011
1012
#include "executor_cases.c.h"
1012
1013
@@ -1042,7 +1043,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
1042
1043
pop_1_error_tier_two :
1043
1044
STACK_SHRINK (1 );
1044
1045
error_tier_two :
1045
- DPRINTF (2 , "Error: [Opcode %d, operand %" PRIu64 "]\n" , opcode , operand );
1046
+ DPRINTF (2 , "Error: [Opcode %d, operand %" PRIu64 "]\n" , uopcode , operand );
1046
1047
OPT_HIST (trace_uop_execution_counter , trace_run_length_hist );
1047
1048
frame -> return_offset = 0 ; // Don't leave this random
1048
1049
_PyFrame_SetStackPointer (frame , stack_pointer );
@@ -1053,9 +1054,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
1053
1054
deoptimize :
1054
1055
// On DEOPT_IF we just repeat the last instruction.
1055
1056
// This presumes nothing was popped from the stack (nor pushed).
1056
- DPRINTF (2 , "DEOPT: [Opcode %d, operand %" PRIu64 " @ %d]\n" , opcode , operand , (int )(next_uop - current_executor -> trace - 1 ));
1057
+ DPRINTF (2 , "DEOPT: [Opcode %d, operand %" PRIu64 " @ %d]\n" , uopcode , operand , (int )(next_uop - current_executor -> trace - 1 ));
1057
1058
OPT_HIST (trace_uop_execution_counter , trace_run_length_hist );
1058
- UOP_STAT_INC (opcode , miss );
1059
+ UOP_STAT_INC (uopcode , miss );
1059
1060
frame -> return_offset = 0 ; // Dispatch to frame->instr_ptr
1060
1061
_PyFrame_SetStackPointer (frame , stack_pointer );
1061
1062
frame -> instr_ptr = next_uop [-1 ].target + _PyCode_CODE ((PyCodeObject * )frame -> f_executable );
0 commit comments