diff options
Diffstat (limited to 'src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java')
| -rw-r--r-- | src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java | 246 |
1 files changed, 197 insertions, 49 deletions
diff --git a/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java index 07ddda2d..381390ce 100644 --- a/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java +++ b/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java @@ -25,6 +25,9 @@ package jdk.nashorn.internal.runtime.arrays; +import static jdk.nashorn.internal.codegen.CompilerConstants.specialCall; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptRuntime; @@ -33,7 +36,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime; * Implementation of {@link ArrayData} as soon as an int has been * written to the array. This is the default data for new arrays */ -final class IntArrayData extends ArrayData { +final class IntArrayData extends ContinuousArrayData implements IntElements { /** * The wrapped array */ @@ -53,75 +56,140 @@ final class IntArrayData extends ArrayData { * @param array an int array * @param length a length, not necessarily array.length */ - IntArrayData(final int array[], final int length) { + IntArrayData(final int[] array, final int length) { super(length); - assert array.length >= length; + assert array == null || array.length >= length; this.array = array; } @Override - public ArrayData copy() { - return new IntArrayData(array.clone(), (int) length()); + public final Class<?> getElementType() { + return int.class; } @Override + public final Class<?> getBoxedElementType() { + return Integer.class; + } + + @Override + public final int getElementWeight() { + return 1; + } + + @Override + public final ContinuousArrayData widest(final ContinuousArrayData otherData) { + return otherData; + } + + private static final MethodHandle HAS_GET_ELEM = specialCall(MethodHandles.lookup(), IntArrayData.class, "getElem", int.class, int.class).methodHandle(); + private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), IntArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); + + @Override public Object[] asObjectArray() { - return toObjectArray(array, (int) length()); + return toObjectArray(true); + } + + @SuppressWarnings("unused") + private int getElem(final int index) { + if (has(index)) { + return array[index]; + } + throw new ClassCastException(); + } + + @SuppressWarnings("unused") + private void setElem(final int index, final int elem) { + if (hasRoomFor(index)) { + array[index] = elem; + return; + } + throw new ClassCastException(); + } + + @Override + public MethodHandle getElementGetter(final Class<?> returnType, final int programPoint) { + return getContinuousElementGetter(HAS_GET_ELEM, returnType, programPoint); + } + + @Override + public MethodHandle getElementSetter(final Class<?> elementType) { + return elementType == int.class ? getContinuousElementSetter(SET_ELEM, elementType) : null; + } + + @Override + public IntArrayData copy() { + return new IntArrayData(array.clone(), (int)length()); } @Override public Object asArrayOfType(final Class<?> componentType) { - if(componentType == int.class) { - return array.length == length() ? array.clone() : Arrays.copyOf(array, (int) length()); + if (componentType == int.class) { + final int len = (int)length(); + return array.length == len ? array.clone() : Arrays.copyOf(array, len); } return super.asArrayOfType(componentType); } - private static Object[] toObjectArray(final int[] array, final int length) { - assert length <= array.length : "length exceeds internal array size"; - final Object[] oarray = new Object[array.length]; + private Object[] toObjectArray(final boolean trim) { + assert length() <= array.length : "length exceeds internal array size"; + final int len = (int)length(); + final Object[] oarray = new Object[trim ? len : array.length]; - for (int index = 0; index < length; index++) { + for (int index = 0; index < len; index++) { oarray[index] = Integer.valueOf(array[index]); } return oarray; } - private static double[] toDoubleArray(final int[] array, final int length) { - assert length <= array.length : "length exceeds internal array size"; + private double[] toDoubleArray() { + assert length() <= array.length : "length exceeds internal array size"; + final int len = (int)length(); final double[] darray = new double[array.length]; - for (int index = 0; index < length; index++) { + for (int index = 0; index < len; index++) { darray[index] = array[index]; } return darray; } - private static long[] toLongArray(final int[] array, final int length) { - assert length <= array.length : "length exceeds internal array size"; + private long[] toLongArray() { + assert length() <= array.length : "length exceeds internal array size"; + final int len = (int)length(); final long[] larray = new long[array.length]; - for (int index = 0; index < length; index++) { + for (int index = 0; index < len; index++) { larray[index] = array[index]; } return larray; } + private LongArrayData convertToLong() { + return new LongArrayData(toLongArray(), (int)length()); + } + + private NumberArrayData convertToDouble() { + return new NumberArrayData(toDoubleArray(), (int)length()); + } + + private ObjectArrayData convertToObject() { + return new ObjectArrayData(toObjectArray(false), (int)length()); + } + @Override public ArrayData convert(final Class<?> type) { if (type == Integer.class) { return this; - } - final int length = (int) length(); - if (type == Long.class) { - return new LongArrayData(IntArrayData.toLongArray(array, length), length); + } else if (type == Long.class) { + return convertToLong(); } else if (type == Double.class) { - return new NumberArrayData(IntArrayData.toDoubleArray(array, length), length); + return convertToDouble(); } else { - return new ObjectArrayData(IntArrayData.toObjectArray(array, length), length); + assert type == null || (!Number.class.isAssignableFrom(type) && !type.isPrimitive()); + return convertToObject(); } } @@ -144,36 +212,28 @@ final class IntArrayData extends ArrayData { @Override public ArrayData ensure(final long safeIndex) { - if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= array.length) { + if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH) { return new SparseArrayData(this, safeIndex + 1); } - - int newLength = array.length; - - while (newLength <= safeIndex) { - newLength = ArrayData.nextSize(newLength); - } - - if (array.length <= safeIndex) { + final int alen = array.length; + if (safeIndex >= alen) { + final int newLength = ArrayData.nextSize((int)safeIndex); array = Arrays.copyOf(array, newLength); } - setLength(safeIndex + 1); - return this; } @Override public ArrayData shrink(final long newLength) { - Arrays.fill(array, (int) newLength, array.length, 0); - + Arrays.fill(array, (int)newLength, array.length, 0); return this; } @Override public ArrayData set(final int index, final Object value, final boolean strict) { - if (value instanceof Integer) { - return set(index, ((Number)value).intValue(), strict); + if (JSType.isRepresentableAsInt(value)) { + return set(index, JSType.toInt32(value), strict); } else if (value == ScriptRuntime.UNDEFINED) { return new UndefinedArrayFilter(this).set(index, value, strict); } @@ -192,9 +252,8 @@ final class IntArrayData extends ArrayData { @Override public ArrayData set(final int index, final long value, final boolean strict) { - final int intValue = (int)value; - if (intValue == value) { - array[index] = intValue; + if (JSType.isRepresentableAsInt(value)) { + array[index] = JSType.toInt32(value); setLength(Math.max(index + 1, length())); return this; } @@ -219,16 +278,31 @@ final class IntArrayData extends ArrayData { } @Override + public int getIntOptimistic(final int index, final int programPoint) { + return array[index]; + } + + @Override public long getLong(final int index) { return array[index]; } @Override + public long getLongOptimistic(final int index, final int programPoint) { + return array[index]; + } + + @Override public double getDouble(final int index) { return array[index]; } @Override + public double getDoubleOptimistic(final int index, final int programPoint) { + return array[index]; + } + + @Override public Object getObject(final int index) { return array[index]; } @@ -250,11 +324,12 @@ final class IntArrayData extends ArrayData { @Override public Object pop() { - if (length() == 0) { + final int len = (int)length(); + if (len == 0) { return ScriptRuntime.UNDEFINED; } - final int newLength = (int) length() - 1; + final int newLength = len - 1; final int elem = array[newLength]; array[newLength] = 0; setLength(newLength); @@ -264,10 +339,18 @@ final class IntArrayData extends ArrayData { @Override public ArrayData slice(final long from, final long to) { - final long start = from < 0 ? (from + length()) : from; - final long newLength = to - start; + return new IntArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)(to - (from < 0 ? from + length() : from))); + } - return new IntArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)newLength); + @Override + public final ArrayData push(final boolean strict, final int item) { + final long len = length(); + final ArrayData newData = ensure(len); + if (newData == this) { + array[(int)len] = item; + return this; + } + return newData.set((int)len, item, strict); } @Override @@ -277,8 +360,14 @@ final class IntArrayData extends ArrayData { if (newLength > SparseArrayData.MAX_DENSE_LENGTH && newLength > array.length) { throw new UnsupportedOperationException(); } - final ArrayData returnValue = (removed == 0) ? - EMPTY_ARRAY : new IntArrayData(Arrays.copyOfRange(array, start, start + removed), removed); + final ArrayData returnValue = removed == 0 ? + EMPTY_ARRAY : + new IntArrayData( + Arrays.copyOfRange( + array, + start, + start + removed), + removed); if (newLength != oldLength) { final int[] newArray; @@ -297,4 +386,63 @@ final class IntArrayData extends ArrayData { return returnValue; } + + @Override + public long fastPush(final int arg) { + final int len = (int)length(); + if (len == array.length) { + array = Arrays.copyOf(array, nextSize(len)); + } + array[len] = arg; + return increaseLength(); + } + + //length must not be zero + @Override + public int fastPopInt() { + if (length() == 0) { + throw new ClassCastException(); //relink + } + final int newLength = (int)decreaseLength(); + final int elem = array[newLength]; + array[newLength] = 0; + return elem; + } + + @Override + public long fastPopLong() { + return fastPopInt(); + } + + @Override + public double fastPopDouble() { + return fastPopInt(); + } + + @Override + public Object fastPopObject() { + return fastPopInt(); + } + + @Override + public ContinuousArrayData fastConcat(final ContinuousArrayData otherData) { + final int otherLength = (int)otherData.length(); + final int thisLength = (int)length(); + assert otherLength > 0 && thisLength > 0; + + final int[] otherArray = ((IntArrayData)otherData).array; + final int newLength = otherLength + thisLength; + final int[] newArray = new int[ArrayData.alignUp(newLength)]; + + System.arraycopy(array, 0, newArray, 0, thisLength); + System.arraycopy(otherArray, 0, newArray, thisLength, otherLength); + + return new IntArrayData(newArray, newLength); + } + + @Override + public String toString() { + assert length() <= array.length : length() + " > " + array.length; + return getClass().getSimpleName() + ':' + Arrays.toString(Arrays.copyOf(array, (int)length())); + } } |