Update HPy inlined files: 1d5d4c5

Author: fangerer

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyfunc_declare.h

@@ -40,6 +40,8 @@
 #define _HPyFunc_DECLARE_HPyFunc_GETTER(SYM) static HPy SYM(HPyContext ctx, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_SETTER(SYM) static int SYM(HPyContext ctx, HPy, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_OBJOBJPROC(SYM) static int SYM(HPyContext ctx, HPy, HPy)
+#define _HPyFunc_DECLARE_HPyFunc_GETBUFFERPROC(SYM) static int SYM(HPyContext, HPy, HPy_buffer *, int)
+#define _HPyFunc_DECLARE_HPyFunc_RELEASEBUFFERPROC(SYM) static void SYM(HPyContext, HPy, HPy_buffer *)
 #define _HPyFunc_DECLARE_HPyFunc_DESTROYFUNC(SYM) static void SYM(void *)
 
 typedef HPy (*HPyFunc_noargs)(HPyContext ctx, HPy self);
@@ -72,4 +74,6 @@ typedef int (*HPyFunc_initproc)(HPyContext ctx, HPy self, HPy *args, HPy_ssize_t
 typedef HPy (*HPyFunc_getter)(HPyContext ctx, HPy, void *);
 typedef int (*HPyFunc_setter)(HPyContext ctx, HPy, HPy, void *);
 typedef int (*HPyFunc_objobjproc)(HPyContext ctx, HPy, HPy);
+typedef int (*HPyFunc_getbufferproc)(HPyContext, HPy, HPy_buffer *, int);
+typedef void (*HPyFunc_releasebufferproc)(HPyContext, HPy, HPy_buffer *);
 typedef void (*HPyFunc_destroyfunc)(void *);

graalpython/com.oracle.graal.python.cext/include/common/autogen_hpyslot.h

@@ -11,6 +11,8 @@
 */
 
 typedef enum {
+    HPy_bf_getbuffer = 1,
+    HPy_bf_releasebuffer = 2,
     HPy_nb_absolute = 6,
     HPy_nb_add = 7,
     HPy_nb_and = 8,
@@ -61,6 +63,8 @@ typedef enum {
     HPy_tp_destroy = 1000,
 } HPySlot_Slot;
 
+#define _HPySlot_SIG__HPy_bf_getbuffer HPyFunc_GETBUFFERPROC
+#define _HPySlot_SIG__HPy_bf_releasebuffer HPyFunc_RELEASEBUFFERPROC
 #define _HPySlot_SIG__HPy_nb_absolute HPyFunc_UNARYFUNC
 #define _HPySlot_SIG__HPy_nb_add HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_and HPyFunc_BINARYFUNC

graalpython/com.oracle.graal.python.cext/include/common/autogen_impl.h

@@ -90,6 +90,11 @@ HPyAPI_STORAGE double _HPy_IMPL_NAME(Float_AsDouble)(HPyContext ctx, HPy h)
     return PyFloat_AsDouble(_h2py(h));
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME(Bool_FromLong)(HPyContext ctx, long v)
+{
+    return _py2h(PyBool_FromLong(v));
+}
+
 HPyAPI_STORAGE HPy_ssize_t _HPy_IMPL_NAME_NOPREFIX(Length)(HPyContext ctx, HPy h)
 {
     return PyObject_Length(_h2py(h));
@@ -340,6 +345,11 @@ HPyAPI_STORAGE int _HPy_IMPL_NAME_NOPREFIX(SetItem)(HPyContext ctx, HPy obj, HPy
     return PyObject_SetItem(_h2py(obj), _h2py(key), _h2py(value));
 }
 
+HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(Type)(HPyContext ctx, HPy obj)
+{
+    return _py2h(PyObject_Type(_h2py(obj)));
+}
+
 HPyAPI_STORAGE HPy _HPy_IMPL_NAME_NOPREFIX(Repr)(HPyContext ctx, HPy obj)
 {
     return _py2h(PyObject_Repr(_h2py(obj)));

graalpython/com.oracle.graal.python.cext/include/common/cpy_types.h

@@ -9,6 +9,7 @@
 typedef struct _object cpy_PyObject;
 typedef cpy_PyObject *(*cpy_PyCFunction)(cpy_PyObject *, cpy_PyObject *);
 typedef struct PyMethodDef cpy_PyMethodDef;
+typedef struct bufferinfo cpy_Py_buffer;
 
 
 #endif /* HPY_UNIVERSAL_CPY_TYPES_H */

graalpython/com.oracle.graal.python.cext/include/common/hpyfunc.h

@@ -9,6 +9,8 @@ typedef enum {
 
     HPyFunc_DESTROYFUNC,
 
+    HPyFunc_GETBUFFERPROC,
+    HPyFunc_RELEASEBUFFERPROC,
     HPyFunc_UNARYFUNC,
     HPyFunc_BINARYFUNC,
     HPyFunc_TERNARYFUNC,
@@ -70,6 +72,19 @@ typedef enum {
     enum { SYM##_sig = SIG };              \
     _HPyFunc_TRAMPOLINE_##SIG(SYM, IMPL)
 
+typedef struct {
+    void *buf;
+    HPy obj;        /* owned reference */
+    HPy_ssize_t len;
+    HPy_ssize_t itemsize;
+    int readonly;
+    int ndim;
+    char *format;
+    HPy_ssize_t *shape;
+    HPy_ssize_t *strides;
+    HPy_ssize_t *suboffsets;
+    void *internal;
+} HPy_buffer;
 
 #include "autogen_hpyfunc_declare.h"
 

graalpython/com.oracle.graal.python.cext/include/common/hpytype.h

@@ -29,6 +29,7 @@ typedef struct {
     unsigned int flags;
     void *legacy_slots; // PyType_Slot *
     HPyDef **defines;   /* points to an array of 'HPyDef *' */
+    const char* doc;    /* UTF-8 doc string or NULL */
 } HPyType_Spec;
 
 typedef enum {

graalpython/com.oracle.graal.python.cext/include/common/runtime/ctx_object.h

@@ -5,5 +5,6 @@
 #include "hpy.h"
 
 _HPy_HIDDEN void ctx_Dump(HPyContext ctx, HPy h);
+_HPy_HIDDEN int ctx_TypeCheck(HPyContext ctx, HPy h_obj, HPy h_type);
 
 #endif /* HPY_COMMON_RUNTIME_CTX_OBJECT_H */

graalpython/com.oracle.graal.python.cext/include/common/version.h

@@ -1,4 +1,4 @@
 
 // automatically generated by setup.py:get_scm_config()
-#define HPY_VERSION "0.1.dev965+g6d3b941"
-#define HPY_GIT_REVISION "6d3b941"
+#define HPY_VERSION "0.0.2.dev144+ng1d5d4c5"
+#define HPY_GIT_REVISION "1d5d4c5"

graalpython/com.oracle.graal.python.cext/include/cpython/hpy.h

@@ -45,10 +45,13 @@ typedef Py_hash_t HPy_hash_t;
 
 // this should maybe autogenerated from public_api.h
 typedef struct _HPyContext_s {
+    const char *name;
     /* Constants */
     HPy h_None;
     HPy h_True;
     HPy h_False;
+    HPy h_NotImplemented;
+    HPy h_Ellipsis;
     /* Exceptions */
     HPy h_BaseException;
     HPy h_Exception;
@@ -140,13 +143,14 @@ static inline void* HPy_AsVoidP(HPy h) { return (void*)h._o; }
 HPyAPI_FUNC(HPyContext)
 _HPyGetContext(void) {
     HPyContext ctx = &_global_ctx;
-    if (HPy_IsNull(ctx->h_None)) {
-        // XXX: we need to find a better way to check whether the ctx is
-        // initialized or not
+    if (!ctx->name) {
+        ctx->name = "HPy CPython ABI",
         /* Constants */
         ctx->h_None = _py2h(Py_None);
         ctx->h_True = _py2h(Py_True);
         ctx->h_False = _py2h(Py_False);
+        ctx->h_NotImplemented = _py2h(Py_NotImplemented);
+        ctx->h_Ellipsis = _py2h(Py_Ellipsis);
         /* Exceptions */
         ctx->h_BaseException = _py2h(PyExc_BaseException);
         ctx->h_Exception = _py2h(PyExc_Exception);
@@ -329,6 +333,12 @@ _HPy_Dump(HPyContext ctx, HPy h)
     return ctx_Dump(ctx, h);
 }
 
+HPyAPI_FUNC(int)
+HPy_TypeCheck(HPyContext ctx, HPy h_obj, HPy h_type)
+{
+    return ctx_TypeCheck(ctx, h_obj, h_type);
+}
+
 HPyAPI_FUNC(HPyListBuilder)
 HPyListBuilder_New(HPyContext ctx, HPy_ssize_t initial_size)
 {

graalpython/com.oracle.graal.python.cext/include/cpython/hpyfunc_trampolines.h

@@ -69,4 +69,18 @@
         return _h2py(IMPL(_HPyGetContext(), _py2h(self), _py2h(obj), op)); \
     }
 
+/* With the cpython ABI, Py_buffer and HPy_buffer are ABI-compatible.
+ * Even though casting between them is technically undefined behavior, it
+ * should always work. That way, we avoid a costly allocation and copy. */
+#define _HPyFunc_TRAMPOLINE_HPyFunc_GETBUFFERPROC(SYM, IMPL) \
+    static int SYM(PyObject *arg0, Py_buffer *arg1, int arg2) \
+    { \
+        return (IMPL(_HPyGetContext(), _py2h(arg0), (HPy_buffer*)arg1, arg2)); \
+    }
+#define _HPyFunc_TRAMPOLINE_HPyFunc_RELEASEBUFFERPROC(SYM, IMPL) \
+    static void SYM(PyObject *arg0, Py_buffer *arg1) \
+    { \
+        return (IMPL(_HPyGetContext(), _py2h(arg0), (HPy_buffer*)arg1)); \
+    }
+
 #endif // HPY_CPYTHON_HPYFUNC_TRAMPOLINES_H