pool,
- String interfaceName,
- String name,
- String spec)
- {
- return add(pool, new InterfaceMethodRefPoolEntry
- (addClass(pool, interfaceName),
- addNameAndType(pool, name, spec)));
- }
-
- public interface PoolEntry {
- public void writeTo(OutputStream out) throws IOException;
- }
-
- private static class IntegerPoolEntry implements PoolEntry {
- private final int value;
-
- public IntegerPoolEntry(int value) {
- this.value = value;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_Integer);
- write4(out, value);
- }
-
- public boolean equals(Object o) {
- return o instanceof IntegerPoolEntry
- && ((IntegerPoolEntry) o).value == value;
- }
- }
-
- private static class Utf8PoolEntry implements PoolEntry {
- private final String data;
-
- public Utf8PoolEntry(String data) {
- this.data = data;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_Utf8);
- byte[] bytes = data.getBytes("UTF-8");
- write2(out, bytes.length);
- out.write(bytes);
- }
-
- public boolean equals(Object o) {
- return o instanceof Utf8PoolEntry
- && ((Utf8PoolEntry) o).data.equals(data);
- }
- }
-
- private static class StringPoolEntry implements PoolEntry {
- private final int valueIndex;
-
- public StringPoolEntry(int valueIndex) {
- this.valueIndex = valueIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_String);
- write2(out, valueIndex + 1);
- }
-
- public boolean equals(Object o) {
- return o instanceof StringPoolEntry
- && ((StringPoolEntry) o).valueIndex == valueIndex;
- }
- }
-
- private static class ClassPoolEntry implements PoolEntry {
- private final int nameIndex;
-
- public ClassPoolEntry(int nameIndex) {
- this.nameIndex = nameIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_Class);
- write2(out, nameIndex + 1);
- }
-
- public boolean equals(Object o) {
- return o instanceof ClassPoolEntry
- && ((ClassPoolEntry) o).nameIndex == nameIndex;
- }
- }
-
- private static class NameAndTypePoolEntry implements PoolEntry {
- private final int nameIndex;
- private final int typeIndex;
-
- public NameAndTypePoolEntry(int nameIndex, int typeIndex) {
- this.nameIndex = nameIndex;
- this.typeIndex = typeIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_NameAndType);
- write2(out, nameIndex + 1);
- write2(out, typeIndex + 1);
- }
-
- public boolean equals(Object o) {
- if (o instanceof NameAndTypePoolEntry) {
- NameAndTypePoolEntry other = (NameAndTypePoolEntry) o;
- return other.nameIndex == nameIndex && other.typeIndex == typeIndex;
- } else {
- return false;
- }
- }
- }
-
- private static class FieldRefPoolEntry implements PoolEntry {
- private final int classIndex;
- private final int nameAndTypeIndex;
-
- public FieldRefPoolEntry(int classIndex, int nameAndTypeIndex) {
- this.classIndex = classIndex;
- this.nameAndTypeIndex = nameAndTypeIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_Fieldref);
- write2(out, classIndex + 1);
- write2(out, nameAndTypeIndex + 1);
- }
-
- public boolean equals(Object o) {
- if (o instanceof FieldRefPoolEntry) {
- FieldRefPoolEntry other = (FieldRefPoolEntry) o;
- return other.classIndex == classIndex
- && other.nameAndTypeIndex == nameAndTypeIndex;
- } else {
- return false;
- }
- }
- }
-
- private static class MethodRefPoolEntry implements PoolEntry {
- private final int classIndex;
- private final int nameAndTypeIndex;
-
- public MethodRefPoolEntry(int classIndex, int nameAndTypeIndex) {
- this.classIndex = classIndex;
- this.nameAndTypeIndex = nameAndTypeIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_Methodref);
- write2(out, classIndex + 1);
- write2(out, nameAndTypeIndex + 1);
- }
-
- public boolean equals(Object o) {
- if (o instanceof MethodRefPoolEntry) {
- MethodRefPoolEntry other = (MethodRefPoolEntry) o;
- return other.classIndex == classIndex
- && other.nameAndTypeIndex == nameAndTypeIndex;
- } else {
- return false;
- }
- }
- }
-
- private static class InterfaceMethodRefPoolEntry implements PoolEntry {
- private final int classIndex;
- private final int nameAndTypeIndex;
-
- public InterfaceMethodRefPoolEntry(int classIndex, int nameAndTypeIndex) {
- this.classIndex = classIndex;
- this.nameAndTypeIndex = nameAndTypeIndex;
- }
-
- public void writeTo(OutputStream out) throws IOException {
- write1(out, CONSTANT_InterfaceMethodref);
- write2(out, classIndex + 1);
- write2(out, nameAndTypeIndex + 1);
- }
-
- public boolean equals(Object o) {
- if (o instanceof InterfaceMethodRefPoolEntry) {
- InterfaceMethodRefPoolEntry other = (InterfaceMethodRefPoolEntry) o;
- return other.classIndex == classIndex
- && other.nameAndTypeIndex == nameAndTypeIndex;
- } else {
- return false;
- }
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/Continuations.java b/sgx-jvm/avian/classpath/avian/Continuations.java
deleted file mode 100644
index 2c930970b0..0000000000
--- a/sgx-jvm/avian/classpath/avian/Continuations.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.util.concurrent.Callable;
-
-/**
- * This class provides methods to capture continuations and manage
- * control flow when calling continuations.
- *
- * A continuation is a snapshot of a thread's call stack which can
- * be captured via callWithCurrentContinuation and later
- * restored any number of times. The program may restore this
- * snapshot by either feeding it a result (to be returned by
- * callWithCurrentContinuation) or feeding it an
- * exception (to be thrown by
- * callWithCurrentContinuation). Continuations may be
- * used to implement features such as coroutines, generators, and
- * cooperative multitasking.
- *
- *
This class provides two static methods,
- * callWithCurrentContinuation and
- * dynamicWind, with similar semantics to the Scheme
- * functions call-with-current-continuation and
- * dynamic-wind, respectively. In addition, we define
- * how continuations work with respect to native code, exceptions,
- * try/finally blocks, synchronized blocks, and multithreading.
- *
- *
Continuations and Continuation Contexts
- *
- * A continuation can be thought of as a singly-linked list of
- * stack frames representing the call trace, where the head of the
- * list is the frame of the method most recently called (i.e. the top
- * of the stack). However, this trace only extends as far as the most
- * recent chain of Java frames - it ends just prior to the most recent
- * native frame in the stack. The reason for this is that the VM
- * cannot, in general, safely capture and restore native frames.
- * Therefore, each call from native code to Java (including the
- * original invocation of main(String[]) or
- * Thread.run()) represents a new continuation context in
- * which continuations may be captured, and these will only contain
- * frames from within that context.
- *
- *
Calling a continuation (i.e. feeding it a result or exception)
- * causes the current continuation to be replaced with the called
- * continuation. When the last method in this new continuation
- * returns, it returns to the native frame which created the current
- * context, which may or may not be the same as the context in which
- * that continuation was created.
- *
- *
We define the return type of a continuation context as the
- * return type of the first method called in that context. A
- * continuation may be called from a different context than the one in
- * which it was created, provided the return type of the latter is
- * compatible with the current context.
- *
- *
Given a thread executing in context "A" which wants to call a
- * continuation created in context "B", the following rules apply:
- *
- *
- *
- * - If the return type of "A" is
void, the return
- * type of "B" may be anything, including void
- *
- * - If the return type of "A" is a primitive type, the return
- * type of "B" must match exactly
- *
- * - If the return type of "A" is an object type, that type must
- * be assignable from the return type of "B" (i.e. the latter must
- * either be the same as the former or a superclass or
- * superinterface of it)
- *
- *
- *
- * A thread may call a continuation created by a different thread
- * provided the return types are compatible. Multiple threads may
- * safely call the same continuation simultaneously without
- * synchronization. Any attempt to call a continuation from a context
- * with an incompatible return type will throw an {@link
- * avian.IncompatibleContinuationException}.
- *
- *
Winding, Unwinding, and Rewinding
- *
- * Traditionally, Java provides one way to wind the execution stack
- * (method calls) and two ways to unwind it (normal returns and
- * exception unwinding). With continuations, we add a new way to
- * rewind the stack and a new way to unwind it.
- *
- *
The call stack of a continuation may share frames with other
- * continuations - in which case they share a common history. When
- * calling a continuation "B" from the current continuation "A", the
- * VM must unwind past any frames which are in "A" but not in "B" and
- * rewind past any frames in "B" but not in "A". During this
- * unwinding and rewinding, control may pass through synchronized and
- * try/finally blocks while going down the old stack and up the new
- * stack.
- *
- *
However, unlike the traditional processes of winding and
- * unwinding, the VM will ignore these blocks - monitors will not be
- * released or acquired and finally blocks will not execute. This is
- * by design. The purpose of such a block is to acquire a resource,
- * such as a file handle or monitor, once before executing a task and
- * release it after the task is finished, regardless of how often the
- * task might temporarily yield control to other continuations.
- *
- *
Alternatively, one might wish to acquire and release a resource
- * each time control (re)winds to or unwinds from a continuation,
- * respectively. In this case, one may use dynamicWind
- * to register functions which will run every time that frame is
- * passed, regardless of how the stack is wound or unwound.
- */
-public class Continuations {
- private Continuations() { }
-
- private static final ThreadLocal latestReset = new ThreadLocal();
-
- /**
- * Captures the current continuation, passing a reference to the
- * specified receiver.
- *
- * This method will either return the result returned by
- * receiver.call(Callback), propagate the exception
- * thrown by that method, return the result passed to the
- * handleResult(T) method of the continuation, or throw the
- * exception passed to the handleException(Throwable) method of the
- * continuation.
- */
- public static native T callWithCurrentContinuation
- (Function,T> receiver) throws Exception;
-
- /**
- * Calls the specified "before" and "after" tasks each time a
- * continuation containing the call is wound or unwound,
- * respectively.
- *
- * This method first calls before.run(), then
- * thunk.call(), and finally after.run(),
- * returning the result of the second call. If
- * before.run() does not return normally, the second
- * and third calls will not happen. If thunk.call()
- * throws an exception, after.run(), will be called
- * before the exception is propagated.
- *
- *
If thunk.call() calls a continuation (directly or
- * via a subroutine) which does not include the current call to
- * dynamicWind, after.run() will be called
- * before control passes to that continuation. If this call throws
- * an exception, the exception will propagate to the current caller
- * of dynamicWind.
- *
- *
If thunk.call() creates a continuation which is
- * later called from a continuation which does not include the
- * current call to dynamicWind,
- * before.run() will be called before control passes to
- * that continuation. As above, if this call throws an exception,
- * the exception will propagate to the current caller of
- * dynamicWind.
- */
- public static T dynamicWind(Runnable before,
- Callable thunk,
- Runnable after)
- throws Exception
- {
- UnwindResult result = dynamicWind2(before, thunk, after);
- if (result.continuation != null) {
- after.run();
- if (result.exception != null) {
- result.continuation.handleException(result.exception);
- } else {
- result.continuation.handleResult(result.result);
- }
- throw new AssertionError();
- } else {
- return (T) result.result;
- }
- }
-
- public static C reset(final Callable thunk) throws Exception {
- final Reset reset = new Reset(latestReset.get());
- latestReset.set(reset);
- try {
- Object result = callWithCurrentContinuation
- (new Function,Object>() {
- public Object call(Callback continuation) throws Exception {
- reset.continuation = continuation;
- return thunk.call();
- }
- });
-
- while (true) {
- Cell shift = reset.shifts;
- if (shift != null) {
- reset.shifts = shift.next;
- result = shift.value.call(result);
- } else {
- return (C) result;
- }
- }
- } finally {
- latestReset.set(reset.next);
- }
- }
-
- public static A shift
- (final Function,C> receiver)
- throws Exception
- {
- return (A) callWithCurrentContinuation
- (new Function,Object>() {
- public Object call(final Callback continuation) {
- final Reset reset = latestReset.get();
- reset.shifts = new Cell(new Function() {
- public Object call(Object ignored) throws Exception {
- return receiver.call
- (new Function() {
- public Object call(final Object argument)
- throws Exception
- {
- return callWithCurrentContinuation
- (new Function,Object>() {
- public Object call
- (final Callback shiftContinuation)
- throws Exception
- {
- reset.shifts = new Cell
- (new Function() {
- public Object call(Object result)
- throws Exception
- {
- shiftContinuation.handleResult(result);
- throw new AssertionError();
- }
- },
- reset.shifts);
-
- continuation.handleResult(argument);
- throw new AssertionError();
- }
- });
- }
- });
- }
-
- public void handleException(Throwable exception) {
- throw new AssertionError();
- }
- }, reset.shifts);
-
- reset.continuation.handleResult(null);
- throw new AssertionError();
- }
- });
- }
-
- private static native UnwindResult dynamicWind2(Runnable before,
- Callable thunk,
- Runnable after)
- throws Exception;
-
- private static UnwindResult wind(Runnable before,
- Callable thunk,
- Runnable after)
- throws Exception
- {
- before.run();
-
- try {
- return new UnwindResult(null, thunk.call(), null);
- } finally {
- after.run();
- }
- }
-
- private static void rewind(Runnable before,
- Callback continuation,
- Object result,
- Throwable exception)
- throws Exception
- {
- before.run();
-
- if (exception != null) {
- continuation.handleException(exception);
- } else {
- continuation.handleResult(result);
- }
-
- throw new AssertionError();
- }
-
- private static class Continuation implements Callback {
- public native void handleResult(T result);
- public native void handleException(Throwable exception);
- }
-
- private static class UnwindResult {
- public final Continuation continuation;
- public final Object result;
- public final Throwable exception;
-
- public UnwindResult(Continuation continuation, Object result,
- Throwable exception)
- {
- this.continuation = continuation;
- this.result = result;
- this.exception = exception;
- }
- }
-
- private static class Reset {
- public Callback continuation;
- public final Reset next;
- public Cell shifts;
-
- public Reset(Reset next) {
- this.next = next;
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/Data.java b/sgx-jvm/avian/classpath/avian/Data.java
deleted file mode 100644
index 0914362e83..0000000000
--- a/sgx-jvm/avian/classpath/avian/Data.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.AbstractSet;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Collections;
-
-public class Data {
- public static int nextPowerOfTwo(int n) {
- int r = 1;
- while (r < n) r <<= 1;
- return r;
- }
-
- public static boolean equal(V a, V b) {
- return a == null ? b == null : a.equals(b);
- }
-
- public static T[] toArray(Collection collection, T[] array) {
- Class c = array.getClass().getComponentType();
-
- if (array.length < collection.size()) {
- array = (T[]) java.lang.reflect.Array.newInstance(c, collection.size());
- }
-
- int i = 0;
- for (Object o: collection) {
- if (c.isInstance(o)) {
- array[i++] = (T) o;
- } else {
- throw new ArrayStoreException();
- }
- }
-
- return array;
- }
-
- public static String toString(Collection c) {
- StringBuilder sb = new StringBuilder();
- sb.append("[");
- for (Iterator it = c.iterator(); it.hasNext();) {
- sb.append(it.next());
- if (it.hasNext()) {
- sb.append(",");
- }
- }
- sb.append("]");
- return sb.toString();
- }
-
- public static String toString(Map m) {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- for (Iterator it = m.entrySet().iterator(); it.hasNext();) {
- Entry e = it.next();
- sb.append(e.getKey())
- .append("=")
- .append(e.getValue());
- if (it.hasNext()) {
- sb.append(",");
- }
- }
- sb.append("}");
- return sb.toString();
- }
-
- public interface EntryMap {
- public int size();
-
- public Entry find(Object key);
-
- public Entry remove(Object key);
-
- public void clear();
-
- public Iterator> iterator();
- }
-
- public static class EntrySet extends AbstractSet> {
- private final EntryMap map;
-
- public EntrySet(EntryMap map) {
- this.map = map;
- }
-
- public int size() {
- return map.size();
- }
-
- public boolean isEmpty() {
- return map.size() == 0;
- }
-
- public boolean contains(Object o) {
- return (o instanceof Entry)
- && map.find(((Entry)o).getKey()) != null;
- }
-
- public boolean add(Entry e) {
- throw new UnsupportedOperationException();
- }
-
- public boolean remove(Object o) {
- return (o instanceof Entry)
- && map.remove(((Entry) o).getKey()) != null;
- }
-
- public boolean remove(Entry e) {
- return map.remove(e.getKey()) != null;
- }
-
- public Object[] toArray() {
- return toArray(new Object[size()]);
- }
-
- public T[] toArray(T[] array) {
- return Data.toArray(this, array);
- }
-
- public void clear() {
- map.clear();
- }
-
- public Iterator> iterator() {
- return map.iterator();
- }
- }
-
- public static class KeySet extends AbstractSet {
- private final EntryMap map;
-
- public KeySet(EntryMap map) {
- this.map = map;
- }
-
- public int size() {
- return map.size();
- }
-
- public boolean isEmpty() {
- return map.size() == 0;
- }
-
- public boolean contains(Object key) {
- return map.find(key) != null;
- }
-
- public boolean add(K key) {
- throw new UnsupportedOperationException();
- }
-
- public boolean remove(Object key) {
- return map.remove(key) != null;
- }
-
- public Object[] toArray() {
- return toArray(new Object[size()]);
- }
-
- public T[] toArray(T[] array) {
- return Data.toArray(this, array);
- }
-
- public void clear() {
- map.clear();
- }
-
- public Iterator iterator() {
- return new KeyIterator(map.iterator());
- }
- }
-
- public static class Values implements Collection {
- private final EntryMap map;
-
- public Values(EntryMap map) {
- this.map = map;
- }
-
- public int size() {
- return map.size();
- }
-
- public boolean isEmpty() {
- return map.size() == 0;
- }
-
- public boolean contains(Object value) {
- for (Iterator> it = map.iterator(); it.hasNext();) {
- if (equal(it.next().getValue(), value)) {
- return true;
- }
- }
- return false;
- }
-
- public boolean containsAll(Collection c) {
- if (c == null) {
- throw new NullPointerException("collection is null");
- }
-
- for (Iterator it = c.iterator(); it.hasNext();) {
- if (! contains(it.next())) {
- return false;
- }
- }
-
- return true;
- }
-
- public boolean add(V value) {
- throw new UnsupportedOperationException();
- }
-
- public boolean addAll(Collection collection) {
- throw new UnsupportedOperationException();
- }
-
- public boolean remove(Object value) {
- for (Iterator> it = map.iterator();
- it.hasNext();)
- {
- if (equal(it.next().getValue(), value)) {
- it.remove();
- return true;
- }
- }
- return false;
- }
-
- public boolean removeAll(Collection c) {
- boolean changed = false;
- for (Iterator> it = map.iterator(); it.hasNext();) {
- if (c.contains(it.next().getValue())) {
- it.remove();
- changed = true;
- }
- }
- return changed;
- }
-
- public Object[] toArray() {
- return toArray(new Object[size()]);
- }
-
- public T[] toArray(T[] array) {
- return Data.toArray(this, array);
- }
-
- public void clear() {
- map.clear();
- }
-
- public Iterator iterator() {
- return new ValueIterator(map.iterator());
- }
- }
-
- public static class KeyIterator implements Iterator {
- private final Iterator> it;
-
- public KeyIterator(Iterator> it) {
- this.it = it;
- }
-
- public K next() {
- return it.next().getKey();
- }
-
- public boolean hasNext() {
- return it.hasNext();
- }
-
- public void remove() {
- it.remove();
- }
- }
-
- public static class ValueIterator implements Iterator {
- private final Iterator> it;
-
- public ValueIterator(Iterator> it) {
- this.it = it;
- }
-
- public V next() {
- return it.next().getValue();
- }
-
- public boolean hasNext() {
- return it.hasNext();
- }
-
- public void remove() {
- it.remove();
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/FieldAddendum.java b/sgx-jvm/avian/classpath/avian/FieldAddendum.java
deleted file mode 100644
index 525dfc6f3c..0000000000
--- a/sgx-jvm/avian/classpath/avian/FieldAddendum.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class FieldAddendum extends Addendum { }
diff --git a/sgx-jvm/avian/classpath/avian/FormatString.java b/sgx-jvm/avian/classpath/avian/FormatString.java
deleted file mode 100644
index a66c3cfa9e..0000000000
--- a/sgx-jvm/avian/classpath/avian/FormatString.java
+++ /dev/null
@@ -1,992 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.IllegalFormatException;
-import java.util.List;
-
-// ------------------------------------------------------------------------- //
-// things that must be done in order to call this semi-complete:
-// ------------------------------------------------------------------------- //
-// * get the date formatter working for individual fields at a minimum
-// ------------------------------------------------------------------------- //
-
-/**
- * A Java flavored printf for classpath-challenged JVMs.
- *
- * Each instance of this class is a threadsafe pre-parsed format pattern. Refer
- * to the very detailed class description of java.util.Formatter in the OpenJDK
- * API documentation for an explanation of the supported formats.
- *
- * Should be easily portable to other Java runtimes that do not include the
- * printf functionality that was introduced in Java 5.
- *
- * Aims to be lightweight and reasonably fast, and provide reasonably complete
- * API compatibility with the OpenJDK implementation. To clarify what
- * "reasonably complete" means in this context, this implementation should
- * accept any valid format string that the OpenJDK version accepts. However,
- * it should not be relied upon to throw an Exception for every format pattern
- * that the OpenJDK implementation does.
- *
- * If your program's behavior relies on the side effects from an Exception
- * being thrown for an invalid format string, this might not be for you.
- *
- * Perhaps more troubling is the fact that the correct localization of numbers
- * and temporal values is barely even attempted, even though the parser accepts
- * the flags without even a warning. However, now you have been warned.
- *
- * @author bcg
- */
-public final class FormatString {
-
- /** Parses a format string and returns a compiled representation of it. */
- public static final FormatString compile(String fmt) {
- return new FormatString(fmt);
- }
-
- /** The original string value that was parsed */
- public String source() {
- return _source;
- }
-
- /** Processes the supplied arguments through the compiled format string
- and returns the result as a String. */
- public final String format(Object... args) {
- final StringBuilder bldr = new StringBuilder();
- try {
- format(bldr, args);
- return bldr.toString();
- } catch (IOException e) {
- throw new IllegalStateException(
- "Should not get IOException when writing to StringBuilder", e
- );
- }
- }
-
- /** Processes the supplied arguments through the compiled format string
- and writes the result of each component directly to an Appendable */
- public final void format(final Appendable a, Object... fmt_args)
- throws IOException {
- final Object[] args = fmt_args != null ? fmt_args : new Object[0];
- int cntr = 0;
- for (final FmtCmpnt cmp : _components) {
- if (cmp._conversion == CONV_LITRL) {
- a.append(cmp._source);
- continue;
- }
- final Object arg;
- if (!acceptsArgument(cmp._conversion)) {
- arg = null;
- } else {
- final int index = cmp._argument_index;
- switch (index) {
- case AIDX_NONE:
- if ((cntr) >= args.length) {
- throw new IllegalFormatException(
- "Format specified at least " + (cntr+1) +
- " arguments, but " + cntr + " were supplied."
- );
- }
- arg = args[cntr++];
- break;
- case AIDX_PREV:
- arg = args[cntr];
- break;
- default:
- if (index < 1) {
- throw new IllegalArgumentException();
- } else if (index > args.length) {
- throw new IllegalArgumentException();
- } else {
- arg = args[index - 1];
- }
- }
- }
- convert(a, arg, cmp._conversion, cmp._flags, cmp._width, cmp._precision);
- }
- }
-
- //- conversions
- static final byte CONV_LITRL = 0x0;
- static final byte CONV_NLINE = 0x1;
- static final byte CONV_PRCNT = 0x2;
- static final byte CONV_BOOLN = 0x3;
- static final byte CONV_DTIME = 0x4;
- static final byte CONV_STRNG = 0x5;
- static final byte CONV_HCODE = 0x6;
- static final byte CONV_CHRCT = 0x7;
- static final byte CONV_DECML = 0x8;
- static final byte CONV_OCTAL = 0x9;
- static final byte CONV_HXDEC = 0xA;
- static final byte CONV_CPSCI = 0xB;
- static final byte CONV_GNSCI = 0xC;
- static final byte CONV_FLOAT = 0xD;
- static final byte CONV_HXEXP = 0xE;
-
- //- format component flags
- static final byte FLAG_FORCE_UPPER_CASE = (byte)(1<<7);
- static final byte FLAG_NEGATIVES_IN_PARENS = (byte)(1<<6); // ('(')
- static final byte FLAG_GROUPING_SEPARATORS = (byte)(1<<5); // (',')
- static final byte FLAG_LEADING_ZERO_PADDED = (byte)(1<<4); // ('0')
- static final byte FLAG_LEADING_SPACE_PADDED = (byte)(1<<3); // (' ')
- static final byte FLAG_ALWAYS_INCLUDES_SIGN = (byte)(1<<2); // ('+')
- static final byte FLAG_ALTERNATE_FORM = (byte)(1<<1); // ('#')
- static final byte FLAG_LEFT_JUSTIFIED = (byte)(1<<0); // ('-')
-
- //- conversion capability flags
- static final byte CFLG_WDTH_SUPPRT = CONV_PRCNT;
- static final byte CFLG_ACCEPTS_ARG = CONV_BOOLN;
- static final byte CFLG_NUMERIC_VAL = CONV_DECML;
- static final byte CFLG_PREC_SUPPRT = CONV_STRNG;
-
- //- special argument indices
- static final int AIDX_PREV = -1;
- static final int AIDX_NONE = 0;
-
- /** the original serialized format string */
- private final String _source;
-
- /** array of components parsed from the source string */
- private final FmtCmpnt[] _components;
-
- /*/ keeping this private for now to encourage access through the static
- compile method, which might allow caching format string instances if it
- turns out there is an advantage to that. /*/
- /** Constructor */
- private FormatString(final String fmt) {
- this._source = fmt;
- final List cmps = new ArrayList();
- for ( int i = 0; (i = next(fmt, cmps, i)) > -1; );
- this._components = cmps.toArray(new FmtCmpnt[cmps.size()]);
- }
-
- /** Iterates over the tokens in an input string to extract the components */
- private static final int next(
- final String fmt, final List cmps, final int startIndex) {
- final int strln = fmt.length();
- if (startIndex >= strln) {
- return -1;
- }
- final char c = fmt.charAt(startIndex);
- if (c == '%') {
- // this is the start of a specifier
- final FmtSpecBldr bldr = new FmtSpecBldr();
- for (int i = startIndex + 1; i < strln; i++) {
- final char ch = fmt.charAt(i);
- final FmtCmpnt cmp = bldr.append(ch);
- if (cmp != null) {
- cmps.add(cmp);
- return (i+1);
- }
- }
- throw new IllegalFormatException("Incomplete specifier at end of fmt");
- } else {
- // this is the start of a literal
- final StringBuilder literal = new StringBuilder();
- literal.append(c);
- for (int i = startIndex + 1; i < strln; i++) {
- final char ch = fmt.charAt(i);
- // write the current buffer if the next character starts a specifier
- if (ch == '%') {
- final FmtCmpnt cmp = new FmtCmpnt(literal.toString());
- cmps.add(cmp);
- return i;
- }
- literal.append(ch);
- }
- // write the current buffer if the end of the format has been reached
- final FmtCmpnt cmp = new FmtCmpnt(literal.toString());
- cmps.add(cmp);
- return -1;
- }
- }
-
- /** Checks a flag byte to see if a given flag is set. Only FLAG_* constants
- from the enclosing class should be passed in for toCheck... otherwise the
- behavior is undefined. */
- static final boolean checkFlag(final byte flags, final byte toCheck) {
- return (flags & toCheck) != 0;
- }
-
- /** Checks if a given conversion accepts(requires) an argument. Only the CONV_
- flags from the enclosing class should be passed in, otherwise the result
- of this method is undefined as should not be used. */
- static final boolean acceptsArgument(final byte conversion) {
- return conversion >= CFLG_ACCEPTS_ARG;
- }
-
- /** Checks if a given conversion allows specifying a precision. Only the CONV_
- flags from the enclosing class should be passed in, otherwise the result
- of this method is undefined as should not be used. */
- static final boolean precisionSupported(final byte conversion) {
- return conversion >= CFLG_PREC_SUPPRT;
- }
-
- /** Checks if a given conversion allows specifying a width. Only the CONV_
- flags from the enclosing class should be passed in, otherwise the result
- of this method is undefined and should not be trusted. */
- static final boolean widthSupported(final byte conversion) {
- return conversion >= CFLG_WDTH_SUPPRT;
- }
-
- /** Checks if a given conversion expects a numeric value. Only the CONV_
- flags from the enclosing class should be passed in, otherwise the result
- of this method is undefined and should not be trusted. */
- static final boolean isNumeric(final byte conversion) {
- return conversion >= CFLG_NUMERIC_VAL;
- }
-
- /** The newline character for the current platform. */
- static final String NEWLINE = System.getProperty("line.separator");
-
- /** Performs conversion on the supplied argument */
- static final void convert(
- final Appendable appendable,
- final Object arg,
- final byte conversion,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- int radix = 0;
- switch (conversion) {
- case CONV_LITRL:
- throw new IllegalArgumentException("cannot convert a literal");
- case CONV_NLINE:
- appendable.append(NEWLINE);
- return;
- case CONV_PRCNT:
- convertPercent(appendable, arg, flags, width, precision);
- return;
- case CONV_BOOLN:
- convertBoolean(appendable, arg, flags, width, precision);
- return;
- case CONV_DTIME:
- convertDate(appendable, arg, flags, width, precision);
- return;
- case CONV_STRNG:
- convertString(appendable, arg, flags, width, precision);
- return;
- case CONV_HCODE:
- convertHashcode(appendable, arg, flags, width, precision);
- return;
- case CONV_CHRCT:
- convertChar(appendable, arg, flags, width, precision);
- return;
- case CONV_DECML: if (radix == 0) { radix = 10; };
- case CONV_OCTAL: if (radix == 0) { radix = 8; };
- case CONV_HXDEC: if (radix == 0) { radix = 16; };
- if (arg instanceof Long) {
- convertLong(appendable, (Long) arg, flags, width, precision, radix);
- } else {
- convertInteger(appendable, arg, flags, width, precision, radix);
- }
- return;
- case CONV_CPSCI:
- case CONV_GNSCI:
- case CONV_FLOAT:
- case CONV_HXEXP:
- convertFloat(appendable, arg, flags, width, precision, 10);
- return;
- }
- throw new IllegalStateException("not implemented: " + conversion);
- }
-
- static void convertPercent(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val = "%";
- appendify(a, val, flags, width, precision);
- }
-
- static void convertDate(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val = (arg == null) ? "null" : arg.toString();
- appendify(a, val, flags, width, precision);
- }
-
- static void convertString(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val = (arg == null) ? "null" : arg.toString();
- appendify(a, val, flags, width, precision);
- }
-
- static void convertHashcode(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val = (arg == null)
- ? "null"
- : Integer.toHexString(arg.hashCode());
- appendify(a, val, flags, width, precision);
- }
-
- static void convertBoolean(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val;
- if (arg == null) {
- val = "false";
- } else if (arg instanceof Boolean) {
- val = String.valueOf(arg);
- } else {
- val = "true";
- }
- appendify(a, val, flags, width, precision);
- }
-
- static void convertChar(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- final String val;
- if (arg instanceof Character) {
- val = ((Character) arg).toString();
- } else if ( arg instanceof Byte ||
- arg instanceof Short ||
- arg instanceof Integer ){
- final int codePoint = ((Number) arg).intValue();
- if (codePoint >= 0 && codePoint <= 0x10FFFF) { //<-- isValidCodePoint()?
- val = new String(Character.toChars(codePoint));
- } else {
- throw new IllegalFormatException("Invalid code point: " + arg);
- }
- } else {
- throw new IllegalFormatException("Cannot do char conversion: " + arg);
- }
- appendify(a, val, flags, width, precision);
- }
-
- // FIXME: this is broken for octal formats with negative values
- static void convertLong(
- final Appendable a,
- final Long arg,
- final byte flags,
- final int width,
- final int precision,
- final int radix) throws IOException {
- final String val;
- final Long n = arg;
- final long longValue = n.longValue();
- if (radix == 10 || longValue > -1) {
- val = Long.toString(longValue, radix);
- } else {
- final long upper = 0xFFFFFFFFL&(longValue>>31);
- final long lower = 0xFFFFFFFFL&(longValue);
- val = Long.toString(upper, radix) + Long.toString(lower, radix);
- }
- appendify(a, val, flags, width, precision);
- }
-
- static void convertInteger(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision,
- final int radix) throws IOException {
- final String val;
- final Number n = (Number) arg;
- final long longValue = n.longValue();
- final long modifier;
- if (arg instanceof Integer) modifier = 0xFFFFFFFFL+1; else
- if (arg instanceof Short) modifier = 0xFFFFL+1; else
- if (arg instanceof Byte) modifier = 0xFFL+1;
- else throw new IllegalFormatException(
- "not an integer number: " + (arg != null ? arg.getClass() : null)
- );
- if (radix != 10 && longValue < 0) {
- val = Long.toString(longValue + modifier, radix);
- } else {
- val = Long.toString(longValue, radix);
- }
- appendify(a, val, flags, width, precision);
- }
-
- // FIXME: I'm lazy, so hexidecimal exponential isn't implemented, sorry - bcg
- static void convertFloat(
- final Appendable a,
- final Object arg,
- final byte flags,
- final int width,
- final int precision,
- final int radix) throws IOException {
- final String val;
- final Number n = (Number) arg;
- if (arg instanceof Float) {
- val = Float.toString(n.floatValue());
- } else if (arg instanceof Double) {
- val = Double.toString(n.doubleValue());
- } else {
- throw new IllegalFormatException(
- "not a floating point number: " + (arg != null ? arg.getClass() : null)
- );
- }
- appendify(a, val, flags, width, precision);
- }
-
- static void appendify(
- final Appendable a,
- final String val,
- final byte flags,
- final int width,
- final int precision) throws IOException {
- String result = val;
- if (checkFlag(flags, FLAG_FORCE_UPPER_CASE)) {
- result = result.toUpperCase();
- }
- // TODO: implement other flags
- // (+) always include sign
- // (,) grouping separators
- // (() negatives in parentheses
- if (precision > 0) {
- // FIXME: this behavior should be different for floating point numbers
- final int difference = result.length() - precision;
- if (difference > 0) {
- result = result.substring(0, precision);
- a.append(result);
- return;
- }
- }
- if (width > 0) {
- final int difference = width - result.length();
- final boolean leftJustified = checkFlag(flags, FLAG_LEFT_JUSTIFIED);
- if (!leftJustified && difference > 0) {
- char fill = checkFlag(flags, FLAG_LEADING_ZERO_PADDED) ? '0' : ' ';
- fill(a, difference, fill);
- }
- a.append(result);
- if (leftJustified && difference > 0) {
- fill(a, difference, ' ');
- }
- return;
- }
- a.append(result);
- }
-
- private static void fill(Appendable a, int num, char c) throws IOException {
- while (num > 0) {
- a.append(c);
- num--;
- }
- }
-
- /** Represents a single chunk of the format string, either a literal or one of
- the specifiers documented in OpenJDK's javadoc for java.util.Formatter.
- This struct is immutable so can be safely shared across threads. */
- private static final class FmtCmpnt {
-
- private final String _source;
- private final byte _conversion;
- private final int _argument_index;
- private final int _width;
- private final int _precision;
- private final byte _flags;
-
- private FmtCmpnt(final String literal) {
- this(literal, CONV_LITRL, 0, 0, 0, (byte)0);
- }
- private FmtCmpnt(
- final String src,
- final byte conversion,
- final int argumentIndex,
- final int width,
- final int precision,
- final byte flags) {
- this._source = src;
- this._conversion = conversion;
- this._argument_index = argumentIndex;
- this._width = width;
- this._precision = precision;
- this._flags = flags;
- }
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{ ")
- .append("source = '").append(_source).append("', ")
- .append("conversion = ").append(_conversion).append(", ")
- .append("flags = ").append(Byte.toString(_flags, 2)).append(", ")
- .append("arg_index = ").append(_argument_index).append(", ")
- .append("width = ").append(_width).append(", ")
- .append("precision = ").append(_precision).append(", ")
- .append("}");
- return sb.toString();
- }
- }
-
- /**
- * Helper class for parsing a stream of characters into FmtCmpnt objects.
- */
- private static final class FmtSpecBldr {
-
- private StringBuilder _source;
- private byte _conversion;
- private int _argument_index;
- private int _width;
- private int _precision;
- private byte _flags;
-
- private FmtSpecBldr() {
- this.init();
- }
-
- private final void init() {
- _argument_index =
- _width =
- _precision =
- _conversion =
- _flags = 0;
- _source = null;
- }
-
- private final FmtCmpnt build() {
- final FmtCmpnt result = new FmtCmpnt(
- _source.toString(),
- _conversion,
- _argument_index,
- _width,
- _precision,
- _flags
- );
- init();
- return result;
- }
-
- private final FmtCmpnt append(char c) {
-
- if (_source == null) {
- _source = new StringBuilder();
- }
- _source.append(c);
-
- // FIXME: none of these date formats are implemented, because lazy
- // if a datetime is specified, after the conversion character a time
- // format specifier is expected. This is the only case where a character
- // is allowed after the conversion character.
- if (_conversion == CONV_DTIME) switch (c) {
-
- // Hour of the day for the 24-hour clock, formatted as two digits with a
- // leading zero as necessary i.e. 00 - 23.
- case 'H':
-
- // Hour for the 12-hour clock, formatted as two digits with a leading
- // zero as necessary, i.e. 01 - 12.
- case 'I':
-
- // Hour of the day for the 24-hour clock, i.e. 0 - 23.
- case 'k':
-
- // Hour for the 12-hour clock, i.e. 1 - 12.
- case 'l':
-
- // Minute within the hour formatted as two digits with a leading zero
- // as necessary, i.e. 00 - 59.
- case 'M':
-
- // Seconds within the minute, formatted as two digits with a leading
- // zero as necessary, i.e. 00 - 60 ("60" is a special value required to
- // support leap seconds).
- case 'S':
-
- // Millisecond within the second formatted as three digits with leading
- // zeros as necessary, i.e. 000 - 999.
- case 'L':
-
- // Nanosecond within the second, formatted as nine digits with leading
- // zeros as necessary, i.e. 000000000 - 999999999.
- case 'N':
-
- // Locale-specific morning or afternoon marker in lower case,
- // e.g."am" or "pm". Use of the conversion prefix 'T' forces this
- // output to upper case.
- case 'p':
-
- // RFC 822 style numeric time zone offset from GMT, e.g. -0800.
- case 'z':
-
- // A string representing the abbreviation for the time zone. The
- // Formatter's locale will supersede the locale of the argument
- // (if any).
- case 'Z':
-
- // Seconds since the beginning of the epoch
- // starting at 1 January 1970 00:00:00 UTC,
- // i.e. Long.MIN_VALUE/1000 to Long.MAX_VALUE/1000.
- case 's':
-
- // Milliseconds since the beginning of the epoch
- // starting at 1 January 1970 00:00:00 UTC,
- // i.e. Long.MIN_VALUE to Long.MAX_VALUE.
- case 'Q':
-
- // ------------------------------------------------------------------
- // The following conversion characters are used for formatting dates:
- // ------------------------------------------------------------------
-
- // Locale-specific full month name, e.g. "January", "February".
- case 'B':
-
- // Locale-specific abbreviated month name, e.g. "Jan", "Feb".
- case 'b':
-
- // Same as 'b'.
- case 'h':
-
- // Locale-specific full name of the day of the week, e.g. "Sunday"
- case 'A':
-
- // Locale-specific short name of the day of the week, e.g. "Sun"
- case 'a':
-
- // Four-digit year divided by 100, formatted as two digits with leading
- // zero as necessary, i.e. 00 - 99
- case 'C':
-
- // Year, formatted as at least four digits with leading zeros
- // as necessary, e.g. 0092 equals 92 CE for the Gregorian calendar.
- case 'Y':
-
- // Last two digits of the year, formatted with leading zeros
- // as necessary, i.e. 00 - 99.
- case 'y':
-
- // Day of year, formatted as three digits with leading zeros
- // as necessary, e.g. 001 - 366 for the Gregorian calendar.
- case 'j':
-
- // Month, formatted as two digits with leading zeros as necessary,
- // i.e. 01 - 13.
- case 'm':
-
- // Day of month, formatted as two digits with leading zeros as
- // necessary, i.e. 01 - 31
- case 'd':
-
- // Day of month, formatted as two digits, i.e. 1 - 31.
- case 'e':
-
- // -------------------------------------------------------------------
- // The following conversion characters are used for formatting common
- // date/time compositions.
- // -------------------------------------------------------------------
-
- // Time formatted for the 24-hour clock as "%tH:%tM"
- case 'R':
-
- // Time formatted for the 24-hour clock as "%tH:%tM:%tS".
- case 'T':
-
- // Time formatted for the 12-hour clock as "%tI:%tM:%tS %Tp". The location
- // of the morning or afternoon marker ('%Tp') may be locale-dependent.
- case 'r':
-
- // Date formatted as "%tm/%td/%ty".
- case 'D':
-
- // ISO 8601 complete date formatted as "%tY-%tm-%td".
- case 'F':
-
- // Date and time formatted as "%ta %tb %td %tT %tZ %tY", e.g.
- // "Sun Jul 20 16:17:00 EDT 1969".
- case 'c':
- return seal(CONV_DTIME);
-
- default:
- throw new IllegalFormatException("Illegal date/time modifier: " + c);
- }
-
- // -- Flags and Switches -----------------------------------------------
- // these are the possible characters for flags, width, etc. if the input
- // is not one of these characters, it needs to be a valid conversion char.
- // because the possible flags can vary based on the type of conversion,
- // it is easiest to just buffer the flags, argument index, etc. until a
- // conversion character has been reached. The seal() method will then
- // work out if the specified flags are valid for the given conversion.
- switch (c) {
- case '$':
- case '<':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- case '-':
- case '+':
- case '\'':
- case ' ':
- case '#':
- case ',':
- case '.':
- case '(':
- return null;
- // -- End of Flags and Switches ----------------------------------------
-
- // -- Conversion characters --------------------------------------------
- // If this point is reached, then the current character must be a valid
- // conversion character. If it is not, it should fall through the rest
- // of the switch statement below and throw an IllegalFormatException
-
- // string conversion
- case 'S':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 's':
- return seal(CONV_STRNG);
-
- // newline conversion
- case 'n':
- return seal(CONV_NLINE);
-
- // percent conversion
- case '%':
- return seal(CONV_PRCNT);
-
- // decimal numeric conversion
- case 'd':
- return seal(CONV_DECML);
-
- // hexidecimal numeric conversion
- case 'X':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'x':
- return seal(CONV_HXDEC);
-
- // datetime conversion
- case 'T':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 't':
- _conversion = CONV_DTIME;
- return null;
-
- // boolean conversion
- case 'B':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'b':
- return seal(CONV_BOOLN);
-
- // hashcode conversion
- case 'H':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'h':
- return seal(CONV_HCODE);
-
- // character conversion
- case 'C':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'c':
- return seal(CONV_CHRCT);
-
- // octal numeric conversion
- case 'o':
- return seal(CONV_OCTAL);
-
- // computerized scientific conversion
- case 'E':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'e':
- return seal(CONV_CPSCI);
-
- // floating point conversion
- case 'f':
- return seal(CONV_FLOAT);
-
- // general scientific floating point conversion
- case 'G':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'g':
- return seal(CONV_GNSCI);
-
- // hexidecimal exponential floating point conversion
- case 'A':
- setFlagTrue(FLAG_FORCE_UPPER_CASE);
- case 'a':
- return seal(CONV_HXEXP);
- // -- End of Conversion characters --------------------------------------
-
- default:
- throw new IllegalFormatException(
- "Invalid character encountered while parsing specifier: " + c);
- }
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{ ")
- .append("source = '").append(_source).append("', ")
- .append("conversion = ").append(_conversion).append(", ")
- .append("flags = ").append(Byte.toString(_flags, 2)).append(", ")
- .append("arg_index = ").append(_argument_index).append(", ")
- .append("width = ").append(_width).append(", ")
- .append("precision = ").append(_precision).append(", ")
- .append("}");
- return sb.toString();
- }
-
- private final FmtCmpnt seal(final byte conversion) {
-
- // throwing IllegalStateException instead of IllegalFormatException
- // because this should only occur if there is a bug in the append()
- // method. In that case I'd prefer to fail fast even if the user is
- // explicitly trying to catch IllegalFormatException.
- if (conversion < 0 || conversion > 0xE) {
- throw new IllegalArgumentException();
- }
-
- this._conversion = conversion;
-
- // if the length is less than 2, it must mean that only the conversion
- // character was specified. Since a conversion character by itself is a
- // valid pattern, just build and return
- if (_source.length() < 2) {
- return build();
- }
-
- // ---------------------------------------------------------------------
- // spec format: [argument_index$][flags][width][.precision]
- // ---------------------------------------------------------------------
- // the last character of the spec is the conversion character which has
- // already been translated the appropriate byte by the append() method,
- // so the last character gets chopped off before processing
- final String spec = _source.substring(0, _source.length() - 1);
-
- // if argument index is supported, it should be followed by a '$' and be
- // comprised only of digit characters, or it should be a single '<' char
- final int dollarIndex = spec.indexOf('$');
- if (dollarIndex > -1) {
- if (acceptsArgument(conversion)) {
- if (spec.charAt(dollarIndex - 1) == '<') {
- _argument_index = AIDX_PREV;
- } else {
- _argument_index = Integer.valueOf(spec.substring(0, dollarIndex));
- }
- } else {
- throw new IllegalFormatException(
- "Formats that do not accept arguments cannot specify an index."
- );
- }
- }
- if (dollarIndex == (spec.length() - 1)) {
- return build();
- }
-
- // if precision is supported, look for the first period and assume that
- // everything before is the width and everything after is the precision
- final int dotIndex = spec.indexOf('.');
- if (dotIndex > -1) {
- if (precisionSupported(conversion)) {
- _precision = Integer.valueOf(spec.substring(dotIndex + 1));
- } else {
- throw new IllegalFormatException(
- "Precision is not supported for " + conversion
- );
- }
- }
-
- // Now loop over the remaining characters to get the width as well as any
- // applicable flags. Note: 0 is a valid flag so must be handled carefully
- final String remaining = spec.substring(
- Math.max(dollarIndex, 0), dotIndex > -1 ? dotIndex : spec.length()
- );
- int flagsEnd = -1;
- for (int i = 0, n = remaining.length(); i < n && (flagsEnd == -1); i++) {
- final char c = remaining.charAt(i);
- switch (c) {
- case '-':
- ensureLeftJustifySupported();
- setFlagTrue(FLAG_LEFT_JUSTIFIED);
- break;
- case '#':
- ensureNumeric(c);
- setFlagTrue(FLAG_ALTERNATE_FORM);
- break;
- case '+':
- ensureNumeric(c);
- setFlagTrue(FLAG_ALWAYS_INCLUDES_SIGN);
- break;
- case ' ':
- ensureNumeric(c);
- setFlagTrue(FLAG_LEADING_SPACE_PADDED);
- break;
- case ',':
- ensureNumeric(c);
- setFlagTrue(FLAG_GROUPING_SEPARATORS);
- break;
- case '(':
- ensureNumeric(c);
- setFlagTrue(FLAG_NEGATIVES_IN_PARENS);
- break;
- case '0':
- ensureNumeric(c);
- setFlagTrue(FLAG_LEADING_ZERO_PADDED);
- break;
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- flagsEnd = i;
- _width = Integer.valueOf(remaining.substring(flagsEnd));
- return build();
- }
- }
- throw new IllegalStateException();
- }
- private final void ensureLeftJustifySupported() {
- if (!widthSupported(_conversion)) {
- throw new IllegalFormatException(
- "Conversion must support width if specifying left justified."
- );
- }
- }
- private final void ensureNumeric(final char c) {
- if (!isNumeric(_conversion)) {
- throw new IllegalFormatException(
- "flag " + c + " only supported on numeric specifiers."
- );
- }
- }
- private final void setFlagTrue(final byte flag) {
- _flags |= flag;
- }/*
- final void setFlagFalse(final byte flag) {
- _flags &= ~flag;
- }*/
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/Function.java b/sgx-jvm/avian/classpath/avian/Function.java
deleted file mode 100644
index 246a3ae512..0000000000
--- a/sgx-jvm/avian/classpath/avian/Function.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public interface Function {
- public B call(A argument) throws Exception;
-}
diff --git a/sgx-jvm/avian/classpath/avian/IncompatibleContinuationException.java b/sgx-jvm/avian/classpath/avian/IncompatibleContinuationException.java
deleted file mode 100644
index 15007c0fc0..0000000000
--- a/sgx-jvm/avian/classpath/avian/IncompatibleContinuationException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class IncompatibleContinuationException extends Exception {
- public IncompatibleContinuationException(String message) {
- super(message);
- }
-
- public IncompatibleContinuationException() {
- super();
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/InnerClassReference.java b/sgx-jvm/avian/classpath/avian/InnerClassReference.java
deleted file mode 100644
index 614a4da93a..0000000000
--- a/sgx-jvm/avian/classpath/avian/InnerClassReference.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class InnerClassReference {
- public byte[] inner;
- public byte[] outer;
- public byte[] name;
- public short flags;
-}
diff --git a/sgx-jvm/avian/classpath/avian/Iso88591.java b/sgx-jvm/avian/classpath/avian/Iso88591.java
deleted file mode 100644
index dcdb7baf6a..0000000000
--- a/sgx-jvm/avian/classpath/avian/Iso88591.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.io.ByteArrayOutputStream;
-
-public class Iso88591 {
-
- public static byte[] encode(char[] s16, int offset, int length) {
- ByteArrayOutputStream buf = new ByteArrayOutputStream();
- for (int i = offset; i < offset+length; ++i) {
- // ISO-88591-1/Latin-1 is the same as UTF-16 under 0x100
- buf.write(s16[i]);
- }
- return buf.toByteArray();
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/LegacyObjectInputStream.java b/sgx-jvm/avian/classpath/avian/LegacyObjectInputStream.java
deleted file mode 100644
index 8738048dd7..0000000000
--- a/sgx-jvm/avian/classpath/avian/LegacyObjectInputStream.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import avian.VMClass;
-
-import java.util.HashMap;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PushbackReader;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-public class LegacyObjectInputStream extends InputStream {
- private final InputStream in;
- private final PushbackReader r;
-
- public LegacyObjectInputStream(InputStream in) {
- this.in = in;
- this.r = new PushbackReader(new InputStreamReader(in));
- }
-
- public int read() throws IOException {
- return in.read();
- }
-
- public int read(byte[] b, int offset, int length) throws IOException {
- return in.read(b, offset, length);
- }
-
- public void close() throws IOException {
- in.close();
- }
-
- public Object readObject() throws IOException, ClassNotFoundException {
- return readObject(new HashMap());
- }
-
- public boolean readBoolean() throws IOException {
- read('z');
- return readLongToken() != 0;
- }
-
- public byte readByte() throws IOException {
- read('b');
- return (byte) readLongToken();
- }
-
- public char readChar() throws IOException {
- read('c');
- return (char) readLongToken();
- }
-
- public short readShort() throws IOException {
- read('s');
- return (short) readLongToken();
- }
-
- public int readInt() throws IOException {
- read('i');
- return (int) readLongToken();
- }
-
- public long readLong() throws IOException {
- read('j');
- return readLongToken();
- }
-
- public float readFloat() throws IOException {
- read('f');
- return (float) readDoubleToken();
- }
-
- public double readDouble() throws IOException {
- read('d');
- return readDoubleToken();
- }
-
- public void defaultReadObject() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- private void skipSpace() throws IOException {
- int c;
- while ((c = r.read()) != -1 && Character.isWhitespace((char) c));
- if (c != -1) {
- r.unread(c);
- }
- }
-
- private void read(char v) throws IOException {
- skipSpace();
-
- int c = r.read();
- if (c != v) {
- if (c == -1) {
- throw new EOFException();
- } else {
- throw new StreamCorruptedException();
- }
- }
- }
-
- private String readStringToken() throws IOException {
- skipSpace();
-
- StringBuilder sb = new StringBuilder();
- int c;
- while ((c = r.read()) != -1 && ! Character.isWhitespace((char) c) && c != ')') {
- sb.append((char) c);
- }
- if (c != -1) {
- r.unread(c);
- }
- return sb.toString();
- }
-
- private long readLongToken() throws IOException {
- return Long.parseLong(readStringToken());
- }
-
- private double readDoubleToken() throws IOException {
- return Double.parseDouble(readStringToken());
- }
-
- private Object readObject(HashMap map)
- throws IOException, ClassNotFoundException
- {
- skipSpace();
- switch (r.read()) {
- case 'a':
- return deserializeArray(map);
- case 'l':
- return deserializeObject(map);
- case 'n':
- return null;
- case -1:
- throw new EOFException();
- default:
- throw new StreamCorruptedException();
- }
- }
-
- private Object deserialize(HashMap map)
- throws IOException, ClassNotFoundException
- {
- skipSpace();
- switch (r.read()) {
- case 'a':
- return deserializeArray(map);
- case 'l':
- return deserializeObject(map);
- case 'r':
- return map.get((int) readLongToken());
- case 'n':
- return null;
- case 'z':
- return (readLongToken() != 0);
- case 'b':
- return (byte) readLongToken();
- case 'c':
- return (char) readLongToken();
- case 's':
- return (short) readLongToken();
- case 'i':
- return (int) readLongToken();
- case 'j':
- return readLongToken();
- case 'f':
- return (float) readDoubleToken();
- case 'd':
- return readDoubleToken();
- case -1:
- throw new EOFException();
- default:
- throw new StreamCorruptedException();
- }
- }
-
- private Object deserializeArray(HashMap map)
- throws IOException, ClassNotFoundException
- {
- read('(');
- int id = (int) readLongToken();
- Class c = Class.forName(readStringToken());
- int length = (int) readLongToken();
- Class t = c.getComponentType();
- Object o = Array.newInstance(t, length);
-
- map.put(id, o);
-
- for (int i = 0; i < length; ++i) {
- Array.set(o, i, deserialize(map));
- }
-
- read(')');
-
- return o;
- }
-
- private static native Object makeInstance(VMClass c);
-
- private Object deserializeObject(HashMap map)
- throws IOException, ClassNotFoundException
- {
- read('(');
- int id = (int) readLongToken();
- Class c = Class.forName(readStringToken());
- Object o = makeInstance(c.vmClass);
-
- map.put(id, o);
-
- for (Field f: c.getAllFields()) {
- int modifiers = f.getModifiers();
- if ((modifiers & (Modifier.TRANSIENT | Modifier.STATIC)) == 0) {
- try {
- f.set(o, deserialize(map));
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- read(')');
-
- return o;
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/LegacyObjectOutputStream.java b/sgx-jvm/avian/classpath/avian/LegacyObjectOutputStream.java
deleted file mode 100644
index a55c18230e..0000000000
--- a/sgx-jvm/avian/classpath/avian/LegacyObjectOutputStream.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.util.IdentityHashMap;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.io.NotSerializableException;
-
-public class LegacyObjectOutputStream extends OutputStream {
- private final PrintStream out;
-
- public LegacyObjectOutputStream(OutputStream out) {
- this.out = new PrintStream(out);
- }
-
- public void write(int c) throws IOException {
- out.write(c);
- }
-
- public void write(byte[] b, int offset, int length) throws IOException {
- out.write(b, offset, length);
- }
-
- public void flush() throws IOException {
- out.flush();
- }
-
- public void close() throws IOException {
- out.close();
- }
-
- public void writeObject(Object o) throws IOException {
- writeObject(o, new IdentityHashMap(), new int[] {0});
- }
-
- public void writeBoolean(boolean v) {
- out.print("z");
- out.print((v ? 1 : 0));
- }
-
- public void writeByte(byte v) {
- out.print("b");
- out.print((int) v);
- }
-
- public void writeChar(char v) {
- out.print("c");
- out.print((int) v);
- }
-
- public void writeShort(short v) {
- out.print("s");
- out.print((int) v);
- }
-
- public void writeInt(int v) {
- out.print("i");
- out.print(v);
- }
-
- public void writeLong(long v) {
- out.print("j");
- out.print(v);
- }
-
- public void writeFloat(float v) {
- out.print("f");
- out.print(v);
- }
-
- public void writeDouble(double v) {
- out.print("d");
- out.print(v);
- }
-
- public void defaultWriteObject() throws IOException {
- throw new UnsupportedOperationException();
- }
-
- private void writeObject(Object o, IdentityHashMap map,
- int[] nextId)
- throws IOException
- {
- if (o == null) {
- out.print("n");
- } else {
- Integer id = map.get(o);
- if (id == null) {
- map.put(o, nextId[0]);
-
- Class c = o.getClass();
- if (c.isArray()) {
- serializeArray(o, map, nextId);
- } else if (Serializable.class.isAssignableFrom(c)) {
- serializeObject(o, map, nextId);
- } else {
- throw new NotSerializableException(c.getName());
- }
- } else {
- out.print("r");
- out.print(id.intValue());
- }
- }
- }
-
- private void serializeArray(Object o, IdentityHashMap map,
- int[] nextId)
- throws IOException
- {
- Class c = o.getClass();
- Class t = c.getComponentType();
- int length = Array.getLength(o);
-
- out.print("a(");
- out.print(nextId[0]++);
- out.print(" ");
- out.print(c.getName());
- out.print(" ");
- out.print(length);
-
- for (int i = 0; i < length; ++i) {
- out.print(" ");
- Object v = Array.get(o, i);
- if (t.equals(boolean.class)) {
- writeBoolean((Boolean) v);
- } else if (t.equals(byte.class)) {
- writeByte((Byte) v);
- } else if (t.equals(char.class)) {
- writeChar((Character) v);
- } else if (t.equals(short.class)) {
- writeShort((Short) v);
- } else if (t.equals(int.class)) {
- writeInt((Integer) v);
- } else if (t.equals(long.class)) {
- writeLong((Long) v);
- } else if (t.equals(float.class)) {
- writeFloat((Float) v);
- } else if (t.equals(double.class)) {
- writeDouble((Double) v);
- } else {
- writeObject(v, map, nextId);
- }
- }
-
- out.print(")");
- }
-
- private void serializeObject(Object o, IdentityHashMap map,
- int[] nextId)
- throws IOException
- {
- Class c = o.getClass();
-
- out.print("l(");
- out.print(nextId[0]++);
- out.print(" ");
- out.print(c.getName());
-
- for (Field f: c.getAllFields()) {
- int modifiers = f.getModifiers();
- if ((modifiers & (Modifier.TRANSIENT | Modifier.STATIC)) == 0) {
- out.print(" ");
- Object v;
-
- try {
- v = f.get(o);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- Class t = f.getType();
- if (t.equals(boolean.class)) {
- writeBoolean((Boolean) v);
- } else if (t.equals(byte.class)) {
- writeByte((Byte) v);
- } else if (t.equals(char.class)) {
- writeChar((Character) v);
- } else if (t.equals(short.class)) {
- writeShort((Short) v);
- } else if (t.equals(int.class)) {
- writeInt((Integer) v);
- } else if (t.equals(long.class)) {
- writeLong((Long) v);
- } else if (t.equals(float.class)) {
- writeFloat((Float) v);
- } else if (t.equals(double.class)) {
- writeDouble((Double) v);
- } else {
- writeObject(v, map, nextId);
- }
- }
- }
-
- out.print(")");
- }
-
-}
diff --git a/sgx-jvm/avian/classpath/avian/Machine.java b/sgx-jvm/avian/classpath/avian/Machine.java
deleted file mode 100644
index 00c6ea2f15..0000000000
--- a/sgx-jvm/avian/classpath/avian/Machine.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import sun.misc.Unsafe;
-import java.lang.reflect.Field;
-
-public abstract class Machine {
-
- private static final Unsafe unsafe;
-
- static {
- Unsafe u;
- try {
- Field f = Unsafe.class.getDeclaredField("theUnsafe");
- f.setAccessible(true);
- u = (Unsafe)f.get(null);
- } catch (Exception e) {
- u = null;
- }
- unsafe = u;
- }
-
- public static native void dumpHeap(String outputFile);
-
- public static Unsafe getUnsafe() {
- return unsafe;
- }
-
- /**
- * Short version: Don't use this function -- it's evil.
- *
- * Long version: This is kind of a poor man's, cross-platform
- * version of Microsoft's Structured Exception Handling. The idea
- * is that you can call a native function with the specified
- * argument such that any OS signals raised (e.g. SIGSEGV, SIGBUS,
- * SIGFPE, EXC_ACCESS_VIOLATION, etc.) prior to the function
- * returning are converted into the appropriate Java exception
- * (e.g. NullPointerException, ArithmeticException, etc.) and thrown
- * from this method. This may be useful in very specific
- * circumstances, e.g. to work around a bug in a library that would
- * otherwise crash your app. On the other hand, you'd be much
- * better off just fixing the library if possible.
- *
- * Caveats: The specified function should return quickly without
- * blocking, since it will block critical VM features such as
- * garbage collection. The implementation is equivalent to using
- * setjmp/longjmp to achieve a non-local return from the signal
- * handler, meaning C++ destructors and other cleanup code might not
- * be run if a signal is raised. It might melt your keyboard and
- * burn your fingertips. Caveat lector.
- *
- * @param function a function pointer of type int64_t (*)(int64_t)
- * @param argument the argument to pass to the function
- * @return the return value of the function
- */
- public static native long tryNative(long function, long argument);
-
-}
diff --git a/sgx-jvm/avian/classpath/avian/MethodAddendum.java b/sgx-jvm/avian/classpath/avian/MethodAddendum.java
deleted file mode 100644
index 11f6b9ff15..0000000000
--- a/sgx-jvm/avian/classpath/avian/MethodAddendum.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class MethodAddendum extends Addendum {
- public Object exceptionTable;
- public Object annotationDefault;
- public Object parameterAnnotationTable;
-}
diff --git a/sgx-jvm/avian/classpath/avian/Pair.java b/sgx-jvm/avian/classpath/avian/Pair.java
deleted file mode 100644
index dff3313542..0000000000
--- a/sgx-jvm/avian/classpath/avian/Pair.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package avian;
-
-abstract class Pair {
- // VM-visible fields in types.def
-}
diff --git a/sgx-jvm/avian/classpath/avian/PersistentSet.java b/sgx-jvm/avian/classpath/avian/PersistentSet.java
deleted file mode 100644
index c257807ade..0000000000
--- a/sgx-jvm/avian/classpath/avian/PersistentSet.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.util.Comparator;
-
-public class PersistentSet implements Iterable {
- private static final Node NullNode = new Node(null);
-
- static {
- NullNode.left = NullNode;
- NullNode.right = NullNode;
- }
-
- private final Node root;
- private final Comparator comparator;
- private final int size;
-
- public PersistentSet() {
- this(NullNode, new Comparator() {
- public int compare(T a, T b) {
- return ((Comparable) a).compareTo(b);
- }
- }, 0);
- }
-
- public PersistentSet(Comparator comparator) {
- this(NullNode, comparator, 0);
- }
-
- private PersistentSet(Node root, Comparator comparator, int size) {
- this.root = root;
- this.comparator = comparator;
- this.size = size;
- }
-
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- for (java.util.Iterator it = iterator(); it.hasNext();) {
- sb.append(it.next());
- if (it.hasNext()) {
- sb.append(",");
- }
- }
- sb.append("}");
- return sb.toString();
- }
-
- public Comparator comparator() {
- return comparator;
- }
-
- public PersistentSet add(T value) {
- return add(value, false);
- }
-
- public int size() {
- return size;
- }
-
- public PersistentSet add(T value, boolean replaceExisting) {
- Path p = find(value);
- if (! p.fresh) {
- if (replaceExisting) {
- return p.replaceWith(value);
- } else {
- return this;
- }
- }
-
- return add(p);
- }
-
- private PersistentSet add(Path p) {
- if (! p.fresh) throw new IllegalArgumentException();
-
- Node new_ = p.node;
- Node newRoot = p.root.root;
- Cell> ancestors = p.ancestors;
-
- // rebalance
- new_.red = true;
- while (ancestors != null && ancestors.value.red) {
- if (ancestors.value == ancestors.next.value.left) {
- if (ancestors.next.value.right.red) {
- ancestors.value.red = false;
- ancestors.next.value.right = new Node(ancestors.next.value.right);
- ancestors.next.value.right.red = false;
- ancestors.next.value.red = true;
- new_ = ancestors.next.value;
- ancestors = ancestors.next.next;
- } else {
- if (new_ == ancestors.value.right) {
- new_ = ancestors.value;
- ancestors = ancestors.next;
-
- Node n = leftRotate(new_);
- if (ancestors.value.right == new_) {
- ancestors.value.right = n;
- } else {
- ancestors.value.left = n;
- }
- ancestors = new Cell(n, ancestors);
- }
- ancestors.value.red = false;
- ancestors.next.value.red = true;
-
- Node n = rightRotate(ancestors.next.value);
- if (ancestors.next.next == null) {
- newRoot = n;
- } else if (ancestors.next.next.value.right == ancestors.next.value) {
- ancestors.next.next.value.right = n;
- } else {
- ancestors.next.next.value.left = n;
- }
- // done
- }
- } else {
- if (ancestors.next.value.left.red) {
- ancestors.value.red = false;
- ancestors.next.value.left = new Node(ancestors.next.value.left);
- ancestors.next.value.left.red = false;
- ancestors.next.value.red = true;
- new_ = ancestors.next.value;
- ancestors = ancestors.next.next;
- } else {
- if (new_ == ancestors.value.left) {
- new_ = ancestors.value;
- ancestors = ancestors.next;
-
- Node n = rightRotate(new_);
- if (ancestors.value.right == new_) {
- ancestors.value.right = n;
- } else {
- ancestors.value.left = n;
- }
- ancestors = new Cell(n, ancestors);
- }
- ancestors.value.red = false;
- ancestors.next.value.red = true;
-
- Node n = leftRotate(ancestors.next.value);
- if (ancestors.next.next == null) {
- newRoot = n;
- } else if (ancestors.next.next.value.right == ancestors.next.value) {
- ancestors.next.next.value.right = n;
- } else {
- ancestors.next.next.value.left = n;
- }
- // done
- }
- }
- }
-
- newRoot.red = false;
-
- return new PersistentSet(newRoot, comparator, size + 1);
- }
-
- private static Node leftRotate(Node n) {
- Node child = new Node(n.right);
- n.right = child.left;
- child.left = n;
- return child;
- }
-
- private static Node rightRotate(Node n) {
- Node child = new Node(n.left);
- n.left = child.right;
- child.right = n;
- return child;
- }
-
- public PersistentSet remove(T value) {
- Path p = find(value);
- if (! p.fresh) {
- return remove(p);
- }
-
- return this;
- }
-
- private PersistentSet remove(Path p) {
- if (size == 1) {
- if (p.node != root) {
- throw new IllegalArgumentException();
- }
- return new PersistentSet(NullNode, comparator, 0);
- }
-
- Node new_ = p.node;
- Node newRoot = p.root.root;
- Cell> ancestors = p.ancestors;
-
- Node dead;
- if (new_.left == NullNode || new_.right == NullNode) {
- dead = new_;
- } else {
- Cell> path = successor(new_, ancestors);
- dead = path.value;
- ancestors = path.next;
- }
-
- Node child;
- if (dead.left != NullNode) {
- child = new Node(dead.left);
- } else if (dead.right != NullNode) {
- child = new Node(dead.right);
- } else {
- child = NullNode;
- }
-
- if (ancestors == null) {
- child.red = false;
- return new PersistentSet(child, comparator, 1);
- } else if (dead == ancestors.value.left) {
- ancestors.value.left = child;
- } else {
- ancestors.value.right = child;
- }
-
- if (dead != new_) {
- new_.value = dead.value;
- }
-
- if (! dead.red) {
- // rebalance
- while (ancestors != null && ! child.red) {
- if (child == ancestors.value.left) {
- Node sibling = ancestors.value.right
- = new Node(ancestors.value.right);
- if (sibling.red) {
- sibling.red = false;
- ancestors.value.red = true;
-
- Node n = leftRotate(ancestors.value);
- if (ancestors.next == null) {
- newRoot = n;
- } else if (ancestors.next.value.right == ancestors.value) {
- ancestors.next.value.right = n;
- } else {
- ancestors.next.value.left = n;
- }
- ancestors.next = new Cell(n, ancestors.next);
-
- sibling = ancestors.value.right = new Node(ancestors.value.right);
- }
-
- if (! (sibling.left.red || sibling.right.red)) {
- sibling.red = true;
- child = ancestors.value;
- ancestors = ancestors.next;
- } else {
- if (! sibling.right.red) {
- sibling.left = new Node(sibling.left);
- sibling.left.red = false;
-
- sibling.red = true;
- sibling = ancestors.value.right = rightRotate(sibling);
- }
-
- sibling.red = ancestors.value.red;
- ancestors.value.red = false;
-
- sibling.right = new Node(sibling.right);
- sibling.right.red = false;
-
- Node n = leftRotate(ancestors.value);
- if (ancestors.next == null) {
- newRoot = n;
- } else if (ancestors.next.value.right == ancestors.value) {
- ancestors.next.value.right = n;
- } else {
- ancestors.next.value.left = n;
- }
-
- child = newRoot;
- ancestors = null;
- }
- } else {
- Node sibling = ancestors.value.left
- = new Node(ancestors.value.left);
- if (sibling.red) {
- sibling.red = false;
- ancestors.value.red = true;
-
- Node n = rightRotate(ancestors.value);
- if (ancestors.next == null) {
- newRoot = n;
- } else if (ancestors.next.value.left == ancestors.value) {
- ancestors.next.value.left = n;
- } else {
- ancestors.next.value.right = n;
- }
- ancestors.next = new Cell(n, ancestors.next);
-
- sibling = ancestors.value.left = new Node(ancestors.value.left);
- }
-
- if (! (sibling.right.red || sibling.left.red)) {
- sibling.red = true;
- child = ancestors.value;
- ancestors = ancestors.next;
- } else {
- if (! sibling.left.red) {
- sibling.right = new Node(sibling.right);
- sibling.right.red = false;
-
- sibling.red = true;
- sibling = ancestors.value.left = leftRotate(sibling);
- }
-
- sibling.red = ancestors.value.red;
- ancestors.value.red = false;
-
- sibling.left = new Node(sibling.left);
- sibling.left.red = false;
-
- Node n = rightRotate(ancestors.value);
- if (ancestors.next == null) {
- newRoot = n;
- } else if (ancestors.next.value.left == ancestors.value) {
- ancestors.next.value.left = n;
- } else {
- ancestors.next.value.right = n;
- }
-
- child = newRoot;
- ancestors = null;
- }
- }
- }
-
- child.red = false;
- }
-
- return new PersistentSet(newRoot, comparator, size - 1);
- }
-
- private static Cell> minimum(Node n,
- Cell> ancestors)
- {
- while (n.left != NullNode) {
- n.left = new Node(n.left);
- ancestors = new Cell(n, ancestors);
- n = n.left;
- }
-
- return new Cell(n, ancestors);
- }
-
- private static Cell> maximum(Node n,
- Cell> ancestors)
- {
- while (n.right != NullNode) {
- n.right = new Node(n.right);
- ancestors = new Cell(n, ancestors);
- n = n.right;
- }
-
- return new Cell(n, ancestors);
- }
-
- private static Cell> successor(Node n,
- Cell> ancestors)
- {
- if (n.right != NullNode) {
- n.right = new Node(n.right);
- return minimum(n.right, new Cell(n, ancestors));
- }
-
- while (ancestors != null && n == ancestors.value.right) {
- n = ancestors.value;
- ancestors = ancestors.next;
- }
-
- return ancestors;
- }
-
- private static Cell> predecessor(Node n,
- Cell> ancestors)
- {
- if (n.left != NullNode) {
- n.left = new Node(n.left);
- return maximum(n.left, new Cell(n, ancestors));
- }
-
- while (ancestors != null && n == ancestors.value.left) {
- n = ancestors.value;
- ancestors = ancestors.next;
- }
-
- return ancestors;
- }
-
- public Path find(T value) {
- Node newRoot = new Node(root);
- Cell> ancestors = null;
-
- Node old = root;
- Node new_ = newRoot;
- while (old != NullNode) {
- ancestors = new Cell(new_, ancestors);
-
- int difference = comparator.compare(value, old.value);
- if (difference < 0) {
- old = old.left;
- new_ = new_.left = new Node(old);
- } else if (difference > 0) {
- old = old.right;
- new_ = new_.right = new Node(old);
- } else {
- return new Path(false, new_,
- new PersistentSet(newRoot, comparator, size),
- ancestors.next);
- }
- }
-
- new_.value = value;
- return new Path(true, new_,
- new PersistentSet(newRoot, comparator, size),
- ancestors);
- }
-
- public Path first() {
- if (root == NullNode) return null;
-
- Node newRoot = new Node(root);
- Cell> ancestors = null;
-
- Node old = root;
- Node new_ = newRoot;
- while (old.left != NullNode) {
- ancestors = new Cell(new_, ancestors);
-
- old = old.left;
- new_ = new_.left = new Node(old);
- }
-
- return new Path(true, new_,
- new PersistentSet(newRoot, comparator, size),
- ancestors);
- }
-
- public Path last() {
- if (root == NullNode) return null;
-
- Node newRoot = new Node(root);
- Cell> ancestors = null;
-
- Node old = root;
- Node new_ = newRoot;
- while (old.right != NullNode) {
- ancestors = new Cell(new_, ancestors);
-
- old = old.right;
- new_ = new_.right = new Node(old);
- }
-
- return new Path(true, new_,
- new PersistentSet(newRoot, comparator, size),
- ancestors);
- }
-
- public java.util.Iterator iterator() {
- return new Iterator(first());
- }
-
- private Path successor(Path p) {
- Cell> s = successor(p.node, p.ancestors);
- if (s == null) {
- return null;
- } else {
- return new Path(false, s.value, p.root, s.next);
- }
- }
-
- private Path predecessor(Path p) {
- Cell> s = predecessor(p.node, p.ancestors);
- if (s == null) {
- return null;
- } else {
- return new Path(false, s.value, p.root, s.next);
- }
- }
-
- private static class Node {
- public T value;
- public Node left;
- public Node right;
- public boolean red;
-
- public Node(Node basis) {
- if (basis != null) {
- value = basis.value;
- left = basis.left;
- right = basis.right;
- red = basis.red;
- }
- }
- }
-
- public static class Path {
- private final boolean fresh;
- private final Node node;
- private final PersistentSet root;
- private final Cell> ancestors;
-
- public Path(boolean fresh, Node node, PersistentSet root,
- Cell> ancestors)
- {
- this.fresh = fresh;
- this.node = node;
- this.root = root;
- this.ancestors = ancestors;
- }
-
- public T value() {
- return node.value;
- }
-
- public boolean fresh() {
- return fresh;
- }
-
- public PersistentSet root() {
- return root;
- }
-
- public Path successor() {
- return root.successor(this);
- }
-
- public Path predecessor() {
- return root.predecessor(this);
- }
-
- public PersistentSet remove() {
- if (fresh) throw new IllegalStateException();
-
- return root.remove(this);
- }
-
- public PersistentSet add() {
- if (! fresh) throw new IllegalStateException();
-
- return root.add(this);
- }
-
- public PersistentSet replaceWith(T value) {
- if (fresh) throw new IllegalStateException();
- if (root.comparator.compare(node.value, value) != 0)
- throw new IllegalArgumentException();
-
- node.value = value;
- return root;
- }
- }
-
- public class Iterator implements java.util.Iterator {
- private PersistentSet.Path path;
-
- private Iterator(PersistentSet.Path path) {
- this.path = path;
- }
-
- private Iterator(Iterator start) {
- path = start.path;
- }
-
- public boolean hasNext() {
- return path != null;
- }
-
- public T next() {
- PersistentSet.Path p = path;
- path = path.successor();
- return p.value();
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/Singleton.java b/sgx-jvm/avian/classpath/avian/Singleton.java
deleted file mode 100644
index c866169b6e..0000000000
--- a/sgx-jvm/avian/classpath/avian/Singleton.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public abstract class Singleton {
- public static native int getInt(Object singleton, int offset);
- public static native long getLong(Object singleton, int offset);
- public static native Object getObject(Object singleton, int offset);
-
- // Fields in types.def
-}
diff --git a/sgx-jvm/avian/classpath/avian/Stream.java b/sgx-jvm/avian/classpath/avian/Stream.java
deleted file mode 100644
index eb2859d432..0000000000
--- a/sgx-jvm/avian/classpath/avian/Stream.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.EOFException;
-
-public abstract class Stream {
- public static void write1(OutputStream out, int v) throws IOException {
- out.write(v & 0xFF);
- }
-
- public static int read1(InputStream in) throws IOException {
- return in.read();
- }
-
- public static void write2(OutputStream out, int v) throws IOException {
- out.write((v >>> 8) & 0xFF);
- out.write((v ) & 0xFF);
- }
-
- public static int read2(InputStream in) throws IOException {
- int b1 = in.read();
- int b2 = in.read();
- if (b2 == -1) throw new EOFException();
- return ((b1 << 8) | (b2 & 0xFF));
- }
-
- public static void write4(OutputStream out, int v) throws IOException {
- out.write((v >>> 24) & 0xFF);
- out.write((v >>> 16) & 0xFF);
- out.write((v >>> 8) & 0xFF);
- out.write((v ) & 0xFF);
- }
-
- public static int read4(InputStream in) throws IOException {
- int b1 = in.read();
- int b2 = in.read();
- int b3 = in.read();
- int b4 = in.read();
- if (b4 == -1) throw new EOFException();
- return ((b1 << 24) | (b2 << 16) | (b3 << 8) | (b4));
- }
-
- public static void write8(OutputStream out, long v) throws IOException {
- write4(out, (int) (v >>> 32) & 0xFFFFFFFF);
- write4(out, (int) (v ) & 0xFFFFFFFF);
- }
-
- public static long read8(InputStream in) throws IOException {
- long b1 = in.read();
- long b2 = in.read();
- long b3 = in.read();
- long b4 = in.read();
- long b5 = in.read();
- long b6 = in.read();
- long b7 = in.read();
- long b8 = in.read();
- if (b8 == -1) throw new EOFException();
- return ((b1 << 56) | (b2 << 48) | (b3 << 40) | (b4 << 32) |
- (b5 << 24) | (b6 << 16) | (b7 << 8) | (b8));
- }
-
- public static void set4(byte[] array, int offset, int v) {
- array[offset ] = (byte) ((v >>> 24) & 0xFF);
- array[offset + 1] = (byte) ((v >>> 16) & 0xFF);
- array[offset + 2] = (byte) ((v >>> 8) & 0xFF);
- array[offset + 3] = (byte) ((v ) & 0xFF);
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/SystemClassLoader.java b/sgx-jvm/avian/classpath/avian/SystemClassLoader.java
deleted file mode 100644
index 9727e61173..0000000000
--- a/sgx-jvm/avian/classpath/avian/SystemClassLoader.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-public class SystemClassLoader extends ClassLoader {
- public static native ClassLoader appLoader();
-
- private native VMClass findVMClass(String name)
- throws ClassNotFoundException;
-
- @Override
- protected Class findClass(String name) throws ClassNotFoundException {
- return getClass(findVMClass(name));
- }
-
- public static native Class getClass(VMClass vmClass);
-
- public static native VMClass vmClass(Class jClass);
-
- private native VMClass findLoadedVMClass(String name);
-
- private static native void startBlacklisting0(Thread t);
-
- public void startBlacklisting(Thread t) {
- if (isForbidden("java/util/regex/Pattern$Test")) {
- throw new IllegalStateException("Impossible!");
- }
- startBlacklisting0(t);
- }
-
- private static final Set BLACKLIST = Collections.unmodifiableSet(setOf(
- Pattern.compile("^java/lang/reflect/"),
- Pattern.compile("^java/lang/invoke/"),
- Pattern.compile("^java/io/File"),
- Pattern.compile("^java/net/"),
- Pattern.compile("^java/.*Random$"),
- Pattern.compile("^java/util/concurrent/"),
- Pattern.compile("^java/lang/ClassLoader$"),
- Pattern.compile("^java/lang/(Inheritable)?ThreadLocal$"),
- Pattern.compile("^java/lang/Thread$"),
- Pattern.compile("^com/sun/"),
- Pattern.compile("^sun/")
- ));
-
- private static Set setOf(T... items) {
- Set set = new LinkedHashSet();
- Collections.addAll(set, items);
- return set;
- }
-
- /*
- * Invoked via JNI, so uses the specification
- * rather than the class name.
- */
- private static boolean isForbidden(String spec) {
- for (Pattern bad : BLACKLIST) {
- if (bad.matcher(spec).find()) {
- return true;
- }
- }
- return false;
- }
-
- protected Class reallyFindLoadedClass(String name){
- VMClass c = findLoadedVMClass(name);
- return c == null ? null : getClass(c);
- }
-
- @Override
- protected Class loadClass(String name, boolean resolve)
- throws ClassNotFoundException
- {
- Class c = findLoadedClass(name);
- if (c == null) {
- ClassLoader parent = getParent();
- if (parent != null) {
- try {
- c = parent.loadClass(name);
- } catch (ClassNotFoundException ok) { }
- }
-
- if (c == null) {
- c = findClass(name);
- }
- }
-
- if (resolve) {
- resolveClass(c);
- }
-
- return c;
- }
-
- private native String resourceURLPrefix(String name);
-
- protected URL findResource(String name) {
- String prefix = resourceURLPrefix(name);
- if (prefix != null) {
- try {
- return new URL(prefix + name);
- } catch (MalformedURLException ignored) { }
- }
- return null;
- }
-
- protected static native String getPackageSource(String name);
-
- // OpenJDK's java.lang.ClassLoader.getResource makes use of
- // sun.misc.Launcher to load bootstrap resources, which is not
- // appropriate for the Avian build, so we override it to ensure we
- // get the behavior we want. This implementation is the same as
- // that of Avian's java.lang.ClassLoader.getResource.
- @Override
- public URL getResource(String path) {
- URL url = null;
- ClassLoader parent = getParent();
- if (parent != null) {
- url = parent.getResource(path);
- }
-
- if (url == null) {
- url = findResource(path);
- }
-
- return url;
- }
-
- // As above, we override this method to avoid inappropriate behavior
- // in OpenJDK's java.lang.ClassLoader.getResources.
- @Override
- public Enumeration getResources(String name) throws IOException {
- Collection urls = new ArrayList(5);
-
- ClassLoader parent = getParent();
- if (parent != null) {
- for (Enumeration e = parent.getResources(name);
- e.hasMoreElements();)
- {
- urls.add(e.nextElement());
- }
- }
-
- Enumeration urls2 = findResources(name);
- while (urls2.hasMoreElements()) {
- urls.add(urls2.nextElement());
- }
-
- return Collections.enumeration(urls);
- }
-
- private class ResourceEnumeration implements Enumeration {
- private long[] finderElementPtrPtr;
- private String name, urlPrefix;
-
- public ResourceEnumeration(String name) {
- this.name = name;
- finderElementPtrPtr = new long[1];
- urlPrefix = nextResourceURLPrefix();
- }
-
- private native String nextResourceURLPrefix(SystemClassLoader loader,
- String name, long[] finderElementPtrPtr);
-
- private String nextResourceURLPrefix() {
- return nextResourceURLPrefix(SystemClassLoader.this, name,
- finderElementPtrPtr);
- }
-
- public boolean hasMoreElements() {
- return urlPrefix != null;
- }
-
- public URL nextElement() {
- if (urlPrefix == null) throw new NoSuchElementException();
- URL result;
- try {
- result = new URL(urlPrefix + name);
- } catch (MalformedURLException ignored) {
- result = null;
- }
- if (finderElementPtrPtr[0] == 0l) urlPrefix = null;
- else urlPrefix = nextResourceURLPrefix();
- return result;
- }
- }
-
- protected Enumeration findResources(String name) {
- return new ResourceEnumeration(name);
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/Utf8.java b/sgx-jvm/avian/classpath/avian/Utf8.java
deleted file mode 100644
index 2c32fec9de..0000000000
--- a/sgx-jvm/avian/classpath/avian/Utf8.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-import java.io.ByteArrayOutputStream;
-
-public class Utf8 {
- public static boolean test(Object data) {
- if (!(data instanceof byte[])) return false;
- byte[] b = (byte[])data;
- for (int i = 0; i < b.length; ++i) {
- if (((int)b[i] & 0x080) != 0) return true;
- }
- return false;
- }
-
- public static byte[] encode(char[] s16, int offset, int length) {
- ByteArrayOutputStream buf = new ByteArrayOutputStream();
- for (int i = offset; i < offset+length; ++i) {
- char c = s16[i];
- if (c == '\u0000') { // null char
- buf.write(0);
- buf.write(0);
- } else if (c < 0x080) { // 1 byte char
- buf.write(c);
- } else if (c < 0x0800) { // 2 byte char
- buf.write(0x0c0 | (c >>> 6));
- buf.write(0x080 | (c & 0x03f));
- } else { // 3 byte char
- buf.write(0x0e0 | ((c >>> 12) & 0x0f));
- buf.write(0x080 | ((c >>> 6) & 0x03f));
- buf.write(0x080 | (c & 0x03f));
- }
- }
- return buf.toByteArray();
- }
-
- public static Object decode(byte[] s8, int offset, int length) {
- Object buf = new byte[length];
- boolean isMultiByte = false;
- int i=offset, j=0;
- while (i < offset+length) {
- int x = s8[i++];
- if ((x & 0x080) == 0x0) { // 1 byte char
- if (x == 0) { // 2 byte null char
- if (i == offset + length) {
- return null;
- }
- ++ i;
- }
- cram(buf, j++, x);
- } else if ((x & 0x0e0) == 0x0c0) { // 2 byte char
- if (i == offset + length) {
- return null;
- }
-
- if (!isMultiByte) {
- buf = widen(buf, j, length-1);
- isMultiByte = true;
- }
- int y = s8[i++];
- cram(buf, j++, ((x & 0x1f) << 6) | (y & 0x3f));
- } else if ((x & 0x0f0) == 0x0e0) { // 3 byte char
- if (i + 1 >= offset + length) {
- return null;
- }
-
- if (!isMultiByte) {
- buf = widen(buf, j, length-2);
- isMultiByte = true;
- }
- int y = s8[i++]; int z = s8[i++];
- cram(buf, j++, ((x & 0xf) << 12) | ((y & 0x3f) << 6) | (z & 0x3f));
- }
- }
-
- return trim(buf, j);
- }
-
- public static char[] decode16(byte[] s8, int offset, int length) {
- Object decoded = decode(s8, offset, length);
- if (decoded == null) {
- return null;
- } else if (decoded instanceof char[]) {
- return (char[])decoded;
- } else {
- return (char[])widen(decoded, length, length);
- }
- }
-
- private static void cram(Object data, int index, int val) {
- if (data instanceof byte[]) ((byte[])data)[index] = (byte)val;
- else ((char[])data)[index] = (char)val;
- }
-
- private static Object widen(Object data, int length, int capacity) {
- byte[] src = (byte[])data;
- char[] result = new char[capacity];
- for (int i = 0; i < length; ++i) result[i] = (char)((int)src[i] & 0x0ff);
- return result;
- }
-
- private static Object trim(Object data, int length) {
- if (data instanceof byte[]) return data;
- if (((char[])data).length == length) return data;
- char[] result = new char[length];
- System.arraycopy(data, 0, result, 0, length);
- return result;
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/VMClass.java b/sgx-jvm/avian/classpath/avian/VMClass.java
deleted file mode 100644
index 8960670775..0000000000
--- a/sgx-jvm/avian/classpath/avian/VMClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class VMClass {
- public short flags;
- public short vmFlags;
- public short fixedSize;
- public byte arrayElementSize;
- public byte arrayDimensions;
- public VMClass arrayElementClass;
- public int runtimeDataIndex;
- public int[] objectMask;
- public byte[] name;
- public byte[] sourceFile;
- public VMClass super_;
- public Object[] interfaceTable;
- public VMMethod[] virtualTable;
- public VMField[] fieldTable;
- /**
- * Methods declared in this class, plus any abstract virtual methods
- * inherited from implemented or extended interfaces. If addendum
- * is non-null and addendum.declaredMethodCount is non-negative,
- * then the first addendum.declaredMethodCount methods are declared
- * methods, while the rest are abstract virtual methods. If
- * addendum is null or addendum.declaredMethodCount is negative, all
- * are declared methods.
- */
- public VMMethod[] methodTable;
- public ClassAddendum addendum;
- public Singleton staticTable;
- public ClassLoader loader;
- public byte[] source;
-}
diff --git a/sgx-jvm/avian/classpath/avian/VMField.java b/sgx-jvm/avian/classpath/avian/VMField.java
deleted file mode 100644
index 2f2715d121..0000000000
--- a/sgx-jvm/avian/classpath/avian/VMField.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class VMField {
- public byte vmFlags;
- public byte code;
- public short flags;
- public short offset;
- public int nativeID;
- public byte[] name;
- public byte[] spec;
- public FieldAddendum addendum;
- public VMClass class_;
-}
diff --git a/sgx-jvm/avian/classpath/avian/VMMethod.java b/sgx-jvm/avian/classpath/avian/VMMethod.java
deleted file mode 100644
index 53af6e9c80..0000000000
--- a/sgx-jvm/avian/classpath/avian/VMMethod.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian;
-
-public class VMMethod {
- public byte vmFlags;
- public byte returnCode;
- public byte parameterCount;
- public byte parameterFootprint;
- public short flags;
- public short offset;
- public int nativeID;
- public int runtimeDataIndex;
- public byte[] name;
- public byte[] spec;
- public MethodAddendum addendum;
- public VMClass class_;
- public Code code;
-
- public boolean hasAnnotations() {
- return addendum != null && addendum.annotationTable != null;
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/avianvmresource/Handler.java b/sgx-jvm/avian/classpath/avian/avianvmresource/Handler.java
deleted file mode 100644
index 2e25a6bafc..0000000000
--- a/sgx-jvm/avian/classpath/avian/avianvmresource/Handler.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian.avianvmresource;
-
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.URLConnection;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-public class Handler extends URLStreamHandler {
- protected URLConnection openConnection(URL url) {
- return new ResourceConnection(url);
- }
-
- private static class ResourceConnection extends URLConnection {
- public ResourceConnection(URL url) {
- super(url);
- }
-
- public int getContentLength() {
- return ResourceInputStream.getContentLength(url.getFile());
- }
-
- public InputStream getInputStream() throws IOException {
- return new ResourceInputStream(url.getFile());
- }
-
- public void connect() {
- // ignore
- }
- }
-
- private static class ResourceInputStream extends InputStream {
- private long peer;
- private int position;
-
- public ResourceInputStream(String path) throws IOException {
- peer = open(path);
- if (peer == 0) {
- throw new FileNotFoundException(path);
- }
- }
-
- private static native int getContentLength(String path);
-
- private static native long open(String path) throws IOException;
-
- private static native int read(long peer, int position) throws IOException;
-
- private static native int read(long peer, int position,
- byte[] b, int offset, int length)
- throws IOException;
-
- public static native void close(long peer) throws IOException;
-
- public static native int available(long peer, int position);
-
- public int available() {
- return available(peer, position);
- }
-
- public int read() throws IOException {
- if (peer != 0) {
- int c = read(peer, position);
- if (c >= 0) {
- ++ position;
- }
- return c;
- } else {
- throw new IOException();
- }
- }
-
- public int read(byte[] b, int offset, int length) throws IOException {
- if (peer != 0) {
- if (b == null) {
- throw new NullPointerException();
- }
-
- if (offset < 0 || offset + length > b.length) {
- throw new ArrayIndexOutOfBoundsException();
- }
-
- int c = read(peer, position, b, offset, length);
- if (c >= 0) {
- position += c;
- }
- return c;
- } else {
- throw new IOException();
- }
- }
-
- public void close() throws IOException {
- if (peer != 0) {
- close(peer);
- peer = 0;
- }
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/file/Handler.java b/sgx-jvm/avian/classpath/avian/file/Handler.java
deleted file mode 100644
index 2ac476ff65..0000000000
--- a/sgx-jvm/avian/classpath/avian/file/Handler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian.file;
-
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.URLConnection;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-public class Handler extends URLStreamHandler {
- protected URLConnection openConnection(URL url) {
- return new FileURLConnection(url);
- }
-
- private static class FileURLConnection extends URLConnection {
- public FileURLConnection(URL url) {
- super(url);
- }
-
- public int getContentLength() {
- return (int) new File(url.getFile()).length();
- }
-
- public InputStream getInputStream() throws IOException {
- return new FileInputStream(new File(url.getFile()));
- }
-
- public void connect() {
- // ignore
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/avian/jar/Handler.java b/sgx-jvm/avian/classpath/avian/jar/Handler.java
deleted file mode 100644
index b4a24de288..0000000000
--- a/sgx-jvm/avian/classpath/avian/jar/Handler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-package avian.jar;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.net.URLStreamHandler;
-import java.net.JarURLConnection;
-import java.net.URLConnection;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
-
-public class Handler extends URLStreamHandler {
- protected URLConnection openConnection(URL url) {
- return new MyJarURLConnection(url);
- }
-
- protected void parseURL(URL url, String s, int start, int end)
- throws MalformedURLException
- {
- // skip "jar:"
- s = s.toString().substring(4);
- int index = s.indexOf("!/");
- if (index < 0) {
- throw new MalformedURLException();
- }
-
- URL file = new URL(s.substring(0, index));
- if (! "file".equals(file.getProtocol())) {
- throw new RuntimeException
- ("protocol " + file.getProtocol() + " not yet supported");
- }
-
- url.set("jar", null, -1, s, null);
- }
-
- private static class MyJarURLConnection extends JarURLConnection {
- private final JarFile file;
- private final JarEntry entry;
-
- public MyJarURLConnection(URL url) {
- super(url);
-
- String s = url.getFile();
- int index = s.indexOf("!/");
-
- try {
- this.file = new JarFile(new URL(s.substring(0, index)).getFile());
- this.entry = this.file.getJarEntry(s.substring(index + 2));
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public JarFile getJarFile() throws IOException {
- return file;
- }
-
- public int getContentLength() {
- return (int)entry.getSize();
- }
-
- public InputStream getInputStream() throws IOException {
- return file.getInputStream(entry);
- }
-
- public void connect() {
- // ignore
- }
- }
-}
diff --git a/sgx-jvm/avian/classpath/dalvik/system/BaseDexClassLoader.java b/sgx-jvm/avian/classpath/dalvik/system/BaseDexClassLoader.java
deleted file mode 100644
index 27049cea21..0000000000
--- a/sgx-jvm/avian/classpath/dalvik/system/BaseDexClassLoader.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package dalvik.system;
-
-public class BaseDexClassLoader extends ClassLoader {
- public native String getLdLibraryPath();
-}
diff --git a/sgx-jvm/avian/classpath/java-io.cpp b/sgx-jvm/avian/classpath/java-io.cpp
deleted file mode 100644
index 2cf264efbd..0000000000
--- a/sgx-jvm/avian/classpath/java-io.cpp
+++ /dev/null
@@ -1,935 +0,0 @@
-/* Copyright (c) 2008-2015, Avian Contributors
-
- Permission to use, copy, modify, and/or distribute this software
- for any purpose with or without fee is hereby granted, provided
- that the above copyright notice and this permission notice appear
- in all copies.
-
- There is NO WARRANTY for this software. See license.txt for
- details. */
-
-#include
-#include
-#include
-#include
-#include
-#include