add inplace true div

Author: timfel

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

@@ -41,7 +41,8 @@
 #include "capi.h"
 
 typedef enum e_binop {
-	ADD=0, SUB, MUL, TRUEDIV, LSHIFT, RSHIFT, OR, AND, XOR, FLOORDIV, MOD
+    ADD=0, SUB, MUL, TRUEDIV, LSHIFT, RSHIFT, OR, AND, XOR, FLOORDIV, MOD,
+    INPLACE_OFFSET,
 } BinOp;
 
 typedef enum e_unaryop {
@@ -71,6 +72,10 @@ static PyObject * do_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_na
     return UPCALL_CEXT_O("PyNumber_BinOp", native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
 }
 
+static PyObject * do_inplace_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_name) {
+    return UPCALL_CEXT_O("PyNumber_InPlaceBinOp", native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
+}
+
 PyObject * PyNumber_Add(PyObject *o1, PyObject *o2) {
 	return do_binop(o1, o2, ADD, "+");
 }
@@ -134,6 +139,10 @@ PyObject * PyNumber_Index(PyObject *o) {
     return UPCALL_CEXT_O("PyNumber_Index", native_to_java(o));
 }
 
+PyObject * PyNumber_InPlaceTrueDivide(PyObject *o1, PyObject *o2) {
+    return do_inplace_binop(o1, o2, TRUEDIV, "/");
+}
+
 Py_ssize_t PyNumber_AsSsize_t(PyObject *item, PyObject *err) {
     Py_ssize_t result;
     PyObject *runerr;

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

@@ -597,3 +597,7 @@ void* wrap_fastcall(_PyCFunctionFast fun, PyObject *self, PyObject **args, PyObj
 void* wrap_unsupported(void *fun, ...) {
     return NULL;
 }
+
+int truffle_ptr_compare(void* x, void* y) {
+    return x == y;
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -544,4 +544,27 @@ public static SizeofWCharNode create() {
             return new SizeofWCharNode();
         }
     }
+
+    public static class IsNode extends CExtBaseNode {
+        @CompilationFinal private TruffleObject isFunc = null;
+        @Child Node executeNode = Message.createExecute(2).createNode();
+
+        public boolean execute(PythonNativeObject a, PythonNativeObject b) {
+            try {
+                return (int) ForeignAccess.sendExecute(executeNode, getNativeFunction(), a.object, b.object) != 0;
+            } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+                CompilerDirectives.transferToInterpreter();
+                throw new IllegalStateException(NativeCAPISymbols.FUN_PTR_COMPARE + " didn't work!");
+            }
+        }
+
+        TruffleObject getNativeFunction() {
+            if (isFunc == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                isFunc = (TruffleObject) getContext().getEnv().importSymbol(NativeCAPISymbols.FUN_PTR_COMPARE);
+            }
+            return isFunc;
+        }
+
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/NativeCAPISymbols.java

@@ -56,4 +56,5 @@ public abstract class NativeCAPISymbols {
     public static final String FUN_DEREF_HANDLE = "truffle_deref_handle_for_managed";
     public static final String FUN_GET_BYTE_ARRAY_TYPE_ID = "get_byte_array_typeid";
     public static final String FUN_GET_PTR_ARRAY_TYPE_ID = "get_ptr_array_typeid";
+    public static final String FUN_PTR_COMPARE = "truffle_ptr_compare";
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/IsNode.java

@@ -40,8 +40,11 @@
  */
 package com.oracle.graal.python.nodes.expression;
 
+import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
+import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.PNode;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 
@@ -158,6 +161,16 @@ boolean doDD(double left, double right) {
         return left == right;
     }
 
+    protected static CExtNodes.IsNode getNativeIsNode() {
+        return new CExtNodes.IsNode();
+    }
+
+    @Specialization
+    boolean doNative(PythonNativeObject left, PythonNativeObject right,
+                    @Cached("getNativeIsNode()") CExtNodes.IsNode isNode) {
+        return isNode.execute(left, right);
+    }
+
     @Fallback
     boolean doGeneric(Object left, Object right) {
         return left == right;

graalpython/lib-graalpython/python_cext.py

@@ -414,6 +414,38 @@ def PyNumber_BinOp(v, w, binop, name):
         raise SystemError("unknown binary operator %s" % name)
 
 
+@may_raise
+def PyNumber_InPlaceBinOp(v, w, binop, name):
+    control = v
+    if binop == 0:
+        v += w
+    elif binop == 1:
+        v -= w
+    elif binop == 2:
+        v *= w
+    elif binop == 3:
+        v /= w
+    elif binop == 4:
+        v <<= w
+    elif binop == 5:
+        v >>= w
+    elif binop == 6:
+        v |= w
+    elif binop == 7:
+        v &= w
+    elif binop == 8:
+        v ^= w
+    elif binop == 9:
+        v //= w
+    elif binop == 10:
+        v %= w
+    else:
+        raise SystemError("unknown binary operator %s" % name)
+    if control is not v:
+        raise TypeError("unsupported operand type(s) for %s=: '%s' and '%s'" % (name, type(v), type(w)))
+    return control
+
+
 @may_raise
 def PyNumber_UnaryOp(v, unaryop, name):
     if unaryop == 0: