[GR-51961] Keep our C file structure closer to CPython, part 4

PullRequest: graalpython/3255

Author: msimacek

graalpython/com.oracle.graal.python.cext/CMakeLists.txt

@@ -109,10 +109,11 @@ set(SRC_FILES ${CAPI_SRC}/codecs.c ${CAPI_SRC}/setobject.c ${CAPI_SRC}/compile.c
               ${CAPI_SRC}/getcompiler.c ${CAPI_SRC}/pyhash.c ${CAPI_SRC}/fileutils.c
               ${CAPI_SRC}/modsupport.c ${CAPI_SRC}/context.c ${CAPI_SRC}/abstract.c ${CAPI_SRC}/frameobject.c
               ${CAPI_SRC}/posixmodule.c ${CAPI_SRC}/exceptions.c ${CAPI_SRC}/pyctype.c
-              ${CAPI_SRC}/mystrtoul.c ${CAPI_SRC}/weakrefobject.c
-              ${CAPI_SRC}/modsupport_shared.c ${CAPI_SRC}/fileobject.c ${CAPI_SRC}/pystrcmp.c ${CAPI_SRC}/getversion.c
+              ${CAPI_SRC}/mystrtoul.c ${CAPI_SRC}/weakrefobject.c ${CAPI_SRC}/gcmodule.c
+              ${CAPI_SRC}/fileobject.c ${CAPI_SRC}/pystrcmp.c ${CAPI_SRC}/getversion.c
               ${CAPI_SRC}/genobject.c ${CAPI_SRC}/methodobject.c ${CAPI_SRC}/boolobject.c ${CAPI_SRC}/pylifecycle.c
               ${CAPI_SRC}/errors.c ${CAPI_SRC}/signals.c ${CAPI_SRC}/datetime.c ${CAPI_SRC}/call.c
+              ${CAPI_SRC}/getargs.c
 )
 
 file(GLOB_RECURSE ACTUAL_SRC_FILES
@@ -252,7 +253,7 @@ target_include_directories(${TARGET_LIBPYTHON} PRIVATE
 # target-specific compile and link options
 ######################################################################
 
-target_compile_definitions(${TARGET_LIBPYTHON} PRIVATE Py_BUILD_CORE)
+target_compile_definitions(${TARGET_LIBPYTHON} PRIVATE Py_BUILD_CORE Py_BUILD_CORE_BUILTIN)
 target_compile_options(${TARGET_LIBPYTHON} PRIVATE ${CFLAGS_WARNINGS})
 
 if(WIN32)

graalpython/com.oracle.graal.python.cext/include/internal/pycore_call.h

@@ -13,9 +13,7 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-#if 0 // GraalPy change
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#endif // GraalPy change
 
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
     PyThreadState *tstate,
@@ -110,7 +108,7 @@ _PyObject_CallNoArgsTstate(PyThreadState *tstate, PyObject *func) {
 // Private static inline function variant of public PyObject_CallNoArgs()
 static inline PyObject *
 _PyObject_CallNoArgs(PyObject *func) {
-    PyThreadState *tstate = NULL; // GraalPy change: don't get thread state
+    PyThreadState *tstate = _PyThreadState_GET();
     return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL);
 }
 

graalpython/com.oracle.graal.python.cext/include/internal/pycore_ceval.h

@@ -28,14 +28,17 @@ struct _ceval_runtime_state;
 #  endif
 #endif
 
-// #include "pycore_interp.h"        // PyInterpreterState.eval_frame
-// #include "pycore_pystate.h"       // _PyThreadState_GET()
+#if 0 // GraalPy change
+#include "pycore_interp.h"        // PyInterpreterState.eval_frame
+#endif // GraalPy change
+#include "pycore_pystate.h"       // _PyThreadState_GET()
 
 
+#if 0 // GraalPy change
 extern void _Py_FinishPendingCalls(PyThreadState *tstate);
 extern void _PyEval_InitRuntimeState(struct _ceval_runtime_state *);
-// extern void _PyEval_InitState(struct _ceval_state *, PyThread_type_lock);
-// extern void _PyEval_FiniState(struct _ceval_state *ceval);
+extern void _PyEval_InitState(struct _ceval_state *, PyThread_type_lock);
+extern void _PyEval_FiniState(struct _ceval_state *ceval);
 PyAPI_FUNC(void) _PyEval_SignalReceived(PyInterpreterState *interp);
 PyAPI_FUNC(int) _PyEval_AddPendingCall(
     PyInterpreterState *interp,
@@ -71,7 +74,6 @@ extern PyObject* _PyEval_BuiltinsFromGlobals(
     PyObject *globals);
 
 
-/* GraalVM change
 static inline PyObject*
 _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int throwflag)
 {
@@ -80,7 +82,6 @@ _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int
     }
     return tstate->interp->eval_frame(tstate, frame, throwflag);
 }
-*/
 
 extern PyObject*
 _PyEval_Vector(PyThreadState *tstate,
@@ -95,6 +96,7 @@ extern void _PyEval_FiniGIL(PyInterpreterState *interp);
 extern void _PyEval_ReleaseLock(PyThreadState *tstate);
 
 extern void _PyEval_DeactivateOpCache(void);
+#endif // GraalPy change
 
 
 /* --- _Py_EnterRecursiveCall() ----------------------------------------- */
@@ -122,10 +124,7 @@ static inline int _Py_EnterRecursiveCallTstate(PyThreadState *tstate,
 }
 
 static inline int _Py_EnterRecursiveCall(const char *where) {
-    /* GraalVM change
     PyThreadState *tstate = _PyThreadState_GET();
-    */
-    PyThreadState *tstate = PyThreadState_GET();
     return _Py_EnterRecursiveCallTstate(tstate, where);
 }
 
@@ -134,16 +133,15 @@ static inline void _Py_LeaveRecursiveCallTstate(PyThreadState *tstate)  {
 }
 
 static inline void _Py_LeaveRecursiveCall(void)  {
-    /* GraalVM change
     PyThreadState *tstate = _PyThreadState_GET();
-    */
-    PyThreadState *tstate = PyThreadState_GET();
     _Py_LeaveRecursiveCallTstate(tstate);
 }
 
+#if 0 // GraalPy change
 extern struct _PyInterpreterFrame* _PyEval_GetFrame(void);
 
 extern PyObject* _Py_MakeCoro(PyFunctionObject *func);
+#endif // GraalPy change
 
 #ifdef __cplusplus
 }

graalpython/com.oracle.graal.python.cext/include/internal/pycore_pystate.h

@@ -13,7 +13,8 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-// #include "pycore_runtime.h"   /* PyRuntimeState */
+#if 0 // GraalPy change
+#include "pycore_runtime.h"   /* PyRuntimeState */
 
 
 /* Check if the current thread is the main thread.
@@ -80,6 +81,7 @@ _PyRuntimeState_GetThreadState(_PyRuntimeState *runtime)
 {
     return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current);
 }
+#endif // GraalPy change
 
 /* Get the current Python thread state.
 
@@ -97,6 +99,7 @@ _PyThreadState_GET(void)
     return PyThreadState_Get();
 }
 
+#if 0 // GraalPy change
 PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalError_TstateNULL(const char *func);
 
 static inline void
@@ -172,6 +175,7 @@ PyAPI_FUNC(int) _PyState_AddModule(
 
 
 PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate);
+#endif // GraalPy change
 
 #ifdef __cplusplus
 }