Merge pull request #2 from ReadyTalk/master

Update personal avian to current readytalk/avian

README.md

@@ -59,7 +59,7 @@ Avian can currently target the following platforms:
 
   * Linux (i386, x86_64, ARM, and 32-bit PowerPC)
   * Windows (i386 and x86_64)
-  * Mac OS X (i386, x86_64 and 32-bit PowerPC)
+  * Mac OS X (i386 and x86_64)
   * Apple iOS (i386 and ARM)
   * FreeBSD (i386, x86_64)
 
@@ -357,36 +357,74 @@ the following, starting from the Avian directory:
     cd ..
     mkdir -p android/system android/external
     cd android
+
     git clone https://android.googlesource.com/platform/bionic
+    (cd bionic && \
+       git checkout 84983592ade3ec7d72d082262fb6646849979bfc)
+    
     git clone https://android.googlesource.com/platform/system/core \
       system/core
-    git clone https://android.googlesource.com/platform/external/expat \
+    (cd system/core && \
-      external/expat
+       git checkout fafcabd0dd4432de3c7f5956edec23f6ed241b56)
+
     git clone https://android.googlesource.com/platform/external/fdlibm \
       external/fdlibm
+    (cd external/fdlibm && \
+       git checkout 0da5f683c9ddc9442af3b389b4220e91ccffb320)
+
     git clone https://android.googlesource.com/platform/external/icu4c \
       external/icu4c
+    (cd external/icu4c && \
+       git checkout 8fd45e08f1054d80a356ef8aa05659a2ba84707c)
+
     git clone https://android.googlesource.com/platform/libnativehelper
+    (cd libnativehelper && \
+       git checkout cf5ac0ec696fce7fac6b324ec7d4d6da217e501c)
+
     git clone https://android.googlesource.com/platform/external/openssl \
       external/openssl
+    (cd external/openssl && \
+       git checkout 7b972f1aa23172c4430ada7f3236fa1fd9b31756)
+
     git clone https://android.googlesource.com/platform/external/zlib \
       external/zlib
+    (cd external/zlib && \
+       git checkout 15b6223aa57a347ce113729253802cb2fdeb4ad0)
+
     git clone git://git.openssl.org/openssl.git openssl-upstream
+    (cd openssl-upstream && \
+       git checkout OpenSSL_1_0_1e)
+
     git clone https://github.com/dicej/android-libcore64 libcore
+
+    curl -Of http://readytalk.github.io/avian/expat-2.1.0.tar.gz
+    (cd external && tar xzf ../expat-2.1.0.tar.gz && mv expat-2.1.0 expat)
+
     (cd external/expat && CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure \
        --enable-static && make)
+
     (cd external/fdlibm && (mv makefile.in Makefile.in || true) \
        && CFLAGS=-fPIC bash configure && make)
+
     (cd external/icu4c && CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure \
        --enable-static && make)
 
 NB: use 'CC="gcc -fPIC" ./Configure darwin64-x86_64-cc' when building
 for x86_64 OS X instead of 'CC="gcc -fPIC" ./config':
 
