Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 64a54e5

Browse files
vstinnervstinner
authored
gh-91719: Add pycore_opcode.h internal header file (#91906)
Move the following API from Include/opcode.h (public C API) to a new Include/internal/pycore_opcode.h header file (internal C API): * EXTRA_CASES * _PyOpcode_Caches * _PyOpcode_Deopt * _PyOpcode_Jump * _PyOpcode_OpName * _PyOpcode_RelativeJump
1 parent 20cc695 commit 64a54e5

11 files changed

Lines changed: 661 additions & 605 deletions

File tree

‎Include/internal/pycore_opcode.h‎

Lines changed: 581 additions & 0 deletions
Large diffs are not rendered by default.

‎Include/opcode.h‎

Lines changed: 2 additions & 564 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Makefile.pre.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,8 +1311,10 @@ regen-opcode:
13111311
# using Tools/scripts/generate_opcode_h.py
13121312
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_opcode_h.py \
13131313
$(srcdir)/Lib/opcode.py \
1314-
$(srcdir)/Include/opcode.h.new
1314+
$(srcdir)/Include/opcode.h.new \
1315+
$(srcdir)/Include/internal/pycore_opcode.h.new
13151316
$(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new
1317+
$(UPDATE_FILE) $(srcdir)/Include/internal/pycore_opcode.h $(srcdir)/Include/internal/pycore_opcode.h.new
13161318

13171319
.PHONY: regen-token
13181320
regen-token:

‎Objects/codeobject.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "structmember.h" // PyMemberDef
66
#include "pycore_code.h" // _PyCodeConstructor
77
#include "pycore_interp.h" // PyInterpreterState.co_extra_freefuncs
8+
#include "pycore_opcode.h" // _PyOpcode_Deopt
89
#include "pycore_pystate.h" // _PyInterpreterState_GET()
910
#include "pycore_tuple.h" // _PyTuple_ITEMS()
1011
#include "clinic/codeobject.c.h"

‎Objects/frameobject.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
#include "Python.h"
44
#include "pycore_ceval.h" // _PyEval_BuiltinsFromGlobals()
5-
#include "pycore_moduleobject.h" // _PyModule_GetDict()
6-
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
75
#include "pycore_code.h" // CO_FAST_LOCAL, etc.
86
#include "pycore_function.h" // _PyFunction_FromConstructor()
7+
#include "pycore_moduleobject.h" // _PyModule_GetDict()
8+
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
9+
#include "pycore_opcode.h" // _PyOpcode_Caches
910

1011
#include "frameobject.h" // PyFrameObject
1112
#include "pycore_frame.h"

‎Objects/genobject.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include "Python.h"
44
#include "pycore_call.h" // _PyObject_CallNoArgs()
55
#include "pycore_ceval.h" // _PyEval_EvalFrame()
6+
#include "pycore_frame.h" // _PyInterpreterFrame
67
#include "pycore_genobject.h" // struct _Py_async_gen_state
78
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
9+
#include "pycore_opcode.h" // _PyOpcode_Deopt
810
#include "pycore_pyerrors.h" // _PyErr_ClearExcState()
911
#include "pycore_pystate.h" // _PyThreadState_GET()
10-
#include "pycore_frame.h" // _PyInterpreterFrame
11-
#include "frameobject.h" // PyFrameObject
1212
#include "structmember.h" // PyMemberDef
1313
#include "opcode.h" // SEND
1414

‎PCbuild/regen.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Argument>-C</Argument>
1515
</_ASTOutputs>
1616
<_OpcodeSources Include="$(PySourcePath)Tools\scripts\generate_opcode_h.py;$(PySourcePath)Lib\opcode.py" />
17-
<_OpcodeOutputs Include="$(PySourcePath)Include\opcode.h;$(PySourcePath)Python\opcode_targets.h" />
17+
<_OpcodeOutputs Include="$(PySourcePath)Include\opcode.h;$(PySourcePath)Include\internal\pycore_opcode.h;$(PySourcePath)Python\opcode_targets.h" />
1818
<_TokenSources Include="$(PySourcePath)Grammar\Tokens" />
1919
<_TokenOutputs Include="$(PySourcePath)Doc\library\token-list.inc">
2020
<Format>rst</Format>
@@ -59,7 +59,7 @@
5959
Inputs="@(_OpcodeSources)" Outputs="@(_OpcodeOutputs)"
6060
DependsOnTargets="FindPythonForBuild">
6161
<Message Text="Regenerate @(_OpcodeOutputs->'%(Filename)%(Extension)',' ')" Importance="high" />
62-
<Exec Command="$(PythonForBuild) Tools\scripts\generate_opcode_h.py Lib\opcode.py Include\opcode.h"
62+
<Exec Command="$(PythonForBuild) Tools\scripts\generate_opcode_h.py Lib\opcode.py Include\opcode.h Include\internal\pycore_opcode.h"
6363
WorkingDirectory="$(PySourcePath)" />
6464
<Exec Command="$(PythonForBuild) Python\makeopcodetargets.py Python\opcode_targets.h"
6565
WorkingDirectory="$(PySourcePath)" />

‎Python/ceval.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "pycore_long.h" // _PyLong_GetZero()
1616
#include "pycore_object.h" // _PyObject_GC_TRACK()
1717
#include "pycore_moduleobject.h" // PyModuleObject
18+
#include "pycore_opcode.h" // EXTRA_CASES
1819
#include "pycore_pyerrors.h" // _PyErr_Fetch()
1920
#include "pycore_pylifecycle.h" // _PyErr_Print()
2021
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()

‎Python/compile.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@
2323

2424
#include <stdbool.h>
2525

26+
// Need _PyOpcode_RelativeJump of pycore_opcode.h
27+
#define NEED_OPCODE_TABLES
28+
2629
#include "Python.h"
2730
#include "pycore_ast.h" // _PyAST_GetDocString()
28-
#include "pycore_compile.h" // _PyFuture_FromAST()
2931
#include "pycore_code.h" // _PyCode_New()
30-
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
32+
#include "pycore_compile.h" // _PyFuture_FromAST()
3133
#include "pycore_long.h" // _PyLong_GetZero()
34+
#include "pycore_opcode.h" // _PyOpcode_Caches
35+
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
3236
#include "pycore_symtable.h" // PySTEntryObject
3337

34-
#define NEED_OPCODE_TABLES
35-
#include "opcode.h" // EXTENDED_ARG
36-
3738

3839
#define DEFAULT_BLOCK_SIZE 16
3940
#define DEFAULT_CODE_SIZE 128

‎Python/specialize.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "pycore_long.h"
77
#include "pycore_moduleobject.h"
88
#include "pycore_object.h"
9-
#include "opcode.h"
9+
#include "pycore_opcode.h" // _PyOpcode_Caches
1010
#include "structmember.h" // struct PyMemberDef, T_OFFSET_EX
1111

1212
#include <stdlib.h> // rand()

0 commit comments

Comments
 (0)