Skip to content

bpo-43760: Streamline dispatch sequence for machines without computed gotos. #25244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 3 commits into from
Apr 8, 2021
Merged

bpo-43760: Streamline dispatch sequence for machines without computed gotos. #25244

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82d2cd0
Streamline dispatch sequence for machines without computed gotos.
markshannon Mar 26, 2021
860ca09
Restore stack_pointer before jumping to error handling, in case trace…
markshannon Apr 7, 2021
99a0871
Clarifications suggested by GvR and R Hettinger.
markshannon Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Clarifications suggested by GvR and R Hettinger.
  • Loading branch information
@markshannon
markshannon committed Apr 8, 2021
commit 99a087164d564631be71a5b297f74f46d909dfae
12 changes: 5 additions & 7 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,13 +1299,11 @@ eval_frame_handle_pending(PyThreadState *tstate)
#endif

#if USE_COMPUTED_GOTOS
#define TARGET(op) \
op: \
TARGET_##op
#define DISPATCH_GOTO goto *opcode_targets[opcode];
#define TARGET(op) op: TARGET_##op
#define DISPATCH_GOTO() goto *opcode_targets[opcode]
#else
#define TARGET(op) op
#define DISPATCH_GOTO goto dispatch_opcode;
#define DISPATCH_GOTO() goto dispatch_opcode
#endif

#define DISPATCH() \
Expand All @@ -1315,7 +1313,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
} \
f->f_lasti = INSTR_OFFSET(); \
NEXTOPARG(); \
DISPATCH_GOTO \
DISPATCH_GOTO(); \
}

#define CHECK_EVAL_BREAKER() \
Expand Down Expand Up @@ -1594,7 +1592,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
#endif
PyObject **stack_pointer; /* Next free slot in value stack */
const _Py_CODEUNIT *next_instr;
uint8_t opcode; /* Current opcode */
int opcode; /* Current opcode */
int oparg; /* Current opcode argument, if any */
PyObject **fastlocals, **freevars;
PyObject *retval = NULL; /* Return value */
Expand Down