Merge pull request #622 from czgdp1807/arr_idx

Supporting C-interop with array indices

Author: certik

.gitignore

@@ -177,6 +177,7 @@ integration_tests/bindc_01
 integration_tests/bindc_01.c
 integration_tests/bindc_02
 integration_tests/bindc_02.c
+integration_tests/bindc_03
 integration_tests/structs_01
 integration_tests/structs_01.c
 integration_tests/structs_02

integration_tests/CMakeLists.txt

@@ -160,6 +160,8 @@ RUN(NAME test_c_interop_04   LABELS cpython llvm c
         EXTRAFILES test_c_interop_04b.c)
 RUN(NAME test_c_interop_05   LABELS llvm c
         EXTRAFILES test_c_interop_05b.c)
+RUN(NAME bindc_03   LABELS llvm
+        EXTRAFILES bindc_03b.c)
 RUN(NAME test_generics_01    LABELS cpython llvm)
 RUN(NAME test_cmath          LABELS cpython llvm)
 RUN(NAME test_complex        LABELS cpython llvm)

integration_tests/bindc_03.py

@@ -0,0 +1,33 @@
+from ltypes import c_p_pointer, CPtr, pointer, i16, i32, Pointer, ccall, p_c_pointer
+
+@ccall
+def g(a: CPtr, value: i32) -> None:
+    pass
+
+@ccall
+def get_array(size: i32) -> CPtr:
+    pass
+
+@ccallable
+def f(q_void: CPtr) -> None:
+    i: i32
+    el: i32
+    q: Pointer[i32[:]]
+    c_p_pointer(q_void, q)
+    for i in range(10):
+        q2: CPtr
+        p_c_pointer(pointer(q[i]), q2)
+        g(q2, i * i)
+        # TODO: Use q[i] directly in the assert.
+        el = q[i]
+        print(el)
+        assert el == i * i
+
+def run():
+    a: CPtr
+    size: i32
+    size = 10
+    a = get_array(size)
+    f(a)
+
+run()

integration_tests/bindc_03b.c

@@ -0,0 +1,10 @@
+#include "bindc_03b.h"
+#include <stdlib.h>
+
+void g(int32_t* x, int32_t value) {
+    *x = value;
+}
+
+void* get_array(int32_t size) {
+    return malloc(size * sizeof(int32_t));
+}

integration_tests/bindc_03b.h

@@ -0,0 +1,10 @@
+#ifndef BINDC_03B
+#define BINDC_03B
+
+#include <stdint.h>
+
+void g(int32_t* x, int32_t value);
+
+void* get_array(int32_t size);
+
+#endif // BINDC_03B

src/libasr/codegen/asr_to_llvm.cpp

@@ -1223,7 +1223,10 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
             std::vector<llvm::Value*> indices;
             for( size_t r = 0; r < x.n_args; r++ ) {
                 ASR::array_index_t curr_idx = x.m_args[r];
+                uint64_t ptr_loads_copy = ptr_loads;
+                ptr_loads = 2;
                 this->visit_expr_wrapper(curr_idx.m_right, true);
+                ptr_loads = ptr_loads_copy;
                 indices.push_back(tmp);
             }
             if (v->m_type->type == ASR::ttypeType::Pointer) {
@@ -2376,6 +2379,9 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
             case (ASR::ttypeType::Logical) :
                 return_type = llvm::Type::getInt1Ty(context);
                 break;
+            case (ASR::ttypeType::CPtr) :
+                return_type = llvm::Type::getVoidTy(context)->getPointerTo();
+                break;
             case (ASR::ttypeType::Derived) :
                 throw CodeGenError("Derived return type not implemented yet");
                 break;

src/runtime/ltypes/ltypes.py

@@ -7,7 +7,8 @@
 
 # TODO: this does not seem to restrict other imports
 __slots__ = ["i8", "i16", "i32", "i64", "f32", "f64", "c32", "c64", "CPtr",
-        "overload", "ccall", "TypeVar", "pointer", "c_p_pointer", "Pointer"]
+        "overload", "ccall", "TypeVar", "pointer", "c_p_pointer", "Pointer",
+        "p_c_pointer"]
 
 # data-types