[GR-9858] Add scripts for cross-compiling numpy and add various missing pieces

PullRequest: graalpython-open/50

Author: timfel

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -145,11 +145,6 @@
 #undef Py_RETURN_NONE
 #define Py_RETURN_NONE return Py_None;
 
-#define PyMem_RawMalloc(size) malloc(size)
-#define PyMem_RawCalloc(nelem, elsize) calloc(nelem, elsize)
-#define PyMem_RawRealloc(ptr, new_size) realloc(ptr, new_size)
-#define PyMem_RawFree(ptr) free(ptr)
-
 #define _PyLong_FromTime_t(o) ((long)o)
 
 extern int PyTruffle_Arg_ParseTupleAndKeywords(PyObject *argv, PyObject *kwds, const char *format, char** kwdnames, int outc, void *v0, void *v1, void *v2, void *v3, void *v4, void *v5, void *v6, void *v7, void *v8, void *v9, void *v10, void *v11, void *v12, void *v13, void *v14, void *v15, void *v16, void *v17, void *v18, void *v19);

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -55,6 +55,10 @@ static void initialize_globals() {
     void *jnotimpl = polyglot_as__object(to_sulong(polyglot_get_member(PY_BUILTIN, "NotImplemented")));
     truffle_assign_managed(&_Py_NotImplementedStruct, jnotimpl);
 
+    // Ellipsis
+    void *jellipsis = polyglot_as__object(to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "Py_Ellipsis")));
+    truffle_assign_managed(&_Py_EllipsisObject, jellipsis);
+
     // True, False
     void *jtrue = polyglot_invoke(PY_TRUFFLE_CEXT, "Py_True");
     truffle_assign_managed(&_Py_TrueStruct, polyglot_as__longobject(to_sulong(jtrue)));
