diff options
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/cpython/code.h | 2 | ||||
| -rw-r--r-- | Include/cpython/frameobject.h | 10 | ||||
| -rw-r--r-- | Include/cpython/pystate.h | 9 | ||||
| -rw-r--r-- | Include/genobject.h | 2 | ||||
| -rw-r--r-- | Include/internal/pycore_frame.h | 38 | ||||
| -rw-r--r-- | Include/internal/pycore_pymem.h | 5 | ||||
| -rw-r--r-- | Include/internal/pycore_pystate.h | 3 |
7 files changed, 61 insertions, 8 deletions
diff --git a/Include/cpython/code.h b/Include/cpython/code.h index 330f1f54d15..575a4b72b2e 100644 --- a/Include/cpython/code.h +++ b/Include/cpython/code.h @@ -40,8 +40,8 @@ struct PyCodeObject { PyObject *co_name; /* unicode (name, for reference) */ PyObject *co_linetable; /* string (encoding addr<->lineno mapping) See Objects/lnotab_notes.txt for details. */ + int co_nlocalsplus; /* Number of locals + free + cell variables */ PyObject *co_exceptiontable; /* Byte string encoding exception handling table */ - void *co_zombieframe; /* for optimization only (see frameobject.c) */ PyObject *co_weakreflist; /* to support weakrefs to code objects */ /* Scratch space for extra data relating to the code object. Type is a void* to keep the format private in codeobject.c to force diff --git a/Include/cpython/frameobject.h b/Include/cpython/frameobject.h index 581664775cd..fc20bc2ff89 100644 --- a/Include/cpython/frameobject.h +++ b/Include/cpython/frameobject.h @@ -20,12 +20,9 @@ enum _framestate { typedef signed char PyFrameState; struct _frame { - PyObject_VAR_HEAD + PyObject_HEAD struct _frame *f_back; /* previous frame, or NULL */ PyCodeObject *f_code; /* code segment */ - PyObject *f_builtins; /* builtin symbol table (PyDictObject) */ - PyObject *f_globals; /* global symbol table (PyDictObject) */ - PyObject *f_locals; /* local symbol table (any mapping) */ PyObject **f_valuestack; /* points after the last local */ PyObject *f_trace; /* Trace function */ /* Borrowed reference to a generator, or NULL */ @@ -36,7 +33,8 @@ struct _frame { PyFrameState f_state; /* What state the frame is in */ char f_trace_lines; /* Emit per-line trace events? */ char f_trace_opcodes; /* Emit per-opcode trace events? */ - PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */ + char f_own_locals_memory; /* This frame owns the memory for the locals */ + PyObject **f_localsptr; /* Pointer to locals, cells, free */ }; static inline int _PyFrame_IsRunnable(struct _frame *f) { @@ -62,7 +60,7 @@ PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *, /* only internal use */ PyFrameObject* -_PyFrame_New_NoTrack(PyThreadState *, PyFrameConstructor *, PyObject *); +_PyFrame_New_NoTrack(PyThreadState *, PyFrameConstructor *, PyObject *, PyObject **); /* The rest of the interface is specific for frame objects */ diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h index e3ccc543560..63ba60074d5 100644 --- a/Include/cpython/pystate.h +++ b/Include/cpython/pystate.h @@ -57,6 +57,12 @@ typedef struct _err_stackitem { } _PyErr_StackItem; +typedef struct _stack_chunk { + struct _stack_chunk *previous; + size_t size; + size_t top; + PyObject * data[1]; /* Variable sized */ +} _PyStackChunk; // The PyThreadState typedef is in Include/pystate.h. struct _ts { @@ -149,6 +155,9 @@ struct _ts { CFrame root_cframe; + _PyStackChunk *datastack_chunk; + PyObject **datastack_top; + PyObject **datastack_limit; /* XXX signal handlers should also be here */ }; diff --git a/Include/genobject.h b/Include/genobject.h index e965334a014..094d4e14fbe 100644 --- a/Include/genobject.h +++ b/Include/genobject.h @@ -18,7 +18,7 @@ extern "C" { /* Note: gi_frame can be NULL if the generator is "finished" */ \ PyFrameObject *prefix##_frame; \ /* The code object backing the generator */ \ - PyObject *prefix##_code; \ + PyCodeObject *prefix##_code; \ /* List of weak reference. */ \ PyObject *prefix##_weakreflist; \ /* Name of the generator. */ \ diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h new file mode 100644 index 00000000000..44f58fb6948 --- /dev/null +++ b/Include/internal/pycore_frame.h @@ -0,0 +1,38 @@ +#ifndef Py_INTERNAL_FRAME_H +#define Py_INTERNAL_FRAME_H +#ifdef __cplusplus +extern "C" { +#endif + +enum { + FRAME_SPECIALS_GLOBALS_OFFSET = 0, + FRAME_SPECIALS_BUILTINS_OFFSET = 1, + FRAME_SPECIALS_LOCALS_OFFSET = 2, + FRAME_SPECIALS_SIZE = 3 +}; + +static inline PyObject ** +_PyFrame_Specials(PyFrameObject *f) { + return &f->f_valuestack[-FRAME_SPECIALS_SIZE]; +} + +/* Returns a *borrowed* reference. */ +static inline PyObject * +_PyFrame_GetGlobals(PyFrameObject *f) +{ + return _PyFrame_Specials(f)[FRAME_SPECIALS_GLOBALS_OFFSET]; +} + +/* Returns a *borrowed* reference. */ +static inline PyObject * +_PyFrame_GetBuiltins(PyFrameObject *f) +{ + return _PyFrame_Specials(f)[FRAME_SPECIALS_BUILTINS_OFFSET]; +} + +int _PyFrame_TakeLocals(PyFrameObject *f); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_FRAME_H */ diff --git a/Include/internal/pycore_pymem.h b/Include/internal/pycore_pymem.h index e4e35c16ce8..d59ab490493 100644 --- a/Include/internal/pycore_pymem.h +++ b/Include/internal/pycore_pymem.h @@ -94,6 +94,11 @@ struct _PyTraceMalloc_Config { PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config; +/* Allocate memory directly from the O/S virtual memory system, + * where supported. Otherwise fallback on malloc */ +void *_PyObject_VirtualAlloc(size_t size); +void _PyObject_VirtualFree(void *, size_t size); + #ifdef __cplusplus } diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h index 4b894f3eff4..6601ce2f80b 100644 --- a/Include/internal/pycore_pystate.h +++ b/Include/internal/pycore_pystate.h @@ -147,6 +147,9 @@ PyAPI_FUNC(int) _PyState_AddModule( PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate); +PyObject **_PyThreadState_PushLocals(PyThreadState *, int size); +void _PyThreadState_PopLocals(PyThreadState *, PyObject **); + #ifdef __cplusplus } #endif |