Rework template code to use MemorySegment::copyFrom directly as much …

…as possible
openjdk · May 15, 2020 · 4e51ab8 · 4e51ab8
1 parent 4224081
commit 4e51ab8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/....incubator.jextract/share/classes/jdk/incubator/jextract/tool/resources/C-X.java.template b/....incubator.jextract/share/classes/jdk/incubator/jextract/tool/resources/C-X.java.template
@@ -23,11 +23,6 @@ public class C-X {
     private static final VarHandle handle = LAYOUT.varHandle(CARRIER);
     private static final VarHandle arrayHandle = arrayHandle(LAYOUT, CARRIER);
 
-    private static void copy(MemoryAddress addr, ${CARRIER}[] arr) {
-        var heapSegment = MemorySegment.ofArray(arr);
-        addr.segment().copyFrom(heapSegment);
-    }
-
     public static ${CARRIER} get(MemoryAddress addr) {
         return (${CARRIER}) handle.get(addr);
     }
@@ -69,14 +64,14 @@ public class C-X {
     public static MemorySegment allocateArray(${CARRIER}[] arr) {
         var arrLayout = MemoryLayout.ofSequence(arr.length, LAYOUT);
         var seg = MemorySegment.allocateNative(arrLayout);
-        copy(seg.baseAddress(), arr);
+        seg.copyFrom(MemorySegment.ofArray(arr));
         return seg;
     }
 
     public static MemoryAddress allocateArray(${CARRIER}[] arr, NativeAllocationScope scope) {
         var arrLayout = MemoryLayout.ofSequence(arr.length, LAYOUT);
         var addr = scope.allocate(arrLayout);
-        copy(addr, arr);
+        addr.segment().copyFrom(MemorySegment.ofArray(arr));
         return addr;
     }
 

diff --git a/...ubator.jextract/share/classes/jdk/incubator/jextract/tool/resources/Cstring.java.template b/...ubator.jextract/share/classes/jdk/incubator/jextract/tool/resources/Cstring.java.template
@@ -19,12 +19,6 @@ public final class Cstring {
     }
     private final static VarHandle byteArrHandle = arrayHandle(C_CHAR, byte.class);
 
-    private static void copy(MemoryAddress addr, byte[] bytes) {
-        var heapSegment = MemorySegment.ofArray(bytes);
-        addr.segment().copyFrom(heapSegment);
-        byteArrHandle.set(addr, (long)bytes.length, (byte)0);
-    }
-
     private static MemorySegment toCString(byte[] bytes) {
         MemoryLayout strLayout = MemoryLayout.ofSequence(bytes.length + 1, C_CHAR);
         MemorySegment segment = MemorySegment.allocateNative(strLayout);
@@ -36,7 +30,7 @@ public final class Cstring {
     private static MemoryAddress toCString(byte[] bytes, NativeAllocationScope scope) {
         MemoryLayout strLayout = MemoryLayout.ofSequence(bytes.length + 1, C_CHAR);
         MemoryAddress addr = scope.allocate(strLayout);
-        copy(addr, bytes);
+        addr.segment().copyFrom(MemorySegment.ofArray(bytes));
         return addr;
     }
 
@@ -48,6 +42,15 @@ public final class Cstring {
         copy(addr, str.getBytes(charset));
     }
 
+    //where
+    private static void copy(MemoryAddress addr, byte[] bytes) {
+            var heapSegment = MemorySegment.ofArray(bytes);
+            addr.segment()
+                    .asSlice(addr.segmentOffset(), bytes.length)
+                    .copyFrom(heapSegment);
+            byteArrHandle.set(addr, (long)bytes.length, (byte)0);
+        }
+
     public static MemorySegment toCString(String str) {
          return toCString(str.getBytes());
     }