|
71 | 71 | #endif |
72 | 72 |
|
73 | 73 | #ifdef Py_STATS |
74 | | -# define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, const void *INSTRUCTION_TABLE, int oparg, int lastopcode |
75 | | -# define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, INSTRUCTION_TABLE, oparg, lastopcode |
| 74 | +# define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, const void *instruction_funcptr_table, int oparg, int lastopcode |
| 75 | +# define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, instruction_funcptr_table, oparg, lastopcode |
76 | 76 | #else |
77 | | -# define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, const void *INSTRUCTION_TABLE, int oparg |
78 | | -# define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, INSTRUCTION_TABLE, oparg |
| 77 | +# define TAIL_CALL_PARAMS _PyInterpreterFrame *frame, _PyStackRef *stack_pointer, PyThreadState *tstate, _Py_CODEUNIT *next_instr, const void *instruction_funcptr_table, int oparg |
| 78 | +# define TAIL_CALL_ARGS frame, stack_pointer, tstate, next_instr, instruction_funcptr_table, oparg |
79 | 79 | #endif |
80 | 80 |
|
81 | 81 | #if Py_TAIL_CALL_INTERP |
|
87 | 87 | # define TARGET(op) Py_PRESERVE_NONE_CC PyObject *_TAIL_CALL_##op(TAIL_CALL_PARAMS) |
88 | 88 | # define DISPATCH_GOTO() \ |
89 | 89 | do { \ |
90 | | - Py_MUSTTAIL return (((py_tail_call_funcptr *)INSTRUCTION_TABLE)[opcode])(TAIL_CALL_ARGS); \ |
| 90 | + Py_MUSTTAIL return (((py_tail_call_funcptr *)instruction_funcptr_table)[opcode])(TAIL_CALL_ARGS); \ |
91 | 91 | } while (0) |
92 | 92 | # define JUMP_TO_LABEL(name) \ |
93 | 93 | do { \ |
|
96 | 96 | # ifdef Py_STATS |
97 | 97 | # define JUMP_TO_PREDICTED(name) \ |
98 | 98 | do { \ |
99 | | - Py_MUSTTAIL return (_TAIL_CALL_##name)(frame, stack_pointer, tstate, this_instr, INSTRUCTION_TABLE, oparg, lastopcode); \ |
| 99 | + Py_MUSTTAIL return (_TAIL_CALL_##name)(frame, stack_pointer, tstate, this_instr, instruction_funcptr_table, oparg, lastopcode); \ |
100 | 100 | } while (0) |
101 | 101 | # else |
102 | 102 | # define JUMP_TO_PREDICTED(name) \ |
103 | 103 | do { \ |
104 | | - Py_MUSTTAIL return (_TAIL_CALL_##name)(frame, stack_pointer, tstate, this_instr, INSTRUCTION_TABLE, oparg); \ |
| 104 | + Py_MUSTTAIL return (_TAIL_CALL_##name)(frame, stack_pointer, tstate, this_instr, instruction_funcptr_table, oparg); \ |
105 | 105 | } while (0) |
106 | 106 | # endif |
107 | 107 | # define LABEL(name) TARGET(name) |
|
0 commit comments