-    (cd openssl-upstream && git checkout OpenSSL_1_0_1e \
+    (cd openssl-upstream \
-       && (for x in ../external/openssl/patches/*.patch; \
+       && (for x in \
-             do patch -p1 < $x; done) \
+               progs \
+               handshake_cutthrough \
+               jsse \
+               channelid \
+               eng_dyn_dirs \
+               fix_clang_build \
+               tls12_digests \
+               alpn; \
+             do patch -p1 < ../external/openssl/patches/$x.patch; done) \
        && CC="gcc -fPIC" ./config && make)
+
     cd ../avian
     make android=$(pwd)/../android test
 
@@ -403,6 +441,10 @@ against OpenSSL 1.0.1e, so that's the tag we check out, but this may
 change in the future when the Android fork rebases against a new
 OpenSSL version.
 
+Finally, we specify specific commit hashes for each repository which
+are known to work.  Later versions may also work, but have not been
+tested.
+
 
 Installing
 ----------
@@ -468,7 +510,8 @@ setting the boot classpath to "[bootJar]".
 
     $ cat >embedded-jar-main.cpp <<EOF
     #include "stdint.h"
-        #include "jni.h"
+    #include "jni.h"
+	#include "stdlib.h" 
     
     #if (defined __MINGW32__) || (defined _MSC_VER)
     #  define EXPORT __declspec(dllexport)
@@ -496,6 +539,8 @@ setting the boot classpath to "[bootJar]".
       }
     
     } // extern "C"
+	
+	extern "C" void __cxa_pure_virtual(void) { abort(); }
     
     int
     main(int ac, const char** av)
@@ -557,7 +602,7 @@ __on Mac OS X:__
 
 __on Windows:__
 
-     $ g++ -I$JAVA_HOME/include -I$JAVA_HOME/include/win32 \
+     $ g++ -fno-exceptions -fno-rtti -I"$JAVA_HOME/include" -I"$JAVA_HOME/include/win32" \
          -D_JNI_IMPLEMENTATION_ -c embedded-jar-main.cpp -o main.o
 
 __5.__ Link the objects produced above to produce the final
@@ -577,7 +622,7 @@ __on Windows:__
 
     $ dlltool -z hello.def *.o
     $ dlltool -d hello.def -e hello.exp
-    $ g++ hello.exp *.o -L../../win32/lib -lmingwthrd -lm -lz -lws2_32 \
+    $ gcc hello.exp *.o -L../../win32/lib -lmingwthrd -lm -lz -lws2_32 \
         -mwindows -mconsole -o hello.exe
     $ strip --strip-all hello.exe
 

classpath/avian/Addendum.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/AnnotationInvocationHandler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Assembler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Callback.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/CallbackReceiver.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Cell.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/ClassAddendum.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Classes.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided
@@ -406,6 +406,41 @@ public class Classes {
     return -1;
   }
 
+  public static int countMethods(VMClass vmClass, boolean publicOnly) {
+    int count = 0;
+    if (vmClass.methodTable != null) {
+      for (int i = 0; i < vmClass.methodTable.length; ++i) {
+        if (((! publicOnly)
+             || ((vmClass.methodTable[i].flags & Modifier.PUBLIC))
+             != 0)
+            && (! toString(vmClass.methodTable[i].name).startsWith("<")))
+        {
+          ++ count;
+        }
+      }
+    }
+    return count;
+  }
+
+  public static Method[] getMethods(VMClass vmClass, boolean publicOnly) {
+    Method[] array = new Method[countMethods(vmClass, publicOnly)];
+    if (vmClass.methodTable != null) {
+      Classes.link(vmClass);
+
+      int ai = 0;
+      for (int i = 0; i < vmClass.methodTable.length; ++i) {
+        if ((((vmClass.methodTable[i].flags & Modifier.PUBLIC) != 0)
+             || (! publicOnly))
+            && ! toString(vmClass.methodTable[i].name).startsWith("<"))
+        {
+          array[ai++] = makeMethod(SystemClassLoader.getClass(vmClass), i);
+        }
+      }
+    }
+
+    return array;
+  }
+
   public static Annotation getAnnotation(ClassLoader loader, Object[] a) {
     if (a[0] == null) {
       a[0] = Proxy.newProxyInstance

classpath/avian/ConstantPool.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Continuations.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/FieldAddendum.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/IncompatibleContinuationException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Iso88591.java

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Machine.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/MethodAddendum.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided
@@ -13,4 +13,5 @@ package avian;
 public class MethodAddendum extends Addendum {
   public Object exceptionTable;
   public Object annotationDefault;
+  public Object parameterAnnotationTable;
 }

classpath/avian/OpenJDK.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/PersistentSet.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Singleton.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Stream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/SystemClassLoader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/Utf8.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/VMClass.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/VMField.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/VMMethod.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/avianvmresource/Handler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/file/Handler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/http/Handler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/avian/jar/Handler.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java-io.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided
@@ -20,6 +20,8 @@
 
 #ifdef PLATFORM_WINDOWS
 
+#  define UNICODE
+
 #  include <windows.h>
 #  include <io.h>
 #  include <direct.h>
@@ -126,8 +128,12 @@ OPEN(string_t path, int mask, int mode)
 inline bool
 exists(string_t path)
 {
+#ifdef PLATFORM_WINDOWS
+  return GetFileAttributes(path) != INVALID_FILE_ATTRIBUTES;
+#else
   STRUCT_STAT s;
   return STAT(path, &s) == 0;
+#endif
 }
 
 inline int

classpath/java-lang.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided
@@ -952,6 +952,12 @@ Java_java_lang_Math_ceil(JNIEnv*, jclass, jdouble val)
   return ceil(val);
 }
 
+extern "C" JNIEXPORT jdouble JNICALL
+Java_java_lang_Math_exp(JNIEnv*, jclass, jdouble exp)
+{
+  return pow(M_E, exp);
+}
+
 extern "C" JNIEXPORT jint JNICALL
 Java_java_lang_Double_fillBufferWithDouble(JNIEnv* e, jclass, jdouble val,
 					   jbyteArray buffer, jint bufferSize) {

classpath/java-net.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java-nio.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java-util-zip.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java-util.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/BufferedInputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/BufferedOutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/BufferedReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/BufferedWriter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ByteArrayInputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ByteArrayOutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Closeable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/EOFException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Externalizable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileDescriptor.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileInputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileNotFoundException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileOutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FileWriter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FilenameFilter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/FilterOutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Flushable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/IOException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/InputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/InputStreamReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/LineNumberReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/NotSerializableException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ObjectInput.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ObjectInputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ObjectOutput.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ObjectOutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/ObjectStreamException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/OutputStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/OutputStreamWriter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/PrintStream.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/PrintWriter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/PushbackReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/RandomAccessFile.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Reader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Serializable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/StreamCorruptedException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/StringReader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/StringWriter.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/UnsupportedEncodingException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/io/Writer.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/AbstractMethodError.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Appendable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ArithmeticException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ArrayIndexOutOfBoundsException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ArrayStoreException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/AssertionError.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Boolean.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Byte.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/CharSequence.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Character.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Class.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided
@@ -366,54 +366,12 @@ public final class Class <T> implements Type, AnnotatedElement {
     return fields.toArray(new Field[fields.size()]);
   }
 
-  private int countMethods(boolean publicOnly) {
-    int count = 0;
-    if (vmClass.methodTable != null) {
-      for (int i = 0; i < vmClass.methodTable.length; ++i) {
-        if (((! publicOnly)
-             || ((vmClass.methodTable[i].flags & Modifier.PUBLIC))
-             != 0)
-            && (! Method.getName(vmClass.methodTable[i]).startsWith("<")))
-        {
-          ++ count;
-        }
-      }
-    }
-    return count;
-  }
-
   public Method[] getDeclaredMethods() {
-    Method[] array = new Method[countMethods(false)];
+    return Classes.getMethods(vmClass, false);
-    if (vmClass.methodTable != null) {
-      Classes.link(vmClass);
-
-      int ai = 0;
-      for (int i = 0; i < vmClass.methodTable.length; ++i) {
-        if (! Method.getName(vmClass.methodTable[i]).startsWith("<")) {
-          array[ai++] = new Method(vmClass.methodTable[i]);
-        }
-      }
-    }
-
-    return array;
   }
 
   public Method[] getMethods() {
-    Method[] array = new Method[countMethods(true)];
+    return Classes.getMethods(vmClass, true);
-    if (vmClass.methodTable != null) {
-      Classes.link(vmClass);
-
-      int index = 0;
-      for (int i = 0; i < vmClass.methodTable.length; ++i) {
-        if (((vmClass.methodTable[i].flags & Modifier.PUBLIC) != 0)
-            && (! Method.getName(vmClass.methodTable[i]).startsWith("<")))
-        {
-          array[index++] = new Method(vmClass.methodTable[i]);
-        }
-      }
-    }
-
-    return array;
   }
 
   public Class[] getInterfaces() {
@@ -591,7 +549,7 @@ public final class Class <T> implements Type, AnnotatedElement {
   }
 
   public Annotation[] getAnnotations() {
-    Annotation[] array = new Annotation[countMethods(true)];
+    Annotation[] array = new Annotation[countAnnotations()];
     int i = 0;
     for (VMClass c = vmClass; c != null; c = c.super_) {
       if (c.addendum != null && c.addendum.annotationTable != null) {

classpath/java/lang/ClassCastException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ClassLoader.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ClassNotFoundException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/CloneNotSupportedException.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Cloneable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Comparable.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Deprecated.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Double.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Enum.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Error.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Exception.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/ExceptionInInitializerError.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2009, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided

classpath/java/lang/Float.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Avian Contributors
+/* Copyright (c) 2008-2013, Avian Contributors
 
    Permission to use, copy, modify, and/or distribute this software
    for any purpose with or without fee is hereby granted, provided