@@ -89,6 +93,10 @@ static void initialize_capi() {
     initialize_type_structure(&_PyNotImplemented_Type, "NotImplementedType");
     initialize_type_structure(&PyCapsule_Type, "PyCapsule");
     initialize_type_structure(&PyMemoryView_Type, "memoryview");
+    initialize_type_structure(&PyCFunction_Type, "function");
+    initialize_type_structure(&PyFrozenSet_Type, "frozenset");
+    initialize_type_structure(&PySet_Type, "set");
+    initialize_type_structure(&PyEllipsis_Type, "ellipsis");
 
     // initialize global variables like '_Py_NoneStruct', etc.
     initialize_globals();
@@ -98,10 +106,12 @@ static void initialize_capi() {
 }
 
 void* native_to_java(PyObject* obj) {
-	if (obj == Py_None) {
+    if (obj == Py_None) {
         return Py_None;
     } else if (obj == NULL) {
     	return Py_NoValue;
+    } else if (polyglot_is_string(obj)) {
+        return obj;
     } else if (truffle_is_handle_to_managed(obj)) {
     	return truffle_managed_from_handle(obj);
     } else if (truffle_is_handle_to_managed(obj->ob_refcnt)) {

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -74,6 +74,7 @@ POLYGLOT_DECLARE_TYPE(PyBytesObject);
 POLYGLOT_DECLARE_STRUCT(_longobject);
 POLYGLOT_DECLARE_TYPE(PyCapsule);
 POLYGLOT_DECLARE_TYPE(PyMemoryViewObject);
+POLYGLOT_DECLARE_TYPE(PySetObject);
 
 
 extern void* to_java(PyObject* obj);

graalpython/com.oracle.graal.python.cext/src/capsule.c

@@ -41,23 +41,34 @@
 PyTypeObject PyCapsule_Type = PY_TRUFFLE_TYPE("PyCapsule", &PyType_Type, 0);
 
 PyObject* PyCapsule_New(void *pointer, const char *name, PyCapsule_Destructor destructor) {
-    return (PyObject *)polyglot_as_PyCapsule(to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule", polyglot_from_string(name, "ascii"), pointer, destructor)));
+    return (PyObject *)polyglot_as_PyCapsule(to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule", name ? polyglot_from_string(name, "ascii") : to_java(Py_None), pointer, destructor)));
 }
 
-void * PyCapsule_GetContext(PyObject *o) {
-	void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_GetContext", to_java(o));
-	if (result == ERROR_MARKER) {
-		return NULL;
-	}
-	return (void *)as_long(result);
+void* PyCapsule_GetContext(PyObject *o) {
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_GetContext", to_java(o));
+    if (result == ERROR_MARKER) {
+        return NULL;
+    }
+    return (void *)as_long(result);
 }
 
-void * PyCapsule_GetPointer(PyObject *o, const char *name) {
-	void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_GetPointer", to_java(o), polyglot_from_string(name, "ascii"));
-	if (result == ERROR_MARKER) {
-		return NULL;
-	}
-	return (void *)as_long(result);
+void* PyCapsule_GetPointer(PyObject *o, const char *name) {
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_GetPointer", to_java(o), polyglot_from_string(name, "ascii"));
+    if (result == ERROR_MARKER) {
+        return NULL;
+    }
+    return (void *)as_long(result);
 }
 
+void* PyCapsule_Import(const char *name, int no_block) {
+    // TODO (tfel): no_block is currently ignored
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_Import", polyglot_from_string(name, "ascii"), no_block);
+    if (result == ERROR_MARKER) {
+        return NULL;
+    }
+    return (void*)to_sulong(result);
+}
 
+int PyCapsule_IsValid(PyObject *o, const char *name) {
+    return o != NULL && polyglot_invoke(PY_TRUFFLE_CEXT, "PyCapsule_IsValid", to_java(o), polyglot_from_string(name, "ascii"));
+}

graalpython/com.oracle.graal.python.cext/src/dictobject.c

@@ -103,7 +103,7 @@ PyObject * PyDict_GetItemString(PyObject *v, const char *key) {
 }
 
 int PyDict_SetItemString(PyObject *v, const char *key, PyObject *item) {
-    truffle_invoke(to_java(v), "__setitem__", PyUnicode_FromString(key), to_java(item));
+    truffle_invoke(to_java(v), "__setitem__", to_java(PyUnicode_FromString(key)), to_java(item));
     return 0;
 }
 

graalpython/com.oracle.graal.python.cext/src/errors.c

@@ -39,7 +39,7 @@
 #include "capi.h"
 
 void _PyErr_BadInternalCall(const char *filename, int lineno) {
-    truffle_invoke(PY_TRUFFLE_CEXT, "_PyErr_BadInternalCall", truffle_read_string(filename), lineno);
+    polyglot_invoke(PY_TRUFFLE_CEXT, "_PyErr_BadInternalCall", polyglot_from_string(filename, "utf-8"), lineno, Py_NoValue);
 }
 
 #undef PyErr_BadInternalCall

graalpython/com.oracle.graal.python.cext/src/functionobject.c

@@ -39,3 +39,5 @@
 #include "capi.h"
 
 typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
+
+PyTypeObject PyCFunction_Type = PY_TRUFFLE_TYPE("builtin_function_or_method", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC);

graalpython/com.oracle.graal.python.cext/src/longobject.c

@@ -52,7 +52,7 @@ long PyLong_AsLongAndOverflow(PyObject *obj, int *overflow) {
         return -1;
     }
     long result = truffle_invoke_l(PY_TRUFFLE_CEXT, "PyLong_AsPrimitive", to_java(obj), true, sizeof(long), truffle_read_string("long"));
-    *overflow = result == -1L && PyErr_Occurred();
+    *overflow = result == -1L && PyErr_Occurred() != NULL;
     return result;
 }
 
@@ -93,8 +93,13 @@ PyObject * PyLong_FromVoidPtr(void *p) {
 void * PyLong_AsVoidPtr(PyObject *obj){
 	return (void *)PyLong_AsSsize_t(obj);
 }
+
 PyObject * PyLong_FromLong(long n)  {
-	return PyLong_FromUnsignedLongLong(n);
+    void *result = polyglot_invoke(PY_TRUFFLE_CEXT, "PyLong_FromLongLong", n, true);
+    if (result == ERROR_MARKER) {
+    	return NULL;
+    }
+    return to_sulong(result);
 }
 
 PyObject * PyLong_FromLongLong(long long n)  {