Implement Python-level object for handling pointer objects.

fangerer · fangerer · commit bf8059aa991a · 2018-09-25T10:58:13.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/longobject.c b/graalpython/com.oracle.graal.python.cext/src/longobject.c
@@ -106,8 +106,10 @@ PyObject * PyLong_FromVoidPtr(void *p) {
     return PyLong_FromUnsignedLongLong((unsigned long long)(uintptr_t)p);
 #endif /* SIZEOF_VOID_P <= SIZEOF_LONG */
 }
+
+UPCALL_ID(PyLong_AsVoidPtr);
 void * PyLong_AsVoidPtr(PyObject *obj){
-	return (void *)PyLong_AsSsize_t(obj);
+    return (void *)UPCALL_CEXT_L(_jls_PyLong_AsVoidPtr, native_to_java(obj));
 }
 
 PyObject * PyLong_FromLong(long n)  {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java
@@ -59,6 +59,7 @@ public enum PythonBuiltinClassType {
     PGenerator(com.oracle.graal.python.builtins.objects.generator.PGenerator.class, "generator"),
     PGeneratorFunction(com.oracle.graal.python.builtins.objects.function.PGeneratorFunction.class, "function"),
     PInt(com.oracle.graal.python.builtins.objects.ints.PInt.class, "int"),
+    PythonNativeVoidPtr(com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr.class, "int"),
     PIntegerSequenceIterator(com.oracle.graal.python.builtins.objects.iterator.PIntegerSequenceIterator.class, "iterator"),
     PList(com.oracle.graal.python.builtins.objects.list.PList.class, "list"),
     PLongSequenceIterator(com.oracle.graal.python.builtins.objects.iterator.PLongSequenceIterator.class, "iterator"),
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -40,6 +40,7 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 
@@ -60,6 +61,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.TruffleCextBuiltinsFactory.CheckFunctionResultNodeGen;
 import com.oracle.graal.python.builtins.modules.TruffleCextBuiltinsFactory.GetByteArrayNodeGen;
+import com.oracle.graal.python.builtins.modules.TruffleCextBuiltinsFactory.TrufflePInt_AsPrimitiveFactory;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
@@ -84,6 +86,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeNull;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.cext.UnicodeObjectNodes.UnicodeAsWideCharNode;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
@@ -836,6 +839,12 @@ protected static String getUTF32Name(int byteorder) {
     @GenerateNodeFactory
     abstract static class TrufflePInt_AsPrimitive extends NativeBuiltin {
 
+        public abstract Object executeWith(Object o, int signed, long targetTypeSize, String targetTypeName);
+
+        public abstract long executeLong(Object o, int signed, long targetTypeSize, String targetTypeName);
+
+        public abstract int executeInt(Object o, int signed, long targetTypeSize, String targetTypeName);
+
         @Specialization(guards = "targetTypeSize == 4")
         int doInt4(int obj, @SuppressWarnings("unused") int signed, @SuppressWarnings("unused") long targetTypeSize, @SuppressWarnings("unused") String targetTypeName) {
             return obj;
@@ -1897,5 +1906,52 @@ Object doUnsignedLong(long n, @SuppressWarnings("unused") int signed,
             }
             return toSulongNode.execute(n);
         }
+
+        @Specialization
+        Object doPointer(TruffleObject n, @SuppressWarnings("unused") int signed,
+                        @Cached("create()") CExtNodes.ToSulongNode toSulongNode) {
+            return toSulongNode.execute(n);
+        }
+    }
+
+    @Builtin(name = "PyLong_AsVoidPtr", fixedNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class PyLong_AsVoidPtr extends PythonUnaryBuiltinNode {
+        @Child private TrufflePInt_AsPrimitive asPrimitiveNode;
+
+        @Specialization
+        long doPointer(int n) {
+            return n;
+        }
+
+        @Specialization
+        long doPointer(long n) {
+            return n;
+        }
+
+        @Specialization
+        long doPointer(PInt n,
+                        @Cached("create()") BranchProfile overflowProfile) {
+            try {
+                return n.longValueExact();
+            } catch (ArithmeticException e) {
+                overflowProfile.enter();
+                throw raise(OverflowError);
+            }
+        }
+
+        @Specialization
+        TruffleObject doPointer(PythonNativeVoidPtr n) {
+            return n.object;
+        }
+
+        @Fallback
+        long doGeneric(Object n) {
+            if (asPrimitiveNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                asPrimitiveNode = insert(TrufflePInt_AsPrimitiveFactory.create(null));
+            }
+            return asPrimitiveNode.executeLong(n, 0, Long.BYTES, "void*");
+        }
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeVoidPtr.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PythonNativeVoidPtr.java
@@ -0,0 +1,17 @@
+package com.oracle.graal.python.builtins.objects.cext;
+
+import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.truffle.api.interop.TruffleObject;
+
+public class PythonNativeVoidPtr extends PythonAbstractObject {
+    public final TruffleObject object;
+
+    public PythonNativeVoidPtr(TruffleObject object) {
+        this.object = object;
+    }
+
+    public int compareTo(Object o) {
+        return 0;
+    }
+
+}
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -55,6 +55,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.FromNativeSubclassNode;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
@@ -1695,10 +1696,15 @@ long hash(long self) {
         }
 
         @Specialization
-        @TruffleBoundary
         long hash(PInt self) {
             return self.longValue();
         }
+
+        @Specialization
+        @TruffleBoundary
+        long hash(PythonNativeVoidPtr self) {
+            return self.object.hashCode();
+        }
     }
 
     @Builtin(name = "bit_length", fixedNumOfPositionalArgs = 1)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/GetClassNode.java
@@ -47,6 +47,7 @@
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes.GetNativeClassNode;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
@@ -205,6 +206,17 @@ protected PythonClass getIt(PythonNativeObject object,
         return getNativeClassNode.execute(object);
     }
 
+    @Specialization(assumptions = "singleContextAssumption()")
+    protected PythonClass getIt(@SuppressWarnings("unused") PythonNativeVoidPtr object,
+                    @Cached("getIt(object)") PythonClass klass) {
+        return klass;
+    }
+
+    @Specialization
+    protected PythonClass getIt(@SuppressWarnings("unused") PythonNativeVoidPtr object) {
+        return getCore().lookupType(PythonBuiltinClassType.PInt);
+    }
+
     @Specialization
     protected PythonClass getPythonClassGeneric(PythonObject object,
                     @Cached("createIdentityProfile()") ValueProfile profile) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java
@@ -37,6 +37,7 @@
 import com.oracle.graal.python.builtins.objects.cell.PCell;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeVoidPtr;
 import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage.FastDictStorage;
 import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage.PythonObjectDictStorage;
@@ -188,6 +189,10 @@ public PythonNativeObject createNativeObjectWrapper(Object obj) {
         return trace(new PythonNativeObject(obj));
     }
 
+    public PythonNativeVoidPtr createNativeVoidPtr(TruffleObject obj) {
+        return trace(new PythonNativeVoidPtr(obj));
+    }
+
     public SuperObject createSuperObject(PythonClass self) {
         return trace(new SuperObject(self));
     }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,10 @@ PyObject * PyLong_FromVoidPtr(void *p) {`
`106`	`106`	`return PyLong_FromUnsignedLongLong((unsigned long long)(uintptr_t)p);`
`107`	`107`	`#endif /* SIZEOF_VOID_P <= SIZEOF_LONG */`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+UPCALL_ID(PyLong_AsVoidPtr);`
`109`	`111`	`void * PyLong_AsVoidPtr(PyObject *obj){`
`110`		`- return (void *)PyLong_AsSsize_t(obj);`
	`112`	`+ return (void *)UPCALL_CEXT_L(_jls_PyLong_AsVoidPtr, native_to_java(obj));`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`PyObject * PyLong_FromLong(long n) {`