Changeset 15347

Timestamp:

07/22/20 07:33:26 (3 years ago)

Author:

Mark Evenson

Message:

Further (INCOMPLETE) work on byte vectors

GOAL: completely remove allocation of any UnsignedByte32 in

make_array.java. Surprised that it mostly works this way…

Fix directAllocation in SimpleArray_CharBuffer.java

TODO: finish checking the directAllocation for types

TODO: finish refactoring lisp.coerce…method names

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• ComplexArray_IntBuffer.java (added)
• ComplexVector_IntBuffer.java (added)
• Lisp.java (modified) (1 diff)
• SimpleArray_CharBuffer.java (modified) (1 diff)
• SimpleArray_IntBuffer.java (added)
• SimpleArray_UnsignedByte32.java (modified) (1 diff)
• make_array.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1653 +1653 @@
   }
 
+  // TODO rename to coerceToJavaChar
   public static final char coerceLispObjectToJavaChar(LispObject obj) {
     return (char)Fixnum.getValue(obj);
   }
 
+  // TODO rename to coerceToJavaByte
   public static final byte coerceLispObjectToJavaByte(LispObject obj)
-
   {
           return (byte)Fixnum.getValue(obj);
   }
 
+  public static final int coerceToJavaUnsignedInt(LispObject obj) {
+    return (int) (obj.longValue() & 0xffffffffL);
+  }
+  // TODO rename to coerceFromJavaByte
   public static final LispObject coerceJavaByteToLispObject(byte b)
   {

trunk/abcl/src/org/armedbear/lisp/SimpleArray_CharBuffer.java

@@ -56 +56 @@
     this.directAllocation = directAllocation;
     if (directAllocation) {
-      ByteBuffer b = ByteBuffer.allocate(totalSize * 2);
+      ByteBuffer b = ByteBuffer.allocateDirect(totalSize * 2);
       data = b.asCharBuffer();
     } else {

trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java

@@ -35 +35 @@
 
 import static org.armedbear.lisp.Lisp.*;
+
+/*
+ N.b. this implementation has problems somewhere with converting bytes
+
+      Not fixing currently, as this type is unused with NIO
+
+(let* ((unspecialized
+         #(2025373960 3099658457 3238582529 148439321
+           3099658456 3238582528 3000000000 1000000000
+           2000000000 2900000000 2400000000 2800000000
+           0 1))
+       (array 
+         (make-array (length unspecialized)
+                     :element-type '(unsigned-byte 32) 
+                     :initial-contents unspecialized)))
+  (prove:plan (length array))
+  (loop :for i :below (length array)
+        :doing
+           (let ((x0
+                   (elt unspecialized i))
+                 (x1
+                   (elt array i)))
+           (prove:ok
+            (equal x0 x1)
+            (format nil "~a: ~a equals ~a" i x0 x1)))))
+*/
 
 public final class SimpleArray_UnsignedByte32 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/make_array.java

@@ -112 +112 @@
                 // an abstract array doesn't have a directAllocation  ???
                 v = new ComplexVector_ByteBuffer(dimv[0], array, displacement, directAllocation); 
-              } else if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
+              } else { // if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) 
                 v = new ComplexVector_UnsignedByte8(dimv[0], array, displacement);
               }
             } else if (arrayElementType.equal(UNSIGNED_BYTE_32)) {
-              v = new ComplexVector_UnsignedByte32(dimv[0], array, displacement);
+              if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+                // an abstract array doesn't have a directAllocation  ???
+                v = new ComplexVector_IntBuffer(dimv[0], array, displacement, directAllocation);
+              } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY))
+                v = new ComplexVector_UnsignedByte32(dimv[0], array, displacement);
+              }
             } else {
               v = new ComplexVector(dimv[0], array, displacement);
@@ -208 +213 @@
             defaultInitialElement = Fixnum.ZERO;
           }
-        else if (upgradedType.equal(UNSIGNED_BYTE_32))
-          {
-            if (fillPointer != NIL || adjustable != NIL)
-              v = new ComplexVector_UnsignedByte32(size);
-            else {
-              if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
-                v = new BasicVector_IntBuffer(size, directAllocation);
-              } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
-                v = new BasicVector_UnsignedByte32(size);
-              }
-            }
-            defaultInitialElement = Fixnum.ZERO;
-          }
+        else if (upgradedType.equal(UNSIGNED_BYTE_32)) {
+          if (fillPointer != NIL || adjustable != NIL) {
+            v = new ComplexVector_UnsignedByte32(size);
+          } else {
+            if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+              v = new BasicVector_IntBuffer(size, directAllocation);
+            } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
+              v = new BasicVector_UnsignedByte32(size);
+            }
+          }
+          defaultInitialElement = Fixnum.ZERO;
+        }
         else if (upgradedType == NIL)
           {
@@ -315 +319 @@
           }
         }
-        // N.b. There is no implementation of SimpleArray with
-        // contents (unsigned-byte 32) using either a
-        // primitive array or an nio.Buffer
-        else if (upgradedType.equal(UNSIGNED_BYTE_32))
-          {
-            if (initialContents != NIL)
-              {
-                array = new SimpleArray_UnsignedByte32(dimv, initialContents);
-              }
-            else
-              {
-                array = new SimpleArray_UnsignedByte32(dimv);
-                if (initialElementProvided != NIL)
-                  array.fill(initialElement);
-                else
-                  array.fill(Fixnum.ZERO);
-              }
-          }
-        else
+        else if (upgradedType.equal(UNSIGNED_BYTE_32)) {
+          if (initialContents != NIL) {
+            if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+              array = new SimpleArray_IntBuffer(dimv, initialContents, directAllocation);
+            } else { //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
+              array = new SimpleArray_UnsignedByte32(dimv, initialContents);
+            }
+          } else {
+            if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+              array = new SimpleArray_IntBuffer(dimv, directAllocation);
+            } else {
+              array = new SimpleArray_UnsignedByte32(dimv);
+            }
+            if (initialElementProvided != NIL) {
+              array.fill(initialElement);
+            } else {
+              array.fill(Fixnum.ZERO);
+            }
+          }
+        } else
           {
             if (initialContents != NIL)
@@ -372 +377 @@
               }
           }
-        else if (upgradedType.equal(UNSIGNED_BYTE_32))
-          {
-            if (initialContents != NIL)
-              {
-                array = new ComplexArray_UnsignedByte32(dimv, initialContents);
-              }
-            else
-              {
-                array = new ComplexArray_UnsignedByte32(dimv);
-                if (initialElementProvided != NIL)
-                  array.fill(initialElement);
-                else
-                  array.fill(Fixnum.ZERO);
-              }
-          }
+        else if (upgradedType.equal(UNSIGNED_BYTE_32)) {
+          if (initialContents != NIL) {
+            if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+              array = new ComplexArray_IntBuffer(dimv, initialContents, directAllocation);
+            } else {  //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
+              array = new ComplexArray_UnsignedByte32(dimv, initialContents);
+            }
+          } else {
+            if (Java.Buffers.active.equals(AllocationPolicy.NIO)) {
+              array = new ComplexArray_IntBuffer(dimv, directAllocation);
+            } else {  //if (Java.Buffers.active.equals(AllocationPolicy.PRIMITIVE_ARRAY)) {
+              array = new ComplexArray_UnsignedByte32(dimv);
+            }
+            if (initialElementProvided != NIL) {
+              array.fill(initialElement);
+            } else {
+              array.fill(Fixnum.ZERO);
+            }
+          }
+        }
         else
           {