|
2 | 2 | #include "opcode.h"
|
3 | 3 | #include "pycore_interp.h"
|
4 | 4 | #include "pycore_bitutils.h" // _Py_popcount32()
|
5 |
| -#include "pycore_opcode_metadata.h" // _PyOpcode_OpName() |
| 5 | +#include "pycore_opcode_metadata.h" // _PyOpcode_OpName[] |
6 | 6 | #include "pycore_opcode_utils.h" // MAX_REAL_OPCODE
|
7 | 7 | #include "pycore_optimizer.h" // _Py_uop_analyze_and_optimize()
|
8 | 8 | #include "pycore_pystate.h" // _PyInterpreterState_GET()
|
@@ -563,7 +563,7 @@ translate_bytecode_to_trace(
|
563 | 563 | uint32_t uopcode = BRANCH_TO_GUARD[opcode - POP_JUMP_IF_FALSE][jump_likely];
|
564 | 564 | _Py_CODEUNIT *next_instr = instr + 1 + _PyOpcode_Caches[_PyOpcode_Deopt[opcode]];
|
565 | 565 | DPRINTF(2, "%s(%d): counter=%x, bitcount=%d, likely=%d, confidence=%d, uopcode=%s\n",
|
566 |
| - _PyUOpName(opcode), oparg, |
| 566 | + _PyOpcode_OpName[opcode], oparg, |
567 | 567 | counter, bitcount, jump_likely, confidence, _PyUOpName(uopcode));
|
568 | 568 | ADD_TO_TRACE(uopcode, max_length, 0, target);
|
569 | 569 | if (jump_likely) {
|
@@ -722,7 +722,7 @@ translate_bytecode_to_trace(
|
722 | 722 | }
|
723 | 723 | break;
|
724 | 724 | }
|
725 |
| - DPRINTF(2, "Unsupported opcode %s\n", _PyUOpName(opcode)); |
| 725 | + DPRINTF(2, "Unsupported opcode %s\n", _PyOpcode_OpName[opcode]); |
726 | 726 | OPT_UNSUPPORTED_OPCODE(opcode);
|
727 | 727 | goto done; // Break out of loop
|
728 | 728 | } // End default
|
|
0 commit comments