Sep 1, 2023 · Sep 1, 2023 · Sep 1, 2023 · Sep 5, 2023 · Sep 5, 2023 · Sep 13, 2023
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
                GOTO_ERROR(error);
            }
            DECREF_INPUTS();
            res =_PyObject_CallNoArgs(enter);
            res =_PyObject_CallNoArgsTstate(tstate,enter);
            Py_DECREF(enter);
            if (res == NULL) {
                Py_DECREF(exit);

        op(_POP_JUMP_IF_FALSE, (flag -- )) {
            if (Py_IsFalse(flag)) {
 next_uop = current_executor->trace + oparg;
 JUMP_TO_OPARG();
            }
        }

        op(_POP_JUMP_IF_TRUE, (flag -- )) {
            if (Py_IsTrue(flag)) {
 next_uop = current_executor->trace + oparg;
 JUMP_TO_OPARG();
            }
        }

        op(_JUMP_TO_TOP, (--)) {
 next_uop = current_executor->trace;
 JUMP_TO_OPARG();
            CHECK_EVAL_BREAKER();
        }


        op(_EXIT_TRACE, (--)) {
            TIER_TWO_ONLY
 goto deoptimize;
 GOTO_TIER_ONE();
        }

        op(_INSERT, (unused[oparg], top -- top, unused[oparg])) {
diff --git a/Python/ceval.c b/Python/ceval.c
    for (;;) {
        opcode = next_uop->opcode;
        oparg = next_uop->oparg;
 #ifdef Py_DEBUG
        operand = next_uop->operand;
 #endif
        DPRINTF(3,
                "%4d: uop %s, oparg %d, operand %" PRIu64 ", stack_level %d\n",
                (int)(next_uop - current_executor->trace),
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
 #define GOTO_TIER_TWO() goto enter_tier_two;

 #define GOTO_TIER_ONE() goto exit_trace;

 #define JUMP_TO_OPARG()                             \
    do {                                            \
        next_uop = current_executor->trace + oparg; \
    } while (0)
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/jit.c b/Python/jit.c
 #include "Python.h"
 #include "pycore_abstract.h"
 #include "pycore_call.h"
 #include "pycore_ceval.h"
 #include "pycore_dict.h"
 #include "pycore_intrinsics.h"
diff --git a/Tools/cases_generator/instructions.py b/Tools/cases_generator/instructions.py
                    f"{func}(&this_instr[{active.offset + 1}].cache);"
                )
            else:
                out.emit(f"{typ}{ceffect.name} = ({typ.strip()})next_uop[-1].operand;")
                out.emit(f"{typ}{ceffect.name} = ({typ.strip()})operand;")

        # Write the body, substituting a goto for ERROR_IF() and other stuff
        assert dedent <= 0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2762,7 +2762,7 @@ dummy_func(
		GOTO_ERROR(error);
		}
		DECREF_INPUTS();
		res =_PyObject_CallNoArgs(enter);
		res =_PyObject_CallNoArgsTstate(tstate,enter);
		Py_DECREF(enter);
		if (res == NULL) {
		Py_DECREF(exit);
Expand DownExpand Up		@@ -3992,18 +3992,18 @@ dummy_func(

		op(_POP_JUMP_IF_FALSE, (flag -- )) {
		if (Py_IsFalse(flag)) {
		next_uop = current_executor->trace + oparg;
		JUMP_TO_OPARG();
		}
		}

		op(_POP_JUMP_IF_TRUE, (flag -- )) {
		if (Py_IsTrue(flag)) {
		next_uop = current_executor->trace + oparg;
		JUMP_TO_OPARG();
		}
		}

		op(_JUMP_TO_TOP, (--)) {
		next_uop = current_executor->trace;
		JUMP_TO_OPARG();
		CHECK_EVAL_BREAKER();
		}

Expand All		@@ -4024,7 +4024,7 @@ dummy_func(

		op(_EXIT_TRACE, (--)) {
		TIER_TWO_ONLY
		goto deoptimize;
		GOTO_TIER_ONE();
		}

		op(_INSERT, (unused[oparg], top -- top, unused[oparg])) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -993,9 +993,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int
		for (;;) {
		opcode = next_uop->opcode;
		oparg = next_uop->oparg;
		#ifdef Py_DEBUG
		operand = next_uop->operand;
		#endif
		DPRINTF(3,
		"%4d: uop %s, oparg %d, operand %" PRIu64 ", stack_level %d\n",
		(int)(next_uop - current_executor->trace),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -397,3 +397,8 @@ stack_pointer = _PyFrame_GetStackPointer(frame);
		#define GOTO_TIER_TWO() goto enter_tier_two;

		#define GOTO_TIER_ONE() goto exit_trace;

		#define JUMP_TO_OPARG() \
		do { \
		next_uop = current_executor->trace + oparg; \
		} while (0)
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,6 @@
		#include "Python.h"
		#include "pycore_abstract.h"
		#include "pycore_call.h"
		#include "pycore_ceval.h"
		#include "pycore_dict.h"
		#include "pycore_intrinsics.h"
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -162,7 +162,7 @@ def write_body(
		f"{func}(&this_instr[{active.offset + 1}].cache);"
		)
		else:
		out.emit(f"{typ}{ceffect.name} = ({typ.strip()})next_uop[-1].operand;")
		out.emit(f"{typ}{ceffect.name} = ({typ.strip()})operand;")

		# Write the body, substituting a goto for ERROR_IF() and other stuff
		assert dedent <= 0
Expand Down