# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1414160290 -7200
# Node ID c88ab4f1f04aabe399bb47666fe14ba8a2ecf453
# Parent  ab62800259ffebfda46bbc741001efd6b752c602
re-enabled Checkstyle with the release of 6.0 that supports Java 8; fixed existing Checkstyle warnings

diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/ResolvedJavaTypeResolveMethodTest.java
--- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/ResolvedJavaTypeResolveMethodTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/ResolvedJavaTypeResolveMethodTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,7 +39,7 @@
         metaAccess = providers.getMetaAccess();
     }
 
-    protected static abstract class A {
+    protected abstract static class A {
         @SuppressWarnings("unused")
         private void priv() {
         }
@@ -72,7 +72,7 @@
         }
     }
 
-    protected static abstract class D extends A {
+    protected abstract static class D extends A {
 
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Constant.java	Fri Oct 24 16:18:10 2014 +0200
@@ -34,19 +34,19 @@
      * Using a larger cache for integers leads to only a slight increase in cache hit ratio which is
      * not enough to justify the impact on startup time.
      */
-    public static final Constant NULL_OBJECT = new NullConstant();
-    public static final Constant INT_MINUS_1 = new PrimitiveConstant(Kind.Int, -1);
-    public static final Constant INT_0 = new PrimitiveConstant(Kind.Int, 0);
-    public static final Constant INT_1 = new PrimitiveConstant(Kind.Int, 1);
-    public static final Constant INT_2 = new PrimitiveConstant(Kind.Int, 2);
-    public static final Constant LONG_0 = new PrimitiveConstant(Kind.Long, 0L);
-    public static final Constant LONG_1 = new PrimitiveConstant(Kind.Long, 1L);
-    public static final Constant FLOAT_0 = new PrimitiveConstant(Kind.Float, Float.floatToRawIntBits(0.0F));
-    public static final Constant FLOAT_1 = new PrimitiveConstant(Kind.Float, Float.floatToRawIntBits(1.0F));
-    public static final Constant DOUBLE_0 = new PrimitiveConstant(Kind.Double, Double.doubleToRawLongBits(0.0D));
-    public static final Constant DOUBLE_1 = new PrimitiveConstant(Kind.Double, Double.doubleToRawLongBits(1.0D));
-    public static final Constant TRUE = new PrimitiveConstant(Kind.Boolean, 1L);
-    public static final Constant FALSE = new PrimitiveConstant(Kind.Boolean, 0L);
+    Constant NULL_OBJECT = new NullConstant();
+    Constant INT_MINUS_1 = new PrimitiveConstant(Kind.Int, -1);
+    Constant INT_0 = new PrimitiveConstant(Kind.Int, 0);
+    Constant INT_1 = new PrimitiveConstant(Kind.Int, 1);
+    Constant INT_2 = new PrimitiveConstant(Kind.Int, 2);
+    Constant LONG_0 = new PrimitiveConstant(Kind.Long, 0L);
+    Constant LONG_1 = new PrimitiveConstant(Kind.Long, 1L);
+    Constant FLOAT_0 = new PrimitiveConstant(Kind.Float, Float.floatToRawIntBits(0.0F));
+    Constant FLOAT_1 = new PrimitiveConstant(Kind.Float, Float.floatToRawIntBits(1.0F));
+    Constant DOUBLE_0 = new PrimitiveConstant(Kind.Double, Double.doubleToRawLongBits(0.0D));
+    Constant DOUBLE_1 = new PrimitiveConstant(Kind.Double, Double.doubleToRawLongBits(1.0D));
+    Constant TRUE = new PrimitiveConstant(Kind.Boolean, 1L);
+    Constant FALSE = new PrimitiveConstant(Kind.Boolean, 0L);
 
     /**
      * Checks whether this constant is null.
@@ -144,7 +144,7 @@
      * @param d the double value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forDouble(double d) {
+    static Constant forDouble(double d) {
         if (Double.compare(0.0D, d) == 0) {
             return DOUBLE_0;
         }
@@ -160,7 +160,7 @@
      * @param f the float value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forFloat(float f) {
+    static Constant forFloat(float f) {
         if (Float.compare(f, 0.0F) == 0) {
             return FLOAT_0;
         }
@@ -176,7 +176,7 @@
      * @param i the long value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forLong(long i) {
+    static Constant forLong(long i) {
         if (i == 0) {
             return LONG_0;
         } else if (i == 1) {
@@ -192,7 +192,7 @@
      * @param i the integer value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forInt(int i) {
+    static Constant forInt(int i) {
         switch (i) {
             case -1:
                 return INT_MINUS_1;
@@ -213,7 +213,7 @@
      * @param i the byte value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forByte(byte i) {
+    static Constant forByte(byte i) {
         return new PrimitiveConstant(Kind.Byte, i);
     }
 
@@ -223,7 +223,7 @@
      * @param i the boolean value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forBoolean(boolean i) {
+    static Constant forBoolean(boolean i) {
         return i ? TRUE : FALSE;
     }
 
@@ -233,7 +233,7 @@
      * @param i the char value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forChar(char i) {
+    static Constant forChar(char i) {
         return new PrimitiveConstant(Kind.Char, i);
     }
 
@@ -243,14 +243,14 @@
      * @param i the short value to box
      * @return a boxed copy of {@code value}
      */
-    public static Constant forShort(short i) {
+    static Constant forShort(short i) {
         return new PrimitiveConstant(Kind.Short, i);
     }
 
     /**
      * Creates a {@link Constant} from a primitive integer of a certain kind.
      */
-    public static Constant forIntegerKind(Kind kind, long i) {
+    static Constant forIntegerKind(Kind kind, long i) {
         switch (kind) {
             case Byte:
                 return new PrimitiveConstant(kind, (byte) i);
@@ -270,7 +270,7 @@
     /**
      * Creates a {@link Constant} from a primitive integer of a certain width.
      */
-    public static Constant forPrimitiveInt(int bits, long i) {
+    static Constant forPrimitiveInt(int bits, long i) {
         assert bits <= 64;
         switch (bits) {
             case 1:
@@ -294,7 +294,7 @@
      * @param value the Java boxed value
      * @return the primitive constant holding the {@code value}
      */
-    public static Constant forBoxedPrimitive(Object value) {
+    static Constant forBoxedPrimitive(Object value) {
         if (value instanceof Boolean) {
             return forBoolean((Boolean) value);
         } else if (value instanceof Byte) {
@@ -316,14 +316,14 @@
         }
     }
 
-    public static Constant forIllegal() {
+    static Constant forIllegal() {
         return new PrimitiveConstant(Kind.Illegal, 0);
     }
 
     /**
      * Returns a constant with the default value for the given kind.
      */
-    public static Constant defaultForKind(Kind kind) {
+    static Constant defaultForKind(Kind kind) {
         switch (kind) {
             case Boolean:
                 return FALSE;
@@ -351,7 +351,7 @@
     /**
      * Returns the zero value for a given numeric kind.
      */
-    public static Constant zero(Kind kind) {
+    static Constant zero(Kind kind) {
         switch (kind) {
             case Boolean:
                 return FALSE;
@@ -377,7 +377,7 @@
     /**
      * Returns the one value for a given numeric kind.
      */
-    public static Constant one(Kind kind) {
+    static Constant one(Kind kind) {
         switch (kind) {
             case Boolean:
                 return TRUE;
@@ -403,7 +403,7 @@
     /**
      * Adds two numeric constants.
      */
-    public static Constant add(Constant x, Constant y) {
+    static Constant add(Constant x, Constant y) {
         assert x.getKind() == y.getKind();
         switch (x.getKind()) {
             case Byte:
@@ -428,7 +428,7 @@
     /**
      * Multiplies two numeric constants.
      */
-    public static Constant mul(Constant x, Constant y) {
+    static Constant mul(Constant x, Constant y) {
         assert x.getKind() == y.getKind();
         switch (x.getKind()) {
             case Byte:
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaField.java	Fri Oct 24 16:18:10 2014 +0200
@@ -76,16 +76,16 @@
      * @throws IllegalFormatException if an illegal specifier is encountered in {@code format}
      */
     default String format(String format) throws IllegalFormatException {
-        final StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         int index = 0;
         JavaType type = getType();
         while (index < format.length()) {
-            final char ch = format.charAt(index++);
+            char ch = format.charAt(index++);
             if (ch == '%') {
                 if (index >= format.length()) {
                     throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a field format specification");
                 }
-                final char specifier = format.charAt(index++);
+                char specifier = format.charAt(index++);
                 boolean qualified = false;
                 switch (specifier) {
                     case 'T':
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaMethod.java	Fri Oct 24 16:18:10 2014 +0200
@@ -72,16 +72,16 @@
      * @throws IllegalFormatException if an illegal specifier is encountered in {@code format}
      */
     default String format(String format) throws IllegalFormatException {
-        final StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
         int index = 0;
         Signature sig = null;
         while (index < format.length()) {
-            final char ch = format.charAt(index++);
+            char ch = format.charAt(index++);
             if (ch == '%') {
                 if (index >= format.length()) {
                     throw new UnknownFormatConversionException("An unquoted '%' character cannot terminate a method format specification");
                 }
-                final char specifier = format.charAt(index++);
+                char specifier = format.charAt(index++);
                 boolean qualified = false;
                 switch (specifier) {
                     case 'R':
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/LIRKind.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/LIRKind.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/LIRKind.java	Fri Oct 24 16:18:10 2014 +0200
@@ -256,4 +256,4 @@
         LIRKind other = (LIRKind) obj;
         return platformKind == other.platformKind && referenceMask == other.referenceMask;
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ModifiersProvider.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ModifiersProvider.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ModifiersProvider.java	Fri Oct 24 16:18:10 2014 +0200
@@ -38,35 +38,35 @@
     int getModifiers();
 
     /**
-     * see {@link Modifier#isInterface(int)}
+     * @see Modifier#isInterface(int)
      */
     default boolean isInterface() {
         return Modifier.isInterface(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isSynchronized(int)}
+     * @see Modifier#isSynchronized(int)
      */
     default boolean isSynchronized() {
         return Modifier.isSynchronized(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isStatic(int)}
+     * @see Modifier#isStatic(int)
      */
     default boolean isStatic() {
         return Modifier.isStatic(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isFinal(int)}
+     * @see Modifier#isFinal(int)
      */
     default boolean isFinal() {
         return Modifier.isFinal(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isPublic(int)}
+     * @see Modifier#isPublic(int)
      */
     default boolean isPublic() {
         return Modifier.isPublic(getModifiers());
@@ -81,49 +81,49 @@
     }
 
     /**
-     * see {@link Modifier#isPrivate(int)}
+     * @see Modifier#isPrivate(int)
      */
     default boolean isPrivate() {
         return Modifier.isPrivate(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isProtected(int)}
+     * @see Modifier#isProtected(int)
      */
     default boolean isProtected() {
         return Modifier.isProtected(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isTransient(int)}
+     * @see Modifier#isTransient(int)
      */
     default boolean isTransient() {
         return Modifier.isTransient(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isStrict(int)}
+     * @see Modifier#isStrict(int)
      */
     default boolean isStrict() {
         return Modifier.isStrict(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isVolatile(int)}
+     * @see Modifier#isVolatile(int)
      */
     default boolean isVolatile() {
         return Modifier.isVolatile(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isNative(int)}
+     * @see Modifier#isNative(int)
      */
     default boolean isNative() {
         return Modifier.isNative(getModifiers());
     }
 
     /**
-     * see {@link Modifier#isAbstract(int)}
+     * @see Modifier#isAbstract(int)
      */
     default boolean isAbstract() {
         return Modifier.isAbstract(getModifiers());
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/ResolvedJavaMethod.java	Fri Oct 24 16:18:10 2014 +0200
@@ -109,7 +109,7 @@
 
     /**
      * Checks whether this method can be statically bound (usually, that means it is final or
-     * private or static, but not abstract, or the declaring class is final)
+     * private or static, but not abstract, or the declaring class is final).
      *
      * @return {@code true} if this method can be statically bound
      */
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/Value.java	Fri Oct 24 16:18:10 2014 +0200
@@ -28,7 +28,7 @@
  */
 public interface Value extends KindProvider {
 
-    @SuppressWarnings("serial") public static final AllocatableValue ILLEGAL = new AllocatableValue(LIRKind.Illegal) {
+    @SuppressWarnings("serial") AllocatableValue ILLEGAL = new AllocatableValue(LIRKind.Illegal) {
 
         @Override
         public String toString() {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,19 +50,20 @@
     }
 
     public interface AssemblerEmittable {
-        public void emit(SPARCAssembler masm);
+        void emit(SPARCAssembler masm);
     }
 
     // @formatter:off
     /**
      * Instruction format for Fmt00 instructions. This abstraction is needed as it
      * makes the patching easier later on.
-     *
+     * <pre>
      * | 00  |  ??    | op2 |               ??                        |
      * |31 30|29    25|24 22|21                                      0|
+     * </pre>
      */
     // @formatter:on
-    public static abstract class Fmt00 implements AssemblerEmittable {
+    public abstract static class Fmt00 implements AssemblerEmittable {
 
         protected static final int OP_SHIFT = 30;
         protected static final int CBCOND_SHIFT = 28;
@@ -84,7 +85,7 @@
 
         public static Fmt00 read(SPARCAssembler masm, int pos) {
             final int inst = masm.getInt(pos);
-            Op2s op2 = Op2s.byValue((inst&OP2_MASK) >> OP2_SHIFT);
+            Op2s op2 = Op2s.byValue((inst & OP2_MASK) >> OP2_SHIFT);
             switch(op2) {
                 case Br:
                 case Fb:
@@ -96,7 +97,7 @@
                     return Fmt00c.read(masm, pos);
                 case Bpr:
                     boolean isCBcond = (inst & CBCOND_MASK) != 0;
-                    if(isCBcond) {
+                    if (isCBcond) {
                         return Fmt00e.read(masm, pos);
                     } else {
                         return Fmt00d.read(masm, pos);
@@ -148,9 +149,10 @@
     // @formatter:off
     /**
      * Instruction format for sethi.
-     *
+     * <pre>
      * | 00  |  rd    | op2 |               imm22                     |
      * |31 30|29    25|24 22|21                                      0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt00a extends Fmt00 implements AssemblerEmittable {
@@ -228,9 +230,10 @@
     // @formatter:off
     /**
      * Instruction format for branches.
-     *
+     * <pre>
      * | 00  |a | cond | op2 |             disp22                      |
      * |31 30|29|28  25|24 22|21                                      0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt00b extends Fmt00 {
@@ -366,9 +369,10 @@
     // @formatter:off
     /**
      * Instruction format for conditional branches.
-     *
+     * <pre>
      * | 00  |a | cond | op2 |cc1|cc0|p |             disp19           |
      * |31 30|29|28  25|24 22|21 |20 |19|                             0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt00c extends Fmt00 {
@@ -521,9 +525,10 @@
     // @formatter:off
     /**
      * Instruction format for Branch on Integer Register with Prediction.
-     *
+     * <pre>
      * |00   |a |- |rcond | 011 |d16hi|p | rs1 |          d16lo           |
      * |31 30|29|28|27  25|24 22|21 20|19|18 14|                         0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt00d extends Fmt00 {
@@ -634,10 +639,11 @@
 
     // @formatter:off
     /**
-     * Instruction format CBcond
-     *
+     * Instruction format CBcond.
+     * <pre>
      * |00   |chi|1 | clo | 011 |cc2|d10hi|rs1  |i |d10lo|rs2/simm5|
      * |31 30|29 |28|27 25|24 22|21 |20 19|18 14|13|12  5|4       0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt00e extends Fmt00 {
@@ -788,9 +794,10 @@
     // @formatter:off
     /**
      * Instruction format for calls.
-     *
+     * <pre>
      * | 01  |                      disp30                             |
      * |31 30|29                                                      0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt01 {
@@ -930,10 +937,11 @@
 
     // @formatter:off
     /**
-     * Instruction format for fcmp
-     *
+     * Instruction format for fcmp.
+     * <pre>
      * | 10  | --- |cc1|cc0|desc |   rs1   |   opf  | rs2 |
      * |31 30|29 27|26 |25 |24 19|18     14|13     5|4   0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt3c {
@@ -968,13 +976,14 @@
     // @formatter:off
     /**
      * Instruction format for Arithmetic, Logical, Moves, Tcc, Prefetch, and Misc.
-     *
+     * <pre>
      * | 10  |   rd   |   op3   |   rs1   | i|     imm_asi   |   rs2   |
      * | 10  |   rd   |   op3   |   rs1   | i|          simm13         |
      * | 10  |   rd   |   op3   |   rs1   | i| x|            |   rs2   |
      * | 10  |   rd   |   op3   |   rs1   | i| x|            | shcnt32 |
-     * | 10  |   rd   |   op3   |   rs1   | i| x|           |  shcnt64 |
+     * | 10  |   rd   |   op3   |   rs1   | i| x|            | shcnt64 |
      * |31 30|29    25|24     19|18     14|13|12|11         5|4       0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt10 implements AssemblerEmittable {
@@ -1110,10 +1119,11 @@
     // @formatter:off
     /**
      * Instruction format for Loads, Stores and Misc.
-     *
+     * <pre>
      * | 11  |   rd   |   op3   |   rs1   | i|   imm_asi   |   rs2   |
      * | 11  |   rd   |   op3   |   rs1   | i|        simm13         |
      * |31 30|29    25|24     19|18     14|13|12          5|4       0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt11 {
@@ -1265,10 +1275,11 @@
     // @formatter:off
     /**
      * Instruction format for Movcc.
-     *
+     * <pre>
      * | 10  |   rd   |   op3   |cc2|   cond  | i|cc1|cc0|      -      |   rs2   |
      * | 10  |   rd   |   op3   |cc2|   cond  | i|cc1|cc0|        simm11         |
      * |31 30|29    25|24     19| 18|17     14|13| 12| 11|10          5|4       0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt10c {
@@ -1390,9 +1401,10 @@
     // @formatter:off
     /**
      * Instruction format for Fmovcc.
-     *
+     * <pre>
      * | 10  |   rd   |   op3   | -|   cond  | opfcc | opf_low |   rs2   |
      * |31 30|29    25|24     19|18|17     14|13   11|10      5|4       0|
+     * </pre>
      */
     // @formatter:on
     public static class Fmt10d implements AssemblerEmittable {
@@ -1406,12 +1418,12 @@
         private static final int RS2_SHIFT = 0;
 
         // @formatter:off
-        private static final int RD_MASK     = 0b0011_1110_0000_0000_0000_0000_0000_0000;
-        private static final int OP3_MASK    = 0b0000_0001_1111_1000_0000_0000_0000_0000;
-        private static final int COND_MASK   = 0b0000_0000_0000_0011_1100_0000_0000_0000;
-        private static final int OPFCC_MASK  = 0b0000_0000_0000_0000_0011_1000_0000_0000;
-        private static final int OPF_LOW_MASK= 0b0000_0000_0000_0000_0000_0111_1110_0000;
-        private static final int RS2_MASK    = 0b0000_0000_0000_0000_0000_0000_0001_1111;
+        private static final int RD_MASK      = 0b0011_1110_0000_0000_0000_0000_0000_0000;
+        private static final int OP3_MASK     = 0b0000_0001_1111_1000_0000_0000_0000_0000;
+        private static final int COND_MASK    = 0b0000_0000_0000_0011_1100_0000_0000_0000;
+        private static final int OPFCC_MASK   = 0b0000_0000_0000_0000_0011_1000_0000_0000;
+        private static final int OPF_LOW_MASK = 0b0000_0000_0000_0000_0000_0111_1110_0000;
+        private static final int RS2_MASK     = 0b0000_0000_0000_0000_0000_0000_0001_1111;
         // @formatter:on
 
         private int rd;
@@ -1863,9 +1875,8 @@
 
         Fcmps(0x51, "fcmps"),
         Fcmpd(0x52, "fcmpd"),
-        Fcmpq(0x53, "fcmpq"),
-
-        ;
+        Fcmpq(0x53, "fcmpq");
+
         // @formatter:on
 
         private final int value;
@@ -1916,16 +1927,16 @@
     }
 
     /**
-     * Condition Codes to use for instruction
+     * Condition Codes to use for instruction.
      */
     public enum CC {
         // @formatter:off
         /**
-         * Condition is considered as 32bit operation condition
+         * Condition is considered as 32bit operation condition.
          */
         Icc(0b00, "icc"),
         /**
-         * Condition is considered as 64bit operation condition
+         * Condition is considered as 64bit operation condition.
          */
         Xcc(0b10, "xcc"),
         Ptrcc(getHostWordKind() == Kind.Long ? Xcc.getValue() : Icc.getValue(), "ptrcc"),
@@ -2187,7 +2198,7 @@
     }
 
     /**
-     * Represents the <b>Address Space Identifier</b> defined in the SPARC architec
+     * Represents the <b>Address Space Identifier</b> defined in the SPARC architecture.
      */
     public enum Asi {
         // @formatter:off
@@ -3021,7 +3032,7 @@
     }
 
     /**
-     * Floating-point multiply-add single (fused)
+     * Floating-point multiply-add single (fused).
      */
     public static class Fmadds extends Fmt5a {
 
@@ -3031,7 +3042,7 @@
     }
 
     /**
-     * Floating-point multiply-add double (fused)
+     * Floating-point multiply-add double (fused).
      */
     public static class Fmaddd extends Fmt5a {
 
@@ -3041,7 +3052,7 @@
     }
 
     /**
-     * 16-bit partitioned average
+     * 16-bit partitioned average.
      */
     public static class Fmean16 extends Fmt3p {
 
@@ -3351,7 +3362,7 @@
     }
 
     /**
-     * Convert Double to 32-bit Integer
+     * Convert Double to 32-bit Integer.
      */
     public static class Fdtoi extends Fmt3n {
 
@@ -3399,7 +3410,7 @@
     }
 
     /**
-     * Flush register windows
+     * Flush register windows.
      */
     public static class Flushw extends Fmt10 {
 
@@ -4135,7 +4146,7 @@
             super(Op3s.Rett, src1, src2, r0);
         }
 
-        public static int PC_RETURN_OFFSET = 8;
+        public static final int PC_RETURN_OFFSET = 8;
     }
 
     public static class Save extends Fmt10 {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Fri Oct 24 16:18:10 2014 +0200
@@ -798,4 +798,4 @@
         gen.emitJump(getSuccessor(0));
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 import com.oracle.graal.java.*;
 import com.oracle.graal.java.BciBlockMapping.BciBlock;
 
-public class BaselineControlFlowGraph implements AbstractControlFlowGraph<BciBlock> {
+public final class BaselineControlFlowGraph implements AbstractControlFlowGraph<BciBlock> {
 
     private List<BciBlock> blocks;
     private Collection<Loop<BciBlock>> loops;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/calc/FloatConvert.java	Fri Oct 24 16:18:10 2014 +0200
@@ -62,4 +62,4 @@
                 throw GraalInternalError.shouldNotReachHere();
         }
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractControlFlowGraph.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractControlFlowGraph.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractControlFlowGraph.java	Fri Oct 24 16:18:10 2014 +0200
@@ -28,8 +28,8 @@
 
 public interface AbstractControlFlowGraph<T extends AbstractBlock<T>> {
 
-    static final int BLOCK_ID_INITIAL = -1;
-    static final int BLOCK_ID_VISITED = -2;
+    int BLOCK_ID_INITIAL = -1;
+    int BLOCK_ID_VISITED = -2;
 
     /**
      * Returns the list blocks contained in this control flow graph.
@@ -104,7 +104,7 @@
      * @see #getBlocks()
      * @see CFGVerifier
      */
-    public static AbstractBlock<?> commonDominator(AbstractBlock<?> a, AbstractBlock<?> b) {
+    static AbstractBlock<?> commonDominator(AbstractBlock<?> a, AbstractBlock<?> b) {
         if (a == null) {
             return b;
         }
@@ -128,7 +128,7 @@
      * @see AbstractControlFlowGraph#commonDominator(AbstractBlock, AbstractBlock)
      */
     @SuppressWarnings("unchecked")
-    public static <T extends AbstractBlock<T>> T commonDominatorTyped(T a, T b) {
+    static <T extends AbstractBlock<T>> T commonDominatorTyped(T a, T b) {
         return (T) commonDominator(a, b);
     }
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/DominatorOptimizationProblem.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/DominatorOptimizationProblem.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/DominatorOptimizationProblem.java	Fri Oct 24 16:18:10 2014 +0200
@@ -147,4 +147,4 @@
     public String getName(E flag) {
         return flag.toString();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableDominatorOptimizationProblem.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableDominatorOptimizationProblem.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/PrintableDominatorOptimizationProblem.java	Fri Oct 24 16:18:10 2014 +0200
@@ -42,4 +42,4 @@
             cost.forEachProperty((name, value) -> action.accept(name, value));
         }
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/type/ArithmeticOpTable.java	Fri Oct 24 16:18:10 2014 +0200
@@ -145,70 +145,70 @@
     /**
      * Describes the unary negation operation.
      */
-    public final UnaryOp<Neg> getNeg() {
+    public UnaryOp<Neg> getNeg() {
         return neg;
     }
 
     /**
      * Describes the addition operation.
      */
-    public final BinaryOp<Add> getAdd() {
+    public BinaryOp<Add> getAdd() {
         return add;
     }
 
     /**
      * Describes the subtraction operation.
      */
-    public final BinaryOp<Sub> getSub() {
+    public BinaryOp<Sub> getSub() {
         return sub;
     }
 
     /**
      * Describes the multiplication operation.
      */
-    public final BinaryOp<Mul> getMul() {
+    public BinaryOp<Mul> getMul() {
         return mul;
     }
 
     /**
      * Describes the division operation.
      */
-    public final BinaryOp<Div> getDiv() {
+    public BinaryOp<Div> getDiv() {
         return div;
     }
 
     /**
      * Describes the remainder operation.
      */
-    public final BinaryOp<Rem> getRem() {
+    public BinaryOp<Rem> getRem() {
         return rem;
     }
 
     /**
      * Describes the bitwise not operation.
      */
-    public final UnaryOp<Not> getNot() {
+    public UnaryOp<Not> getNot() {
         return not;
     }
 
     /**
      * Describes the bitwise and operation.
      */
-    public final BinaryOp<And> getAnd() {
+    public BinaryOp<And> getAnd() {
         return and;
     }
 
     /**
      * Describes the bitwise or operation.
      */
-    public final BinaryOp<Or> getOr() {
+    public BinaryOp<Or> getOr() {
         return or;
     }
 
     /**
      * Describes the bitwise xor operation.
      */
-    public final BinaryOp<Xor> getXor() {
+    public BinaryOp<Xor> getXor() {
         return xor;
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java
--- a/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test.infra/src/com/oracle/graal/compiler/hsail/test/infra/GraalKernelTester.java	Fri Oct 24 16:18:10 2014 +0200
@@ -131,7 +131,7 @@
     }
 
     /**
-     * Determines if we are running CQE tests (via a -D flag)
+     * Determines if we are running CQE tests (via a -D flag).
      */
     public boolean runningCQETests() {
         return Boolean.getBoolean("com.amd.CQE");
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,20 +31,20 @@
 
 public class EscapingNewBase extends GraalKernelTester {
 
-    final int NUM = getRange();
+    final int num = getRange();
 
     int getRange() {
         return 24;
     }
 
-    @Result public Object[] outArray = new Object[NUM];
+    @Result public Object[] outArray = new Object[num];
     public Object[] savedOutArray;
     @Result public boolean savedOutArrayMatch1;
     @Result public boolean savedOutArrayMatch2;
     @Result public boolean savedOutArrayMatch3;
 
     void setupArrays() {
-        for (int i = 0; i < NUM; i++) {
+        for (int i = 0; i < num; i++) {
             outArray[i] = null;
         }
     }
@@ -62,17 +62,17 @@
     public void runTest() {
         setupArrays();
 
-        dispatchMethodKernel(NUM);
+        dispatchMethodKernel(num);
         // use System.gc() to ensure new objects are in form that gc likes
         System.gc();
-        savedOutArray = Arrays.copyOf(outArray, NUM);
+        savedOutArray = Arrays.copyOf(outArray, num);
         savedOutArrayMatch1 = Arrays.equals(outArray, savedOutArray);
         if (getDispatches() > 1) {
             // redispatch kernel without gc
-            dispatchMethodKernel(NUM);
+            dispatchMethodKernel(num);
             savedOutArrayMatch2 = Arrays.equals(outArray, savedOutArray);
             // and one more time with gc
-            dispatchMethodKernel(NUM);
+            dispatchMethodKernel(num);
             savedOutArrayMatch3 = Arrays.equals(outArray, savedOutArray);
             System.gc();
         }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatStringTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatStringTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatStringTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 
 public class EscapingNewFloatStringTest extends EscapingNewBase {
 
-    @Result public String[] myOutArray = new String[NUM];
+    @Result public String[] myOutArray = new String[num];
 
     public void run(int gid) {
         outArray[gid] = Float.toString(gid * 1.11f);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewFloatTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -25,7 +25,7 @@
 import org.junit.Test;
 
 public class EscapingNewFloatTest extends EscapingNewBase {
-    @Result Float[] myOutArray = new Float[NUM];
+    @Result Float[] myOutArray = new Float[num];
 
     public void run(int gid) {
         outArray[gid] = (gid + 1) * 1.11f;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntArrayTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntArrayTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntArrayTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -45,7 +45,7 @@
     public void runTest() {
         super.runTest();
         if (DEBUG) {
-            for (int i = 0; i < NUM; i++) {
+            for (int i = 0; i < num; i++) {
                 int[] ary = (int[]) outArray[i];
                 System.out.print("ary len " + ary.length + ":  ");
                 for (int val : ary) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntegerTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntegerTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewIntegerTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -29,7 +29,7 @@
  */
 
 public class EscapingNewIntegerTest extends EscapingNewBase {
-    @Result Integer[] myOutArray = new Integer[NUM];
+    @Result Integer[] myOutArray = new Integer[num];
 
     public void run(int gid) {
         outArray[gid] = (gid + 1) * 111;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringConcatTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringConcatTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringConcatTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -34,20 +34,20 @@
 
 public class EscapingNewStringConcatTest extends EscapingNewBase {
 
-    @Result public String[] myOutArray = new String[NUM];
-    public String[] inArray = new String[NUM];
+    @Result public String[] myOutArray = new String[num];
+    public String[] inArray = new String[num];
 
     @Override
     void setupArrays() {
         super.setupArrays();
-        for (int i = 0; i < NUM; i++) {
+        for (int i = 0; i < num; i++) {
             inArray[i] = Integer.toString(i + 100);
         }
     }
 
     public void run(int gid) {
-        outArray[gid] = inArray[gid] + inArray[(gid + NUM / 2) % NUM];
-        myOutArray[gid] = inArray[(gid + NUM / 2) % NUM] + inArray[gid];
+        outArray[gid] = inArray[gid] + inArray[(gid + num / 2) % num];
+        myOutArray[gid] = inArray[(gid + num / 2) % num] + inArray[gid];
     }
 
     @Ignore("emitDirectCall unimplemented")
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewStringTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 
 public class EscapingNewStringTest extends EscapingNewBase {
 
-    @Result public String[] myOutArray = new String[NUM];
+    @Result public String[] myOutArray = new String[num];
 
     public void run(int gid) {
         outArray[gid] = Integer.toString(gid * 111);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3ArrayTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3ArrayTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3ArrayTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,7 +46,7 @@
         super.runTest();
         if (DEBUG) {
             System.out.println("dumping results");
-            for (int i = 0; i < NUM; i++) {
+            for (int i = 0; i < num; i++) {
                 Vec3[] ary = (Vec3[]) outArray[i];
                 System.out.print("ary len " + ary.length + ":  ");
                 for (Vec3 val : ary) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Base.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Base.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Base.java	Fri Oct 24 16:18:10 2014 +0200
@@ -28,13 +28,13 @@
 
 public class EscapingNewVec3Base extends EscapingNewBase {
 
-    float[] inArray = new float[NUM];
-    @Result Vec3[] myOutArray = new Vec3[NUM];
+    float[] inArray = new float[num];
+    @Result Vec3[] myOutArray = new Vec3[num];
 
     @Override
     void setupArrays() {
         super.setupArrays();
-        for (int i = 0; i < NUM; i++) {
+        for (int i = 0; i < num; i++) {
             inArray[i] = i;
             myOutArray[i] = null;
         }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Partial2Test.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Partial2Test.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/EscapingNewVec3Partial2Test.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 
 public class EscapingNewVec3Partial2Test extends EscapingNewVec3Base {
 
-    int testGid = NUM / 2;
+    int testGid = num / 2;
 
     @Override
     public void run(int gid) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/InstanceOfTwoLevelTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/InstanceOfTwoLevelTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/InstanceOfTwoLevelTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,8 +30,8 @@
 
     static final int NUM = 20;
 
-    static abstract class Shape {
-        abstract public float getArea();
+    abstract static class Shape {
+        public abstract float getArea();
     }
 
     static class Ellipse extends Shape {
@@ -66,8 +66,8 @@
     static class Square extends Shape {
         private float len;
 
-        Square(float _len) {
-            len = _len;
+        Square(float len) {
+            this.len = len;
         }
 
         @Override
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchOneTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchOneTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchOneTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -29,7 +29,7 @@
 import com.oracle.graal.compiler.hsail.test.infra.*;
 
 /**
- * Tests the spilling of double variables into memory with deopt
+ * Tests the spilling of double variables into memory with deopt.
  */
 public class StaticDoubleSpillBoundsCatchOneTest extends GraalKernelTester {
 
@@ -121,7 +121,7 @@
         /**
          * Call it for a range, specifying testmethod args (but not the fields it uses or the gid
          * argument).
-         * 
+         *
          */
         Arrays.fill(out, -1f);
         for (int i = 0; i < size; i++) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/StaticDoubleSpillBoundsCatchTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -29,7 +29,7 @@
 import com.oracle.graal.compiler.hsail.test.infra.*;
 
 /**
- * Tests the spilling of double variables into memory with deopt
+ * Tests the spilling of double variables into memory with deopt.
  */
 public class StaticDoubleSpillBoundsCatchTest extends GraalKernelTester {
 
@@ -123,7 +123,7 @@
         /**
          * Call it for a range, specifying testmethod args (but not the fields it uses or the gid
          * argument).
-         * 
+         *
          */
         Arrays.fill(out, -1f);
         Arrays.fill(aux, 0f);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListSetTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListSetTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListSetTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -32,7 +32,7 @@
  */
 public class ArrayListSetTest extends GraalKernelTester {
 
-    final static int NUM = 50;
+    static final int NUM = 50;
     ArrayList<Integer> aryList = new ArrayList<>();
 
     @Override
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListStreamTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListStreamTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ArrayListStreamTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,9 +46,9 @@
         int x;
         int y;
 
-        public MyPoint(int _x, int _y) {
-            x = _x;
-            y = _y;
+        public MyPoint(int x, int y) {
+            this.x = x;
+            this.y = y;
         }
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/Body.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/Body.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/Body.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,9 +30,9 @@
  */
 public class Body extends Vec3 {
 
-    public Body(float _x, float _y, float _z, float _m) {
-        super(_x, _y, _z);
-        m = _m;
+    public Body(float x, float y, float z, float m) {
+        super(x, y, z);
+        this.m = m;
         v = new Vec3(0, 0, 0);
     }
 
@@ -67,32 +67,32 @@
         return m;
     }
 
-    public void setM(float _m) {
-        m = _m;
+    public void setM(float value) {
+        m = value;
     }
 
-    public void setX(float _x) {
-        x = _x;
+    public void setX(float value) {
+        x = value;
     }
 
-    public void setY(float _y) {
-        y = _y;
+    public void setY(float value) {
+        y = value;
     }
 
-    public void setZ(float _z) {
-        z = _z;
+    public void setZ(float value) {
+        z = value;
     }
 
-    public void setVx(float _vx) {
-        v.x = _vx;
+    public void setVx(float value) {
+        v.x = value;
     }
 
-    public void setVy(float _vy) {
-        v.y = _vy;
+    public void setVy(float value) {
+        v.y = value;
     }
 
-    public void setVz(float _vz) {
-        v.z = _vz;
+    public void setVz(float value) {
+        v.z = value;
     }
 
     @Override
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyConjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyConjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyConjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class ByteArrayCopyConjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result byte[][] outArray = new byte[NUM][MAXOUTSIZ];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyDisjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyDisjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ByteArrayCopyDisjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class ByteArrayCopyDisjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result byte[][] outArray = new byte[NUM][MAXOUTSIZ];
     byte[] inArray = new byte[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyConjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyConjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyConjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class CharArrayCopyConjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result char[][] outArray = new char[NUM][MAXOUTSIZ];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyDisjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyDisjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/CharArrayCopyDisjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class CharArrayCopyDisjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result char[][] outArray = new char[NUM][MAXOUTSIZ];
     char[] inArray = new char[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleMathBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleMathBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleMathBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,7 +39,7 @@
     }
 
     /**
-     * Initializes the input and output arrays
+     * Initializes the input and output arrays.
      */
     void setupArrays() {
         for (int i = 0; i < size / 2; i++) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleTwoInputMathBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleTwoInputMathBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DoubleTwoInputMathBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,7 +35,7 @@
     }
 
     /**
-     * Initializes the input and output arrays
+     * Initializes the input and output arrays.
      */
     @Override
     void setupArrays() {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DremTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DremTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/DremTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -26,7 +26,7 @@
 import org.junit.*;
 
 /**
- * Tests the DREM bytecode instruction
+ * Tests the DREM bytecode instruction.
  */
 public class DremTest extends DoubleTwoInputMathBase {
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatMathBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatMathBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatMathBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,7 +35,7 @@
     }
 
     /**
-     * Initializes the input and output arrays
+     * Initializes the input and output arrays.
      */
     void setupArrays() {
         for (int i = 0; i < size / 2; i++) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatTwoInputMathBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatTwoInputMathBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/FloatTwoInputMathBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,7 +35,7 @@
     }
 
     /**
-     * Initializes the input and output arrays
+     * Initializes the input and output arrays.
      */
     @Override
     void setupArrays() {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ForEachToGraalTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ForEachToGraalTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ForEachToGraalTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -51,9 +51,9 @@
         int x;
         int y;
 
-        public MyPoint(int _x, int _y) {
-            x = _x;
-            y = _y;
+        public MyPoint(int x, int y) {
+            this.x = x;
+            this.y = y;
         }
 
         public int getX() {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceNBodyTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceNBodyTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceNBodyTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,34 +39,34 @@
     static final int width = 768;
     static final int height = 768;
 
-    @Result float[] in_xyz = new float[bodies * 3]; // positions xy and z of bodies
+    @Result float[] inXyz = new float[bodies * 3]; // positions xy and z of bodies
 
-    @Result float[] out_xyz = new float[bodies * 3]; // positions xy and z of bodies
+    @Result float[] outXyz = new float[bodies * 3]; // positions xy and z of bodies
 
-    @Result float[] in_vxyz = new float[bodies * 3]; // velocity component of x,y and z of
+    @Result float[] inVxyz = new float[bodies * 3]; // velocity component of x,y and z of
     // bodies
 
-    @Result float[] out_vxyz = new float[bodies * 3];
+    @Result float[] outVxyz = new float[bodies * 3];
 
-    static float[] seed_xyz = new float[bodies * 3];
+    static float[] seedXyz = new float[bodies * 3];
     static {
         final float maxDist = width / 4;
         for (int body = 0; body < (bodies * 3); body += 3) {
             final float theta = (float) (Math.random() * Math.PI * 2);
             final float phi = (float) (Math.random() * Math.PI * 2);
             final float radius = (float) (Math.random() * maxDist);
-            seed_xyz[body + 0] = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
-            seed_xyz[body + 1] = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
-            seed_xyz[body + 2] = (float) (radius * Math.cos(phi));
+            seedXyz[body + 0] = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
+            seedXyz[body + 1] = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
+            seedXyz[body + 2] = (float) (radius * Math.cos(phi));
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_xyz, 0, in_xyz, 0, seed_xyz.length);
-        Arrays.fill(out_xyz, 0f);
-        Arrays.fill(out_vxyz, 0f);
-        Arrays.fill(in_vxyz, 0f);
+        System.arraycopy(seedXyz, 0, inXyz, 0, seedXyz.length);
+        Arrays.fill(outXyz, 0f);
+        Arrays.fill(outVxyz, 0f);
+        Arrays.fill(inVxyz, 0f);
 
         // no local copies to make it an instance lambda
 
@@ -78,9 +78,9 @@
             float accy = 0.f;
             float accz = 0.f;
             for (int i = 0; i < count; i += 3) {
-                final float dx = in_xyz[i + 0] - in_xyz[globalId + 0];
-                final float dy = in_xyz[i + 1] - in_xyz[globalId + 1];
-                final float dz = in_xyz[i + 2] - in_xyz[globalId + 2];
+                final float dx = inXyz[i + 0] - inXyz[globalId + 0];
+                final float dy = inXyz[i + 1] - inXyz[globalId + 1];
+                final float dz = inXyz[i + 2] - inXyz[globalId + 2];
                 final float invDist = (float) (1.0 / (Math.sqrt((dx * dx) + (dy * dy) + (dz * dz) + espSqr)));
                 accx += mass * invDist * invDist * invDist * dx;
                 accy += mass * invDist * invDist * invDist * dy;
@@ -89,13 +89,13 @@
             accx *= delT;
             accy *= delT;
             accz *= delT;
-            out_xyz[globalId + 0] = in_xyz[globalId + 0] + (in_vxyz[globalId + 0] * delT) + (accx * .5f * delT);
-            out_xyz[globalId + 1] = in_xyz[globalId + 1] + (in_vxyz[globalId + 1] * delT) + (accy * .5f * delT);
-            out_xyz[globalId + 2] = in_xyz[globalId + 2] + (in_vxyz[globalId + 2] * delT) + (accz * .5f * delT);
+            outXyz[globalId + 0] = inXyz[globalId + 0] + (inVxyz[globalId + 0] * delT) + (accx * .5f * delT);
+            outXyz[globalId + 1] = inXyz[globalId + 1] + (inVxyz[globalId + 1] * delT) + (accy * .5f * delT);
+            outXyz[globalId + 2] = inXyz[globalId + 2] + (inVxyz[globalId + 2] * delT) + (accz * .5f * delT);
 
-            out_vxyz[globalId + 0] = in_vxyz[globalId + 0] + accx;
-            out_vxyz[globalId + 1] = in_vxyz[globalId + 1] + accy;
-            out_vxyz[globalId + 2] = in_vxyz[globalId + 2] + accz;
+            outVxyz[globalId + 0] = inVxyz[globalId + 0] + accx;
+            outVxyz[globalId + 1] = inVxyz[globalId + 1] + accy;
+            outVxyz[globalId + 2] = inVxyz[globalId + 2] + accz;
         });
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOfNullTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOfNullTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOfNullTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,8 +35,9 @@
         setupArrays();
         // change some of the inShapes to null
         for (int i = 0; i < NUM; i++) {
-            if (i % 3 == 0)
+            if (i % 3 == 0) {
                 inShapeArray[i] = null;
+            }
         }
 
         dispatchLambdaKernel(NUM, (gid) -> {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyAccTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyAccTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyAccTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -45,7 +45,7 @@
             super(x, y, z, m);
         }
 
-        public Vec3 computeAcc(Body[] in_bodies, float espSqr1, float delT1) {
+        public Vec3 computeAcc(Body[] inBodies, float espSqr1, float delT1) {
             float accx = 0.f;
             float accy = 0.f;
             float accz = 0.f;
@@ -53,12 +53,12 @@
             float myPosy = y;
             float myPosz = z;
 
-            for (int b = 0; b < in_bodies.length; b++) {
-                float dx = in_bodies[b].getX() - myPosx;
-                float dy = in_bodies[b].getY() - myPosy;
-                float dz = in_bodies[b].getZ() - myPosz;
+            for (int b = 0; b < inBodies.length; b++) {
+                float dx = inBodies[b].getX() - myPosx;
+                float dy = inBodies[b].getY() - myPosy;
+                float dz = inBodies[b].getZ() - myPosz;
                 float invDist = 1.0f / (float) Math.sqrt((dx * dx) + (dy * dy) + (dz * dz) + espSqr1);
-                float s = in_bodies[b].getM() * invDist * invDist * invDist;
+                float s = inBodies[b].getM() * invDist * invDist * invDist;
                 accx = accx + (s * dx);
                 accy = accy + (s * dy);
                 accz = accz + (s * dz);
@@ -69,10 +69,10 @@
         }
     }
 
-    @Result Body[] in_bodies = new Body[bodies];
-    @Result Body[] out_bodies = new Body[bodies];
+    @Result Body[] inBodies = new Body[bodies];
+    @Result Body[] outBodies = new Body[bodies];
 
-    static Body[] seed_bodies = new Body[bodies];
+    static Body[] seedBodies = new Body[bodies];
     static {
         final float maxDist = width / 4;
         for (int body = 0; body < bodies; body++) {
@@ -82,22 +82,22 @@
             float x = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
             float y = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
             float z = (float) (radius * Math.cos(phi));
-            seed_bodies[body] = new Body(x, y, z, mass);
+            seedBodies[body] = new Body(x, y, z, mass);
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_bodies, 0, in_bodies, 0, seed_bodies.length);
+        System.arraycopy(seedBodies, 0, inBodies, 0, seedBodies.length);
         for (int b = 0; b < bodies; b++) {
-            out_bodies[b] = new Body(0, 0, 0, mass);
+            outBodies[b] = new Body(0, 0, 0, mass);
         }
         // no local copies of arrays so we make it an instance lambda
 
         dispatchLambdaKernel(bodies, (gid) -> {
-            Body bin = in_bodies[gid];
-            Body bout = out_bodies[gid];
-            Vec3 acc = bin.computeAcc(in_bodies, espSqr, delT);
+            Body bin = inBodies[gid];
+            Body bout = outBodies[gid];
+            Vec3 acc = bin.computeAcc(inBodies, espSqr, delT);
 
             float myPosx = bin.getX();
             float myPosy = bin.getY();
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/InstanceOopNBodyTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -38,11 +38,11 @@
     static final int width = 768;
     static final int height = 768;
 
-    @Result Body[] in_bodies = new Body[bodies];
+    @Result Body[] inBodies = new Body[bodies];
 
-    @Result Body[] out_bodies = new Body[bodies];
+    @Result Body[] outBodies = new Body[bodies];
 
-    static Body[] seed_bodies = new Body[bodies];
+    static Body[] seedBodies = new Body[bodies];
     static {
         final float maxDist = width / 4;
         for (int body = 0; body < bodies; body++) {
@@ -52,15 +52,15 @@
             float x = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
             float y = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
             float z = (float) (radius * Math.cos(phi));
-            seed_bodies[body] = new Body(x, y, z, mass);
+            seedBodies[body] = new Body(x, y, z, mass);
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_bodies, 0, in_bodies, 0, seed_bodies.length);
+        System.arraycopy(seedBodies, 0, inBodies, 0, seedBodies.length);
         for (int b = 0; b < bodies; b++) {
-            out_bodies[b] = new Body(0, 0, 0, mass);
+            outBodies[b] = new Body(0, 0, 0, mass);
         }
         // no local copies of arrays so we make it an instance lambda
 
@@ -68,13 +68,13 @@
             float accx = 0.f;
             float accy = 0.f;
             float accz = 0.f;
-            Body inb = in_bodies[gid];
-            Body outb = out_bodies[gid];
+            Body inb = inBodies[gid];
+            Body outb = outBodies[gid];
             float myPosx = inb.getX();
             float myPosy = inb.getY();
             float myPosz = inb.getZ();
 
-            for (Body b : in_bodies) {
+            for (Body b : inBodies) {
                 final float dx = b.getX() - myPosx;
                 final float dy = b.getY() - myPosy;
                 final float dz = b.getZ() - myPosz;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyConjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyConjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyConjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class IntArrayCopyConjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result int[][] outArray = new int[NUM][MAXOUTSIZ];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyDisjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyDisjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/IntArrayCopyDisjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class IntArrayCopyDisjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result int[][] outArray = new int[NUM][MAXOUTSIZ];
     int[] inArray = new int[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyConjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyConjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyConjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class LongArrayCopyConjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result long[][] outArray = new long[NUM][MAXOUTSIZ];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyDisjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyDisjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongArrayCopyDisjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class LongArrayCopyDisjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result long[][] outArray = new long[NUM][MAXOUTSIZ];
     long[] inArray = new long[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongCmpTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongCmpTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/LongCmpTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -49,8 +49,9 @@
         dispatchLambdaKernel(NUM, (gid) -> {
             long val = inArray[gid];
             long result = val * val;
-            if (val > 9)
+            if (val > 9) {
                 result++;
+            }
             outArray[gid] = result;
         });
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelInstanceTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelInstanceTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelInstanceTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,27 +50,27 @@
     public void runTest() {
         setupPalette(palette);
 
-        float x_offset = -1f;
-        float y_offset = 0f;
+        float xOffset = -1f;
+        float yOffset = 0f;
         float scale = 3f;
 
         // call it for a range, specifying the lambda
         dispatchLambdaKernel(RANGE, (gid) -> {
             final int width = WIDTH;
             final int height = HEIGHT;
-            float lx = (((gid % width * scale) - ((scale / 2) * width)) / width) + x_offset;
-            float ly = (((gid / width * scale) - ((scale / 2) * height)) / height) + y_offset;
+            float lx = (((gid % width * scale) - ((scale / 2) * width)) / width) + xOffset;
+            float ly = (((gid / width * scale) - ((scale / 2) * height)) / height) + yOffset;
 
             int count = 0;
             float zx = lx;
             float zy = ly;
-            float new_zx = 0f;
+            float newZx = 0f;
 
             // Iterate until the algorithm converges or until maxIterations are reached.
                         while (count < maxIterations && zx * zx + zy * zy < 8) {
-                            new_zx = zx * zx - zy * zy + lx;
+                            newZx = zx * zx - zy * zy + lx;
                             zy = 2 * zx * zy + ly;
-                            zx = new_zx;
+                            zx = newZx;
                             count++;
                         }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelStaticTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelStaticTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MandelStaticTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -52,27 +52,27 @@
         // since we want this to be a fully static lambda, make local copies
         // of the arrays and values that will get captured by the lambda
         int[] rgb1 = this.rgb;
-        float x_offset = -1f;
-        float y_offset = 0f;
+        float xOffset = -1f;
+        float yOffset = 0f;
         float scale = 3f;
 
         // call it for a range, specifying lambda
         dispatchLambdaKernel(RANGE, (gid) -> {
             final int width = WIDTH;
             final int height = HEIGHT;
-            float lx = (((gid % width * scale) - ((scale / 2) * width)) / width) + x_offset;
-            float ly = (((gid / width * scale) - ((scale / 2) * height)) / height) + y_offset;
+            float lx = (((gid % width * scale) - ((scale / 2) * width)) / width) + xOffset;
+            float ly = (((gid / width * scale) - ((scale / 2) * height)) / height) + yOffset;
 
             int count = 0;
             float zx = lx;
             float zy = ly;
-            float new_zx = 0f;
+            float newZx = 0f;
 
             // Iterate until the algorithm converges or until maxIterations are reached.
                         while (count < maxIterations && zx * zx + zy * zy < 8) {
-                            new_zx = zx * zx - zy * zy + lx;
+                            newZx = zx * zx - zy * zy + lx;
                             zy = 2 * zx * zy + ly;
-                            zx = new_zx;
+                            zx = newZx;
                             count++;
                         }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MathTestBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MathTestBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MathTestBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,7 +31,7 @@
 import com.oracle.graal.compiler.hsail.test.infra.*;
 
 /**
- * Tests call to Math.tan(double)
+ * Tests call to Math.tan(double).
  */
 public abstract class MathTestBase extends GraalKernelTester {
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MoreThanEightArgsOOBTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MoreThanEightArgsOOBTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/MoreThanEightArgsOOBTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -92,4 +92,4 @@
     public void testUsingLambdaMethod() {
         testGeneratedHsailUsingLambdaMethod();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/NonEscapingNewObjWithArrayTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/NonEscapingNewObjWithArrayTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/NonEscapingNewObjWithArrayTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -41,7 +41,7 @@
     @Result public float[] outArray = new float[NUM];
 
     static class MyObj {
-        float a[];
+        float[] a;
 
         public MyObj(float[] src, int ofst) {
             a = Arrays.copyOfRange(src, ofst, ofst + 3);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyConjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyConjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyConjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class ObjArrayCopyConjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result String[][] outArray = new String[NUM][MAXOUTSIZ];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointNonExactTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointNonExactTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointNonExactTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class ObjArrayCopyDisjointNonExactTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result Object[][] outArray = new Object[NUM][MAXOUTSIZ];
     String[] inArray = new String[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjArrayCopyDisjointTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,8 +31,8 @@
  */
 public class ObjArrayCopyDisjointTest extends GraalKernelTester {
 
-    final static int MAXOUTSIZ = 100;
-    final static int NUM = 20;
+    static final int MAXOUTSIZ = 100;
+    static final int NUM = 20;
 
     @Result String[][] outArray = new String[NUM][MAXOUTSIZ];
     String[] inArray = new String[NUM + MAXOUTSIZ];
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjectStoreNullTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjectStoreNullTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ObjectStoreNullTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -26,7 +26,7 @@
 import org.junit.Test;
 
 /**
- * Tests the storing of null in an Object array
+ * Tests the storing of null in an Object array.
  */
 public class ObjectStoreNullTest extends ObjectStoreTest {
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMaxTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -40,7 +40,7 @@
     static int loops = 1;
 
     // The source array
-    int bigArray[] = null;
+    int[] bigArray = null;
 
     // result for baseline single threaded stream
     int resultStream = 0;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceMinTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -40,7 +40,7 @@
     static int loops = 1;
 
     // The input array to the kernel
-    int bigArray[] = null;
+    int[] bigArray = null;
 
     // result for baseline single threaded stream
     int resultStream = 0;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/ReduceSumTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -40,7 +40,7 @@
     static int loops = 1;
 
     // The array to be summed
-    int bigArray[] = null;
+    int[] bigArray = null;
 
     // sum for baseline single threaded stream
     int sumStream = 0;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldSameClassTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldSameClassTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldSameClassTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -41,8 +41,9 @@
         dispatchLambdaKernel(NUM, (gid) -> {
             int val = inArray[gid] * myField1;
             outArray[gid] = val;
-            if (gid == 3)
+            if (gid == 3) {
                 myField2 = val + gid;
+            }
         });
         fieldResult = myField2;
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldWriteTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldWriteTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticIntFieldWriteTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -51,8 +51,9 @@
         intStaticField = -99;
         dispatchLambdaKernel(NUM, (gid) -> {
             outArray[gid] = inArray[gid] * 2;
-            if (gid == 3)
+            if (gid == 3) {
                 intStaticField = outArray[gid];
+            }
         });
         fieldResult = intStaticField;   // save for kerneltester comparison
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticNBodyTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticNBodyTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StaticNBodyTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,40 +39,40 @@
     static final int width = 768;
     static final int height = 768;
 
-    @Result float[] in_xyz = new float[bodies * 3]; // positions xy and z of bodies
+    @Result float[] inXyz = new float[bodies * 3]; // positions xy and z of bodies
 
-    @Result float[] out_xyz = new float[bodies * 3]; // positions xy and z of bodies
+    @Result float[] outXyz = new float[bodies * 3]; // positions xy and z of bodies
 
-    @Result float[] in_vxyz = new float[bodies * 3]; // velocity component of x,y and z of
+    @Result float[] inVxyz = new float[bodies * 3]; // velocity component of x,y and z of
     // bodies
 
-    @Result float[] out_vxyz = new float[bodies * 3];
+    @Result float[] outVxyz = new float[bodies * 3];
 
-    static float[] seed_xyz = new float[bodies * 3];
+    static float[] seedXyz = new float[bodies * 3];
     static {
         final float maxDist = width / 4;
         for (int body = 0; body < (bodies * 3); body += 3) {
             final float theta = (float) (Math.random() * Math.PI * 2);
             final float phi = (float) (Math.random() * Math.PI * 2);
             final float radius = (float) (Math.random() * maxDist);
-            seed_xyz[body + 0] = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
-            seed_xyz[body + 1] = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
-            seed_xyz[body + 2] = (float) (radius * Math.cos(phi));
+            seedXyz[body + 0] = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
+            seedXyz[body + 1] = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
+            seedXyz[body + 2] = (float) (radius * Math.cos(phi));
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_xyz, 0, in_xyz, 0, seed_xyz.length);
-        Arrays.fill(out_xyz, 0f);
-        Arrays.fill(out_vxyz, 0f);
-        Arrays.fill(in_vxyz, 0f);
+        System.arraycopy(seedXyz, 0, inXyz, 0, seedXyz.length);
+        Arrays.fill(outXyz, 0f);
+        Arrays.fill(outVxyz, 0f);
+        Arrays.fill(inVxyz, 0f);
 
         // local copies for a static lambda
-        float[] in_xyz1 = this.in_xyz;
-        float[] out_xyz1 = this.out_xyz;
-        float[] in_vxyz1 = this.in_vxyz;
-        float[] out_vxyz1 = this.out_vxyz;
+        float[] inXyz1 = this.inXyz;
+        float[] outXyz1 = this.outXyz;
+        float[] inVxyz1 = this.inVxyz;
+        float[] outVxyz1 = this.outVxyz;
 
         dispatchLambdaKernel(bodies, (gid) -> {
             final int count = bodies * 3;
@@ -82,9 +82,9 @@
             float accy = 0.f;
             float accz = 0.f;
             for (int i = 0; i < count; i += 3) {
-                final float dx = in_xyz1[i + 0] - in_xyz1[globalId + 0];
-                final float dy = in_xyz1[i + 1] - in_xyz1[globalId + 1];
-                final float dz = in_xyz1[i + 2] - in_xyz1[globalId + 2];
+                final float dx = inXyz1[i + 0] - inXyz1[globalId + 0];
+                final float dy = inXyz1[i + 1] - inXyz1[globalId + 1];
+                final float dz = inXyz1[i + 2] - inXyz1[globalId + 2];
                 final float invDist = (float) (1.0 / (Math.sqrt((dx * dx) + (dy * dy) + (dz * dz) + espSqr)));
                 accx += mass * invDist * invDist * invDist * dx;
                 accy += mass * invDist * invDist * invDist * dy;
@@ -93,13 +93,13 @@
             accx *= delT;
             accy *= delT;
             accz *= delT;
-            out_xyz1[globalId + 0] = in_xyz1[globalId + 0] + (in_vxyz1[globalId + 0] * delT) + (accx * .5f * delT);
-            out_xyz1[globalId + 1] = in_xyz1[globalId + 1] + (in_vxyz1[globalId + 1] * delT) + (accy * .5f * delT);
-            out_xyz1[globalId + 2] = in_xyz1[globalId + 2] + (in_vxyz1[globalId + 2] * delT) + (accz * .5f * delT);
+            outXyz1[globalId + 0] = inXyz1[globalId + 0] + (inVxyz1[globalId + 0] * delT) + (accx * .5f * delT);
+            outXyz1[globalId + 1] = inXyz1[globalId + 1] + (inVxyz1[globalId + 1] * delT) + (accy * .5f * delT);
+            outXyz1[globalId + 2] = inXyz1[globalId + 2] + (inVxyz1[globalId + 2] * delT) + (accz * .5f * delT);
 
-            out_vxyz1[globalId + 0] = in_vxyz1[globalId + 0] + accx;
-            out_vxyz1[globalId + 1] = in_vxyz1[globalId + 1] + accy;
-            out_vxyz1[globalId + 2] = in_vxyz1[globalId + 2] + accz;
+            outVxyz1[globalId + 0] = inVxyz1[globalId + 0] + accx;
+            outVxyz1[globalId + 1] = inVxyz1[globalId + 1] + accy;
+            outVxyz1[globalId + 2] = inVxyz1[globalId + 2] + accz;
         });
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringBuilderTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringBuilderTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringBuilderTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,7 +31,7 @@
  */
 public class StringBuilderTest extends GraalKernelTester {
 
-    final static int NUM = 20;
+    static final int NUM = 20;
     StringBuilder[] builders = new StringBuilder[NUM];
     @Result String[] resultString = new String[NUM];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubsequenceTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubsequenceTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubsequenceTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,7 +31,7 @@
  */
 public class StringSubsequenceTest extends GraalKernelTester {
 
-    final static int NUM = 50;
+    static final int NUM = 50;
     String inputString;
     @Result CharSequence[] resultSequence = new String[NUM];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubstringTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubstringTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/StringSubstringTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,7 +31,7 @@
  */
 public class StringSubstringTest extends GraalKernelTester {
 
-    final static int NUM = 50;
+    static final int NUM = 50;
     String inputString;
     @Result String[] resultString = new String[NUM];
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyDeoptTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyDeoptTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyDeoptTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,10 +46,10 @@
          */
         private static final long serialVersionUID = 1L;
 
-        public Body(float _x, float _y, float _z, float _m) {
-            super(_x, _y, _z);
-            m = _m;
-            v = new Vector3f(0, 0, 0);
+        public Body(float x, float y, float z, float m) {
+            super(x, y, z);
+            this.m = m;
+            this.v = new Vector3f(0, 0, 0);
         }
 
         float m;
@@ -59,10 +59,10 @@
             return m;
         }
 
-        public Vector3f computeAcc(Body[] in_bodies, float espSqr1, float delT1) {
+        public Vector3f computeAcc(Body[] inBodies, float espSqr1, float delT1) {
             Vector3f acc = new Vector3f();
 
-            for (Body b : in_bodies) {
+            for (Body b : inBodies) {
                 Vector3f d = new Vector3f();
                 d.sub(b, this);
                 float invDist = 1.0f / (float) Math.sqrt(d.lengthSquared() + espSqr1);
@@ -76,10 +76,10 @@
         }
     }
 
-    @Result Body[] in_bodies = new Body[bodies];
-    @Result Body[] out_bodies = new Body[bodies];
+    @Result Body[] inBodies = new Body[bodies];
+    @Result Body[] outBodies = new Body[bodies];
 
-    static Body[] seed_bodies = new Body[bodies];
+    static Body[] seedBodies = new Body[bodies];
 
     static {
         java.util.Random randgen = new Random(0);
@@ -91,22 +91,22 @@
             float x = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
             float y = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
             float z = (float) (radius * Math.cos(phi));
-            seed_bodies[body] = new Body(x, y, z, mass);
+            seedBodies[body] = new Body(x, y, z, mass);
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_bodies, 0, in_bodies, 0, seed_bodies.length);
+        System.arraycopy(seedBodies, 0, inBodies, 0, seedBodies.length);
         for (int b = 0; b < bodies; b++) {
-            out_bodies[b] = new Body(0, 0, 0, mass);
+            outBodies[b] = new Body(0, 0, 0, mass);
         }
         // no local copies of arrays so we make it an instance lambda
 
         dispatchLambdaKernel(bodies, (gid) -> {
-            Body inb = in_bodies[gid];
-            Body outb = out_bodies[gid];
-            Vector3f acc = inb.computeAcc(in_bodies, espSqr, delT);
+            Body inb = inBodies[gid];
+            Body outb = outBodies[gid];
+            Vector3f acc = inb.computeAcc(inBodies, espSqr, delT);
 
             Vector3f tmpPos = new Vector3f();
             tmpPos.scaleAdd(delT, inb.v, inb);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VecmathNBodyTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,10 +46,10 @@
          */
         private static final long serialVersionUID = 1L;
 
-        public Body(float _x, float _y, float _z, float _m) {
-            super(_x, _y, _z);
-            m = _m;
-            v = new Vector3f(0, 0, 0);
+        public Body(float x, float y, float z, float m) {
+            super(x, y, z);
+            this.m = m;
+            this.v = new Vector3f(0, 0, 0);
         }
 
         float m;
@@ -59,10 +59,10 @@
             return m;
         }
 
-        public Vector3f computeAcc(Body[] in_bodies, float espSqr1, float delT1) {
+        public Vector3f computeAcc(Body[] inBodies, float espSqr1, float delT1) {
             Vector3f acc = new Vector3f();
 
-            for (Body b : in_bodies) {
+            for (Body b : inBodies) {
                 Vector3f d = new Vector3f();
                 d.sub(b, this);
                 float invDist = 1.0f / (float) Math.sqrt(d.lengthSquared() + espSqr1);
@@ -76,10 +76,10 @@
         }
     }
 
-    @Result Body[] in_bodies = new Body[bodies];
-    @Result Body[] out_bodies = new Body[bodies];
+    @Result Body[] inBodies = new Body[bodies];
+    @Result Body[] outBodies = new Body[bodies];
 
-    static Body[] seed_bodies = new Body[bodies];
+    static Body[] seedBodies = new Body[bodies];
 
     static {
         java.util.Random randgen = new Random(0);
@@ -91,22 +91,22 @@
             float x = (float) (radius * Math.cos(theta) * Math.sin(phi)) + width / 2;
             float y = (float) (radius * Math.sin(theta) * Math.sin(phi)) + height / 2;
             float z = (float) (radius * Math.cos(phi));
-            seed_bodies[body] = new Body(x, y, z, mass);
+            seedBodies[body] = new Body(x, y, z, mass);
         }
     }
 
     @Override
     public void runTest() {
-        System.arraycopy(seed_bodies, 0, in_bodies, 0, seed_bodies.length);
+        System.arraycopy(seedBodies, 0, inBodies, 0, seedBodies.length);
         for (int b = 0; b < bodies; b++) {
-            out_bodies[b] = new Body(0, 0, 0, mass);
+            outBodies[b] = new Body(0, 0, 0, mass);
         }
         // no local copies of arrays so we make it an instance lambda
 
         dispatchLambdaKernel(bodies, (gid) -> {
-            Body inb = in_bodies[gid];
-            Body outb = out_bodies[gid];
-            Vector3f acc = inb.computeAcc(in_bodies, espSqr, delT);
+            Body inb = inBodies[gid];
+            Body outb = outBodies[gid];
+            Vector3f acc = inb.computeAcc(inBodies, espSqr, delT);
 
             Vector3f tmpPos = new Vector3f();
             tmpPos.scaleAdd(delT, inb.v, inb);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VectorStreamTest.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VectorStreamTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VectorStreamTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,9 +46,9 @@
         int x;
         int y;
 
-        public MyPoint(int _x, int _y) {
-            x = _x;
-            y = _y;
+        public MyPoint(int x, int y) {
+            this.x = x;
+            this.y = y;
         }
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VirtualCallBase.java
--- a/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VirtualCallBase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.hsail.test/src/com/oracle/graal/compiler/hsail/test/lambda/VirtualCallBase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -28,16 +28,16 @@
 /**
  * Base class for testing virtual method calls.
  */
-abstract public class VirtualCallBase extends GraalKernelTester {
+public abstract class VirtualCallBase extends GraalKernelTester {
 
     static final int NUM = 20000;
 
     @Result public float[] outArray = new float[NUM];
     public Shape[] inShapeArray = new Shape[NUM];
 
-    static abstract class Shape {
+    abstract static class Shape {
 
-        abstract public float getArea();
+        public abstract float getArea();
     }
 
     static class Circle extends Shape {
@@ -58,8 +58,8 @@
 
         private float len;
 
-        Square(float _len) {
-            len = _len;
+        Square(float len) {
+            this.len = len;
         }
 
         @Override
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRBuilder.java	Fri Oct 24 16:18:10 2014 +0200
@@ -101,15 +101,14 @@
             default:
                 throw GraalInternalError.unimplemented("unsupported sign extension (" + fromBits + " bit -> " + toBits + " bit)");
         }
-        {
-            Kind localFromKind = fromKind;
-            Kind localToKind = toKind;
-            return builder -> {
-                Value address = access.accessLocation().generateAddress(builder, gen, operand(access.object()));
-                Value v = getLIRGeneratorTool().emitLoad(LIRKind.value(localFromKind), address, getState(access));
-                return getLIRGeneratorTool().emitReinterpret(LIRKind.value(localToKind), v);
-            };
-        }
+
+        Kind localFromKind = fromKind;
+        Kind localToKind = toKind;
+        return builder -> {
+            Value address = access.accessLocation().generateAddress(builder, gen, operand(access.object()));
+            Value v = getLIRGeneratorTool().emitLoad(LIRKind.value(localFromKind), address, getState(access));
+            return getLIRGeneratorTool().emitReinterpret(LIRKind.value(localToKind), v);
+        };
     }
 
     @MatchRule("(SignExtend Read=access)")
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/DebugFilter.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/DebugFilter.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/DebugFilter.java	Fri Oct 24 16:18:10 2014 +0200
@@ -83,7 +83,7 @@
  * Matches scopes containing "Code" but not "Dead", with log level {@link Debug#DEFAULT_LOG_LEVEL}.
  * </ul>
  */
-class DebugFilter {
+final class DebugFilter {
 
     public static DebugFilter parse(String spec) {
         if (spec == null) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeLIRBuilder.java	Fri Oct 24 16:18:10 2014 +0200
@@ -67,4 +67,4 @@
 
     public abstract int getFieldOffset(ResolvedJavaField field);
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/BytecodeParserTool.java	Fri Oct 24 16:18:10 2014 +0200
@@ -25,7 +25,7 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * visible interface of bytecode parsers
+ * visible interface of bytecode parsers.
  */
 public interface BytecodeParserTool {
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchContext.java	Fri Oct 24 16:18:10 2014 +0200
@@ -90,7 +90,7 @@
             return Result.OK;
         } else {
             if (current.value != value || current.type != type) {
-                return Result.NAMED_VALUE_MISMATCH(value, rule.getPattern());
+                return Result.namedValueMismatch(value, rule.getPattern());
             }
             return Result.OK;
         }
@@ -112,7 +112,7 @@
                         Debug.log("%s(%s) %1s", (consumed != null && consumed.contains(theNode) || theNode == root) ? "*" : " ", theNode.usages().count(), theNode);
                     }
                 }
-                return Result.NOT_SAFE(node, rule.getPattern());
+                return Result.notSafe(node, rule.getPattern());
             }
         }
         return Result.OK;
@@ -152,11 +152,11 @@
         // Check NOT_IN_BLOCK first since that usually implies ALREADY_USED
         int index = nodes.indexOf(node);
         if (index == -1) {
-            return Result.NOT_IN_BLOCK(node, rule.getPattern());
+            return Result.notInBlock(node, rule.getPattern());
         }
 
         if (builder.hasOperand(node)) {
-            return Result.ALREADY_USED(node, rule.getPattern());
+            return Result.alreadyUsed(node, rule.getPattern());
         }
 
         startIndex = Math.min(startIndex, index);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchPattern.java	Fri Oct 24 16:18:10 2014 +0200
@@ -75,32 +75,32 @@
         private static final Result CACHED_NOT_SAFE = new Result(MatchResultCode.NOT_SAFE, null, null);
         private static final Result CACHED_ALREADY_USED = new Result(MatchResultCode.ALREADY_USED, null, null);
 
-        static Result WRONG_CLASS(ValueNode node, MatchPattern matcher) {
+        static Result wrongClass(ValueNode node, MatchPattern matcher) {
             MatchResult_WRONG_CLASS.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.WRONG_CLASS, node, matcher) : CACHED_WRONG_CLASS;
         }
 
-        static Result NAMED_VALUE_MISMATCH(ValueNode node, MatchPattern matcher) {
+        static Result namedValueMismatch(ValueNode node, MatchPattern matcher) {
             MatchResult_NAMED_VALUE_MISMATCH.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.NAMED_VALUE_MISMATCH, node, matcher) : CACHED_NAMED_VALUE_MISMATCH;
         }
 
-        static Result TOO_MANY_USERS(ValueNode node, MatchPattern matcher) {
+        static Result tooManyUsers(ValueNode node, MatchPattern matcher) {
             MatchResult_TOO_MANY_USERS.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.TOO_MANY_USERS, node, matcher) : CACHED_TOO_MANY_USERS;
         }
 
-        static Result NOT_IN_BLOCK(ScheduledNode node, MatchPattern matcher) {
+        static Result notInBlock(ScheduledNode node, MatchPattern matcher) {
             MatchResult_NOT_IN_BLOCK.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.NOT_IN_BLOCK, node, matcher) : CACHED_NOT_IN_BLOCK;
         }
 
-        static Result NOT_SAFE(ScheduledNode node, MatchPattern matcher) {
+        static Result notSafe(ScheduledNode node, MatchPattern matcher) {
             MatchResult_NOT_SAFE.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.NOT_SAFE, node, matcher) : CACHED_NOT_SAFE;
         }
 
-        static Result ALREADY_USED(ValueNode node, MatchPattern matcher) {
+        static Result alreadyUsed(ValueNode node, MatchPattern matcher) {
             MatchResult_ALREADY_USED.increment();
             return Debug.isEnabled() ? new Result(MatchResultCode.ALREADY_USED, node, matcher) : CACHED_ALREADY_USED;
         }
@@ -186,7 +186,7 @@
 
     private Result matchType(ValueNode node) {
         if (nodeClass != null && node.getClass() != nodeClass) {
-            return Result.WRONG_CLASS(node, this);
+            return Result.wrongClass(node, this);
         }
         return Result.OK;
     }
@@ -252,7 +252,7 @@
 
         if (singleUser && !atRoot) {
             if (node.usages().count() > 1) {
-                return Result.TOO_MANY_USERS(node, statement.getPattern());
+                return Result.tooManyUsers(node, statement.getPattern());
             }
         }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchProcessor.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchProcessor.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchProcessor.java	Fri Oct 24 16:18:10 2014 +0200
@@ -536,13 +536,13 @@
             out.println();
             out.println("    @Override");
             out.println("    public List<" + desc + "> statements(MatchRuleRegistry.NodeClassLookup lookup) {");
+            out.println("        // Checkstyle: stop ");
 
             for (String positionDeclaration : info.positionDeclarations) {
                 out.println("        " + positionDeclaration);
             }
             out.println();
 
-            out.println("        // CheckStyle: stop line length check");
             out.println("        List<" + desc + "> statements = Collections.unmodifiableList(Arrays.asList(");
 
             int i = 0;
@@ -552,7 +552,7 @@
                 i++;
             }
             out.println("        ));");
-            out.println("        // CheckStyle: resume line length check");
+            out.println("        // Checkstyle: resume");
             out.println("        return statements;");
             out.println("    }");
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchRuleRegistry.java	Fri Oct 24 16:18:10 2014 +0200
@@ -43,7 +43,7 @@
      * the current NodeClass might not be the same NodeClass used in the target so this provides a
      * level of indirection.
      */
-    public static interface NodeClassLookup {
+    public interface NodeClassLookup {
         NodeClass get(Class<?> theClass);
     }
 
@@ -87,7 +87,7 @@
      * @param theClass
      * @return the set of {@link MatchStatement}s applicable to theClass.
      */
-    public synchronized static Map<Class<? extends ValueNode>, List<MatchStatement>> lookup(Class<? extends NodeLIRBuilder> theClass) {
+    public static synchronized Map<Class<? extends ValueNode>, List<MatchStatement>> lookup(Class<? extends NodeLIRBuilder> theClass) {
         Map<Class<? extends ValueNode>, List<MatchStatement>> result = registry.get(theClass);
 
         if (result == null) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatementSet.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatementSet.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/match/MatchStatementSet.java	Fri Oct 24 16:18:10 2014 +0200
@@ -32,10 +32,10 @@
      * @return the {@link NodeLIRBuilder} subclass which defined this set of {@link MatchStatement}
      *         instances.
      */
-    public Class<? extends NodeLIRBuilder> forClass();
+    Class<? extends NodeLIRBuilder> forClass();
 
     /**
      * @return the {@link MatchStatement}s available for this {@link NodeLIRBuilder} subclass.
      */
-    public List<MatchStatement> statements(MatchRuleRegistry.NodeClassLookup lookup);
+    List<MatchStatement> statements(MatchRuleRegistry.NodeClassLookup lookup);
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.debug/src/com/oracle/graal/debug/AnsiColor.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/AnsiColor.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/AnsiColor.java	Fri Oct 24 16:18:10 2014 +0200
@@ -26,63 +26,63 @@
  * Ansi terminal color escape codes.
  */
 public final class AnsiColor {
-    /** Foreground black */
+    /** Foreground black. */
     public static final String BLACK = "\u001b[30m";
-    /** Foreground red */
+    /** Foreground red. */
     public static final String RED = "\u001b[31m";
-    /** Foreground green */
+    /** Foreground green. */
     public static final String GREEN = "\u001b[32m";
-    /** Foreground yellow */
+    /** Foreground yellow. */
     public static final String YELLOW = "\u001b[33m";
-    /** Foreground blue */
+    /** Foreground blue. */
     public static final String BLUE = "\u001b[34m";
-    /** Foreground magenta */
+    /** Foreground magenta. */
     public static final String MAGENTA = "\u001b[35m";
-    /** Foreground cyan */
+    /** Foreground cyan. */
     public static final String CYAN = "\u001b[36m";
-    /** Foreground white */
+    /** Foreground white. */
     public static final String WHITE = "\u001b[37m";
 
-    /** Foreground bold black */
+    /** Foreground bold black. */
     public static final String BOLD_BLACK = "\u001b[30;1m";
-    /** Foreground bold red */
+    /** Foreground bold red. */
     public static final String BOLD_RED = "\u001b[31;1m";
-    /** Foreground bold green */
+    /** Foreground bold green. */
     public static final String BOLD_GREEN = "\u001b[32;1m";
-    /** Foreground bold yellow */
+    /** Foreground bold yellow. */
     public static final String BOLD_YELLOW = "\u001b[33;1m";
-    /** Foreground bold blue */
+    /** Foreground bold blue. */
     public static final String BOLD_BLUE = "\u001b[34;1m";
-    /** Foreground bold magenta */
+    /** Foreground bold magenta. */
     public static final String BOLD_MAGENTA = "\u001b[35;1m";
-    /** Foreground bold cyan */
+    /** Foreground bold cyan. */
     public static final String BOLD_CYAN = "\u001b[36;1m";
-    /** Foreground bold white */
+    /** Foreground bold white. */
     public static final String BOLD_WHITE = "\u001b[37;1m";
 
-    /** Background black */
+    /** Background black. */
     public static final String BG_BLACK = "\u001b[40m";
-    /** Background red */
+    /** Background red. */
     public static final String BG_RED = "\u001b[41m";
-    /** Background green */
+    /** Background green. */
     public static final String BG_GREEN = "\u001b[42m";
-    /** Background yellow */
+    /** Background yellow. */
     public static final String BG_YELLOW = "\u001b[43m";
-    /** Background blue */
+    /** Background blue. */
     public static final String BG_BLUE = "\u001b[44m";
-    /** Background magenta */
+    /** Background magenta. */
     public static final String BG_MAGENTA = "\u001b[45m";
-    /** Background cyan */
+    /** Background cyan. */
     public static final String BG_CYAN = "\u001b[46m";
-    /** Background white */
+    /** Background white. */
     public static final String BG_WHITE = "\u001b[47m";
 
-    /** Reset */
+    /** Reset. */
     public static final String RESET = "\u001b[0m";
-    /** Underline */
+    /** Underline. */
     public static final String UNDERLINED = "\u001b[4m";
 
-    /** Prevent instantiation */
+    /** Prevent instantiation. */
     private AnsiColor() {
     }
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java
--- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/TimerImpl.java	Fri Oct 24 16:18:10 2014 +0200
@@ -112,7 +112,7 @@
         return TimeUnit.NANOSECONDS;
     }
 
-    private static abstract class AbstractTimer implements TimerCloseable {
+    private abstract static class AbstractTimer implements TimerCloseable {
 
         private final AbstractTimer parent;
         private final TimerImpl timer;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java
--- a/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph.test/src/com/oracle/graal/graph/test/NodeUsagesTests.java	Fri Oct 24 16:18:10 2014 +0200
@@ -341,7 +341,7 @@
     }
 
     @Test
-    public void testReplaceAtUsagesWithPredicate2_3() {
+    public void testReplaceAtUsagesWithPredicate203() {
         Graph graph = new Graph();
         Def def0 = graph.add(Def.create());
         Def def1 = graph.add(Def.create());
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/.checkstyle_checks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.graph/.checkstyle_checks.xml	Fri Oct 24 16:18:10 2014 +0200
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: Checks
+    Description: none
+-->
+<module name="Checker">
+  <property name="severity" value="error"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="FileContentsHolder"/>
+    <module name="JavadocStyle">
+      <property name="checkHtml" value="false"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName">
+      <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="TypeName">
+      <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/>
+    </module>
+    <module name="RedundantImport"/>
+    <module name="LineLength">
+      <property name="max" value="250"/>
+    </module>
+    <module name="MethodParamPad"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+    </module>
+    <module name="ParenPad"/>
+    <module name="TypecastParenPad">
+      <property name="tokens" value="RPAREN,TYPECAST"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround">
+      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+    </module>
+    <module name="RedundantModifier"/>
+    <module name="AvoidNestedBlocks">
+      <property name="allowInSwitchCase" value="true"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+      <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
+    </module>
+    <module name="LeftCurly"/>
+    <module name="NeedBraces"/>
+    <module name="RightCurly"/>
+    <module name="EmptyStatement"/>
+    <module name="HiddenField">
+      <property name="severity" value="ignore"/>
+      <property name="ignoreConstructorParameter" value="true"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+    <module name="FallThrough"/>
+    <module name="FinalLocalVariable">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="StringLiteralEquality">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="SuperFinalize"/>
+    <module name="UnnecessaryParentheses">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="Indentation">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="StaticVariableName">
+      <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="EmptyForInitializerPad"/>
+    <module name="EmptyForIteratorPad"/>
+    <module name="ModifierOrder"/>
+    <module name="DefaultComesLast"/>
+    <module name="InnerAssignment">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="JUnitTestCase"/>
+    <module name="ModifiedControlVariable"/>
+    <module name="MutableException">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ParameterAssignment">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
+      <property name="format" value="\s$"/>
+      <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/>
+      <property name="ignoreComments" value="true"/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/>
+      <property name="format" value=" ,"/>
+      <property name="message" value="illegal space before a comma"/>
+      <property name="ignoreComments" value="true"/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
+    </module>
+  </module>
+  <module name="RegexpHeader">
+    <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+  <module name="FileTabCharacter">
+    <property name="severity" value="error"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
+  <module name="Translation"/>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
+    <property name="checkFormat" value="ConstantNameCheck"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop method name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume method name check"/>
+    <property name="checkFormat" value="MethodName"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
+    <property name="checkFormat" value="ParameterAssignment"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
+    <property name="checkFormat" value="FinalLocalVariable"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop"/>
+    <property name="onCommentFormat" value="Checkstyle: resume"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
+    <property name="checkFormat" value="InnerAssignment"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop field name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume field name check"/>
+    <property name="checkFormat" value="MemberName"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
+  </module>
+  <module name="RegexpMultiline">
+    <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/>
+    <property name="format" value="\r\n"/>
+    <property name="message" value="illegal Windows line ending"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop header check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume header check"/>
+    <property name="checkFormat" value=".*Header"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop line length check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume line length check"/>
+    <property name="checkFormat" value="LineLength"/>
+  </module>
+</module>
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/.checkstyle_checks.xml.disabled
--- a/graal/com.oracle.graal.graph/.checkstyle_checks.xml.disabled	Thu Oct 23 17:20:10 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-    Checkstyle-Configuration: Checks
-    Description: none
--->
-<module name="Checker">
-  <property name="severity" value="error"/>
-  <module name="TreeWalker">
-    <property name="tabWidth" value="4"/>
-    <module name="FileContentsHolder"/>
-    <module name="JavadocStyle">
-      <property name="checkHtml" value="false"/>
-    </module>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="MemberName">
-      <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
-    </module>
-    <module name="MethodName">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="TypeName">
-      <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/>
-    </module>
-    <module name="RedundantImport"/>
-    <module name="LineLength">
-      <property name="max" value="250"/>
-    </module>
-    <module name="MethodParamPad"/>
-    <module name="NoWhitespaceAfter">
-      <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
-    </module>
-    <module name="ParenPad"/>
-    <module name="TypecastParenPad">
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter"/>
-    <module name="WhitespaceAround">
-      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
-    </module>
-    <module name="RedundantModifier"/>
-    <module name="AvoidNestedBlocks">
-      <property name="allowInSwitchCase" value="true"/>
-    </module>
-    <module name="EmptyBlock">
-      <property name="option" value="text"/>
-      <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
-    </module>
-    <module name="LeftCurly"/>
-    <module name="NeedBraces"/>
-    <module name="RightCurly"/>
-    <module name="EmptyStatement"/>
-    <module name="HiddenField">
-      <property name="severity" value="ignore"/>
-      <property name="ignoreConstructorParameter" value="true"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="ArrayTypeStyle"/>
-    <module name="UpperEll"/>
-    <module name="FallThrough"/>
-    <module name="FinalLocalVariable">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="MultipleVariableDeclarations"/>
-    <module name="StringLiteralEquality">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="SuperFinalize"/>
-    <module name="UnnecessaryParentheses">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="Indentation">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="StaticVariableName">
-      <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="EmptyForInitializerPad"/>
-    <module name="EmptyForIteratorPad"/>
-    <module name="ModifierOrder"/>
-    <module name="DefaultComesLast"/>
-    <module name="InnerAssignment">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="JUnitTestCase"/>
-    <module name="ModifiedControlVariable"/>
-    <module name="MutableException">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="ParameterAssignment">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
-      <property name="format" value="\s$"/>
-      <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/>
-      <property name="ignoreComments" value="true"/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/>
-      <property name="format" value=" ,"/>
-      <property name="message" value="illegal space before a comma"/>
-      <property name="ignoreComments" value="true"/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
-    </module>
-  </module>
-  <module name="RegexpHeader">
-    <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="FileTabCharacter">
-    <property name="severity" value="error"/>
-  </module>
-  <module name="NewlineAtEndOfFile">
-    <property name="lineSeparator" value="lf"/>
-  </module>
-  <module name="Translation"/>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
-    <property name="checkFormat" value="ConstantNameCheck"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop method name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume method name check"/>
-    <property name="checkFormat" value="MethodName"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
-    <property name="checkFormat" value="ParameterAssignment"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
-    <property name="checkFormat" value="FinalLocalVariable"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop"/>
-    <property name="onCommentFormat" value="Checkstyle: resume"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
-    <property name="checkFormat" value="InnerAssignment"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop field name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume field name check"/>
-    <property name="checkFormat" value="MemberName"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
-  </module>
-  <module name="RegexpMultiline">
-    <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/>
-    <property name="format" value="\r\n"/>
-    <property name="message" value="illegal Windows line ending"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop system..print check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume system..print check"/>
-    <property name="checkFormat" value="RegexpSingleline"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable System.(out|err).print checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop header check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume header check"/>
-    <property name="checkFormat" value=".*Header"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
-  </module>
-  <module name="RegexpSingleline">
-    <property name="format" value="System\.(out|err)\.print"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop line length check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume line length check"/>
-    <property name="checkFormat" value="LineLength"/>
-  </module>
-</module>
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraphNodeIterator.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraphNodeIterator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/GraphNodeIterator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -75,4 +75,4 @@
     public void remove() {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Node.java	Fri Oct 24 16:18:10 2014 +0200
@@ -59,7 +59,7 @@
 @NodeInfo
 public abstract class Node implements Cloneable, Formattable {
 
-    public final static boolean USE_UNSAFE_TO_CLONE = Boolean.parseBoolean(System.getProperty("graal.node.useUnsafeToClone", "true"));
+    public static final boolean USE_UNSAFE_TO_CLONE = Boolean.parseBoolean(System.getProperty("graal.node.useUnsafeToClone", "true"));
 
     static final int DELETED_ID_START = -1000000000;
     static final int INITIAL_ID = -1;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodePosIterator.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodePosIterator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodePosIterator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -29,4 +29,4 @@
  */
 public interface NodePosIterator extends Iterator<Node> {
     Position nextPosition();
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterable.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterable.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterable.java	Fri Oct 24 16:18:10 2014 +0200
@@ -56,4 +56,4 @@
     public int count() {
         return node.usageCount();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterator.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageIterator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -66,4 +66,4 @@
     public void remove() {
         throw new UnsupportedOperationException();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageWithModCountIterator.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageWithModCountIterator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeUsageWithModCountIterator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -47,4 +47,4 @@
         }
         return super.next();
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/ForEachToGraal.java	Fri Oct 24 16:18:10 2014 +0200
@@ -225,8 +225,8 @@
         try {
             assert streamSource.length >= GlobalSize : "Input array length=" + streamSource.length + " smaller than requested global_size=" + GlobalSize;
 
-            int result[] = {identity};
-            Object args[] = {streamSource, result, streamSource.length};
+            int[] result = {identity};
+            Object[] args = {streamSource, result, streamSource.length};
             args[0] = streamSource;
 
             dispatchKernel(okraKernel, GlobalSize, args);
@@ -265,197 +265,197 @@
                 "version 0:95:$full:$large; // BRIG Object Format Version 0:4" + "\n"
                 + "" + "\n"
                 + "kernel &run(" + "\n"
-                + "	align 8 kernarg_u64 %arg_p3," + "\n"
-                + "	align 8 kernarg_u64 %arg_p4," + "\n"
-                + "	align 4 kernarg_u32 %arg_p5)" + "\n"
+                + " align 8 kernarg_u64 %arg_p3," + "\n"
+                + " align 8 kernarg_u64 %arg_p4," + "\n"
+                + " align 4 kernarg_u32 %arg_p5)" + "\n"
                 + "{" + "\n"
                 + "" + "\n"
-                + "	align 4 group_u32 %reduce_cllocal_scratch[256];" + "\n"
+                + " align 4 group_u32 %reduce_cllocal_scratch[256];" + "\n"
                 + "" + "\n"
-                + "	workitemabsid_u32 $s2, 0;" + "\n"
+                + " workitemabsid_u32 $s2, 0;" + "\n"
                 + "" + "\n"
-                + "	ld_kernarg_u32	$s1, [%arg_p5];" + "\n"
-                + "	ld_kernarg_u64	$d0, [%arg_p4];" + "\n"
-                + "	ld_kernarg_u64	$d1, [%arg_p3];" + "\n"
+                + " ld_kernarg_u32 $s1, [%arg_p5];" + "\n"
+                + " ld_kernarg_u64 $d0, [%arg_p4];" + "\n"
+                + " ld_kernarg_u64 $d1, [%arg_p3];" + "\n"
                 + "" + "\n"
-                + "	add_u64 $d0, $d0, 24;             // adjust over obj array headers" + "\n"
-                + "	add_u64 $d1, $d1, 24;" + "\n"
-                + "	cmp_ge_b1_s32	$c0, $s2, $s1; // if(gloId < length){" + "\n"
-                + "	cbr	$c0, @BB0_1;" + "\n"
-                + "	gridsize_u32	$s0, 0;        // s0 is globalsize" + "\n"
+                + " add_u64 $d0, $d0, 24;             // adjust over obj array headers" + "\n"
+                + " add_u64 $d1, $d1, 24;" + "\n"
+                + " cmp_ge_b1_s32 $c0, $s2, $s1; // if(gloId < length){" + "\n"
+                + " cbr $c0, @BB0_1;" + "\n"
+                + " gridsize_u32 $s0, 0;        // s0 is globalsize" + "\n"
                 + " add_u32 $s0, $s0, $s2;         // gx += globalsize" + "\n"
-                + "	cvt_s64_s32	$d2, $s2;      // s2 is global id" + "\n"
-                + "	shl_u64	$d2, $d2, 2;" + "\n"
-                + "	add_u64	$d2, $d1, $d2;" + "\n"
-                + "	ld_global_u32	$s3, [$d2];    // load this element from input" + "\n"
-                + "	brn	@BB0_3;" + "\n"
+                + " cvt_s64_s32 $d2, $s2;      // s2 is global id" + "\n"
+                + " shl_u64 $d2, $d2, 2;" + "\n"
+                + " add_u64 $d2, $d1, $d2;" + "\n"
+                + " ld_global_u32 $s3, [$d2];    // load this element from input" + "\n"
+                + " brn @BB0_3;" + "\n"
                 + "" + "\n"
                 + "@BB0_1:" + "\n"
-                + "	mov_b32	$s0, $s2;" + "\n"                                  + "" + "\n"
+                + " mov_b32 $s0, $s2;" + "\n"                                  + "" + "\n"
                 + "@BB0_3:" + "\n"
-                + "	cmp_ge_b1_s32	$c1, $s0, $s1; // while (gx < length)" + "\n"
-                + "	cbr	$c1, @BB0_6;" + "\n"
-                + "	gridsize_u32	$s2, 0;" + "\n"
+                + " cmp_ge_b1_s32 $c1, $s0, $s1; // while (gx < length)" + "\n"
+                + " cbr $c1, @BB0_6;" + "\n"
+                + " gridsize_u32 $s2, 0;" + "\n"
                 + "" + "\n"
                 + "@BB0_5:" + "\n"
-                + "	cvt_s64_s32	$d2, $s0;" + "\n"
-                + "	shl_u64	$d2, $d2, 2;" + "\n"
-                + "	add_u64	$d2, $d1, $d2;" + "\n"
-                + "	ld_global_u32	$s4, [$d2];" + "\n"
+                + " cvt_s64_s32 $d2, $s0;" + "\n"
+                + " shl_u64 $d2, $d2, 2;" + "\n"
+                + " add_u64 $d2, $d1, $d2;" + "\n"
+                + " ld_global_u32 $s4, [$d2];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	add_u32	$s0, $s0, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c1, $s0, $s1;" + "\n"
-                + "	cbr	$c1, @BB0_5;" + "\n"
+                + " add_u32 $s0, $s0, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c1, $s0, $s1;" + "\n"
+                + " cbr $c1, @BB0_5;" + "\n"
                 + "" + "\n"
                 + "@BB0_6:" + "\n"
-                + "	workgroupid_u32	$s0, 0;" + "\n"
-                + "	workgroupsize_u32	$s2, 0;" + "\n"
-                + "	mul_u32	$s2, $s2, $s0;" + "\n"
-                + "	sub_u32	$s2, $s1, $s2;" + "\n"
-                + "	workitemid_u32	$s1, 0;" + "\n"
-                + "	add_u32	$s4, $s1, 128;"
+                + " workgroupid_u32 $s0, 0;" + "\n"
+                + " workgroupsize_u32 $s2, 0;" + "\n"
+                + " mul_u32 $s2, $s2, $s0;" + "\n"
+                + " sub_u32 $s2, $s1, $s2;" + "\n"
+                + " workitemid_u32 $s1, 0;" + "\n"
+                + " add_u32 $s4, $s1, 128;"
                 + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s4, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 128;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	cvt_s64_s32	$d1, $s1;" + "\n"
-                + "	shl_u64	$d1, $d1, 2;" + "\n"
-                + "	lda_group_u64	$d2, [%reduce_cllocal_scratch];" + "\n"
-                + "	add_u64	$d1, $d2, $d1;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_8;" + "\n"
-                + "	ld_group_u32	$s3, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s4;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s4, [$d3];" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s4, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 128;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " cvt_s64_s32 $d1, $s1;" + "\n"
+                + " shl_u64 $d1, $d1, 2;" + "\n"
+                + " lda_group_u64 $d2, [%reduce_cllocal_scratch];" + "\n"
+                + " add_u64 $d1, $d2, $d1;" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_8;" + "\n"
+                + " ld_group_u32 $s3, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s4;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s4, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_8:" + "\n"
-                + "	add_u32	$s3, $s1, 64;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 64;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_10;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 64;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 64;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_10;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;"
                 + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_10:" + "\n"
-                + "	add_u32	$s3, $s1, 32;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 32;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_12;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 32;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 32;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_12;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_12:" + "\n"
-                + "	add_u32	$s3, $s1, 16;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 16;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_14;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 16;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 16;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_14;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_14:" + "\n"
-                + "	add_u32	$s3, $s1, 8;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 8;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_16;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 8;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 8;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_16;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_16:" + "\n"
-                + "	add_u32	$s3, $s1, 4;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 4;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_18;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 4;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 4;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_18;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_18:" + "\n"
-                + "	add_u32	$s3, $s1, 2;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 2;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_20;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d3, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d3];" + "\n"
+                + " add_u32 $s3, $s1, 2;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 2;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_20;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d3, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d3];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_20:" + "\n"
-                + "	add_u32	$s3, $s1, 1;" + "\n"
-                + "	cmp_lt_b1_u32	$c1, $s3, $s2;" + "\n"
-                + "	cmp_lt_b1_s32	$c2, $s1, 1;" + "\n"
-                + "	and_b1	$c1, $c2, $c1;" + "\n"
-                + "	barrier_fgroup;" + "\n"
-                + "	not_b1	$c1, $c1;" + "\n"
-                + "	cbr	$c1, @BB0_22;" + "\n"
-                + "	ld_group_u32	$s4, [$d1];" + "\n"
-                + "	cvt_s64_s32	$d3, $s3;" + "\n"
-                + "	shl_u64	$d3, $d3, 2;" + "\n"
-                + "	add_u64	$d2, $d2, $d3;" + "\n"
-                + "	ld_group_u32	$s3, [$d2];" + "\n"
+                + " add_u32 $s3, $s1, 1;" + "\n"
+                + " cmp_lt_b1_u32 $c1, $s3, $s2;" + "\n"
+                + " cmp_lt_b1_s32 $c2, $s1, 1;" + "\n"
+                + " and_b1 $c1, $c2, $c1;" + "\n"
+                + " barrier_fgroup;" + "\n"
+                + " not_b1 $c1, $c1;" + "\n"
+                + " cbr $c1, @BB0_22;" + "\n"
+                + " ld_group_u32 $s4, [$d1];" + "\n"
+                + " cvt_s64_s32 $d3, $s3;" + "\n"
+                + " shl_u64 $d3, $d3, 2;" + "\n"
+                + " add_u64 $d2, $d2, $d3;" + "\n"
+                + " ld_group_u32 $s3, [$d2];" + "\n"
                 +       reduceOp + "  $s3, $s3, $s4;" + "\n"
-                + "	st_group_u32	$s3, [$d1];" + "\n"
+                + " st_group_u32 $s3, [$d1];" + "\n"
                 + "" + "\n"
                 + "@BB0_22:" + "\n"
-                + "	cmp_gt_b1_u32	$c0, $s1, 0;  // s1 is local id, done if > 0" + "\n"
-                + "	cbr	$c0, @BB0_24;" + "\n"
+                + " cmp_gt_b1_u32 $c0, $s1, 0;  // s1 is local id, done if > 0" + "\n"
+                + " cbr $c0, @BB0_24;" + "\n"
                 + "" + "\n"
-                + "	ld_group_u32	$s2, [%reduce_cllocal_scratch];  // s2 is result[get_group_id(0)];" + "\n"
+                + " ld_group_u32 $s2, [%reduce_cllocal_scratch];  // s2 is result[get_group_id(0)];" + "\n"
                 +       atomicResultProduction + " [$d0], $s2; // build global result from local results" + "\n"
                 + "" + "\n"
                 + "@BB0_24:" + "\n"
-                + "	ret;" + "\n"
+                + " ret;" + "\n"
                 + "};" + "\n");
         //@formatter:on
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Fri Oct 24 16:18:10 2014 +0200
@@ -86,7 +86,7 @@
 
         // @formatter:off
         @Option(help = "Number of TLABs used for HSAIL kernels which allocate")
-        static public final OptionValue<Integer> HsailKernelTlabs = new OptionValue<>(4);
+        public static  final OptionValue<Integer> HsailKernelTlabs = new OptionValue<>(4);
         // @formatter:on
     }
 
@@ -627,40 +627,40 @@
 
         if (useHSAILDeoptimization) {
             // Aliases for d16
-            RegisterValue d16_deoptInfo = HSAIL.d16.asValue(wordLIRKind);
+            RegisterValue d16DeoptInfo = HSAIL.d16.asValue(wordLIRKind);
 
             // Aliases for d17
-            RegisterValue d17_tlabIndex = HSAIL.d17.asValue(wordLIRKind);
-            RegisterValue d17_safepointFlagAddrIndex = d17_tlabIndex;
+            RegisterValue d17TlabIndex = HSAIL.d17.asValue(wordLIRKind);
+            RegisterValue d17SafepointFlagAddrIndex = d17TlabIndex;
 
             // Aliases for s34
-            RegisterValue s34_deoptOccurred = HSAIL.s34.asValue(LIRKind.value(Kind.Int));
-            RegisterValue s34_tlabIndex = s34_deoptOccurred;
+            RegisterValue s34DeoptOccurred = HSAIL.s34.asValue(LIRKind.value(Kind.Int));
+            RegisterValue s34TlabIndex = s34DeoptOccurred;
 
-            asm.emitLoadKernelArg(d16_deoptInfo, asm.getDeoptInfoName(), "u64");
+            asm.emitLoadKernelArg(d16DeoptInfo, asm.getDeoptInfoName(), "u64");
             asm.emitComment("// Check if a deopt or safepoint has occurred and abort if true before doing any work");
 
             if (useHSAILSafepoints) {
                 // Load address of _notice_safepoints field
-                asm.emitLoad(wordKind, d17_safepointFlagAddrIndex, new HSAILAddressValue(wordLIRKind, d16_deoptInfo, config.hsailNoticeSafepointsOffset).toAddress());
+                asm.emitLoad(wordKind, d17SafepointFlagAddrIndex, new HSAILAddressValue(wordLIRKind, d16DeoptInfo, config.hsailNoticeSafepointsOffset).toAddress());
                 // Load int value from that field
-                asm.emitLoadAcquire(s34_deoptOccurred, new HSAILAddressValue(wordLIRKind, d17_safepointFlagAddrIndex, 0).toAddress());
-                asm.emitCompare(Kind.Int, s34_deoptOccurred, Constant.forInt(0), "ne", false, false);
+                asm.emitLoadAcquire(s34DeoptOccurred, new HSAILAddressValue(wordLIRKind, d17SafepointFlagAddrIndex, 0).toAddress());
+                asm.emitCompare(Kind.Int, s34DeoptOccurred, Constant.forInt(0), "ne", false, false);
                 asm.cbr(deoptInProgressLabel);
             }
-            asm.emitLoadAcquire(s34_deoptOccurred, new HSAILAddressValue(wordLIRKind, d16_deoptInfo, config.hsailDeoptOccurredOffset).toAddress());
-            asm.emitCompare(Kind.Int, s34_deoptOccurred, Constant.forInt(0), "ne", false, false);
+            asm.emitLoadAcquire(s34DeoptOccurred, new HSAILAddressValue(wordLIRKind, d16DeoptInfo, config.hsailDeoptOccurredOffset).toAddress());
+            asm.emitCompare(Kind.Int, s34DeoptOccurred, Constant.forInt(0), "ne", false, false);
             asm.cbr(deoptInProgressLabel);
             // load thread register if this kernel performs allocation
             if (usesAllocation) {
                 RegisterValue threadReg = getProviders().getRegisters().getThreadRegister().asValue(wordLIRKind);
                 assert HsailKernelTlabs.getValue() > 0;
-                asm.emitLoad(wordKind, threadReg, new HSAILAddressValue(wordLIRKind, d16_deoptInfo, config.hsailCurTlabInfoOffset).toAddress());
+                asm.emitLoad(wordKind, threadReg, new HSAILAddressValue(wordLIRKind, d16DeoptInfo, config.hsailCurTlabInfoOffset).toAddress());
                 if (HsailKernelTlabs.getValue() != 1) {
                     asm.emitComment("// map workitem to a tlab");
-                    asm.emitString(String.format("rem_u32  $%s, %s, %d;", s34_tlabIndex.getRegister(), workItemReg, HsailKernelTlabs.getValue()));
-                    asm.emitConvert(d17_tlabIndex, s34_tlabIndex, wordKind, Kind.Int);
-                    asm.emit("mad", threadReg, d17_tlabIndex, Constant.forInt(8), threadReg);
+                    asm.emitString(String.format("rem_u32  $%s, %s, %d;", s34TlabIndex.getRegister(), workItemReg, HsailKernelTlabs.getValue()));
+                    asm.emitConvert(d17TlabIndex, s34TlabIndex, wordKind, Kind.Int);
+                    asm.emit("mad", threadReg, d17TlabIndex, Constant.forInt(8), threadReg);
                 } else {
                     // workitem is already mapped to solitary tlab
                 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotLoweringProvider.java	Fri Oct 24 16:18:10 2014 +0200
@@ -45,21 +45,21 @@
         abstract void lower(Node n, LoweringTool tool);
     }
 
-    LoweringStrategy PassThruStrategy = new LoweringStrategy() {
+    final LoweringStrategy passThruStrategy = new LoweringStrategy() {
         @Override
         void lower(Node n, LoweringTool tool) {
             return;
         }
     };
 
-    LoweringStrategy RejectStrategy = new LoweringStrategy() {
+    final LoweringStrategy rejectStrategy = new LoweringStrategy() {
         @Override
         void lower(Node n, LoweringTool tool) {
             throw new GraalInternalError("Node implementing Lowerable not handled in HSAIL Backend: " + n);
         }
     };
 
-    LoweringStrategy NewObjectStrategy = new LoweringStrategy() {
+    final LoweringStrategy newObjectStrategy = new LoweringStrategy() {
         @Override
         void lower(Node n, LoweringTool tool) {
             StructuredGraph graph = (StructuredGraph) n.graph();
@@ -74,7 +74,7 @@
     };
 
     // strategy to replace an UnwindNode with a DeoptNode
-    LoweringStrategy UnwindNodeStrategy = new LoweringStrategy() {
+    final LoweringStrategy unwindNodeStrategy = new LoweringStrategy() {
         @Override
         void lower(Node n, LoweringTool tool) {
             StructuredGraph graph = (StructuredGraph) n.graph();
@@ -106,15 +106,15 @@
     private HashMap<NodeClass, LoweringStrategy> strategyMap = new HashMap<>();
 
     void initStrategyMap() {
-        strategyMap.put(NodeClass.get(IntegerConvertNode.class), PassThruStrategy);
-        strategyMap.put(NodeClass.get(FloatConvertNode.class), PassThruStrategy);
-        strategyMap.put(NodeClass.get(NewInstanceNode.class), NewObjectStrategy);
-        strategyMap.put(NodeClass.get(NewArrayNode.class), NewObjectStrategy);
-        strategyMap.put(NodeClass.get(NewMultiArrayNode.class), RejectStrategy);
-        strategyMap.put(NodeClass.get(DynamicNewArrayNode.class), RejectStrategy);
-        strategyMap.put(NodeClass.get(MonitorEnterNode.class), RejectStrategy);
-        strategyMap.put(NodeClass.get(MonitorExitNode.class), RejectStrategy);
-        strategyMap.put(NodeClass.get(UnwindNode.class), UnwindNodeStrategy);
+        strategyMap.put(NodeClass.get(IntegerConvertNode.class), passThruStrategy);
+        strategyMap.put(NodeClass.get(FloatConvertNode.class), passThruStrategy);
+        strategyMap.put(NodeClass.get(NewInstanceNode.class), newObjectStrategy);
+        strategyMap.put(NodeClass.get(NewArrayNode.class), newObjectStrategy);
+        strategyMap.put(NodeClass.get(NewMultiArrayNode.class), rejectStrategy);
+        strategyMap.put(NodeClass.get(DynamicNewArrayNode.class), rejectStrategy);
+        strategyMap.put(NodeClass.get(MonitorEnterNode.class), rejectStrategy);
+        strategyMap.put(NodeClass.get(MonitorExitNode.class), rejectStrategy);
+        strategyMap.put(NodeClass.get(UnwindNode.class), unwindNodeStrategy);
     }
 
     private LoweringStrategy getStrategy(Node n) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILNewObjectSnippets.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILNewObjectSnippets.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/replacements/HSAILNewObjectSnippets.java	Fri Oct 24 16:18:10 2014 +0200
@@ -54,7 +54,7 @@
  */
 public class HSAILNewObjectSnippets extends NewObjectSnippets {
 
-    static public class Options {
+    public static class Options {
 
         // @formatter:off
         @Option(help = "In HSAIL allocation, allow allocation from eden as fallback if TLAB is full")
@@ -64,7 +64,7 @@
         static final OptionValue<Boolean> HsailNewTlabAllocate = new OptionValue<>(true);
 
         @Option(help = "Estimate of number of bytes allocated by each HSAIL workitem, used to size TLABs")
-        static public final OptionValue<Integer> HsailAllocBytesPerWorkitem = new OptionValue<>(64);
+        public  static  final OptionValue<Integer> HsailAllocBytesPerWorkitem = new OptionValue<>(64);
 
         // @formatter:on
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.jfr/src/com/oracle/graal/hotspot/jfr/events/JFREventProvider.java
--- a/graal/com.oracle.graal.hotspot.jfr/src/com/oracle/graal/hotspot/jfr/events/JFREventProvider.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.jfr/src/com/oracle/graal/hotspot/jfr/events/JFREventProvider.java	Fri Oct 24 16:18:10 2014 +0200
@@ -67,7 +67,7 @@
      * @return the {@link EventToken event token}
      */
     @SuppressWarnings({"deprecation", "javadoc", "unchecked"})
-    private final EventToken registerEvent(Class<?> c) {
+    private EventToken registerEvent(Class<?> c) {
         try {
             return producer.addEvent((Class<? extends com.oracle.jrockit.jfr.InstantEvent>) c);
         } catch (InvalidEventDefinitionException | InvalidValueException e) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot.sourcegen/src/com/oracle/graal/hotspot/sourcegen/OptionsVerifier.java
--- a/graal/com.oracle.graal.hotspot.sourcegen/src/com/oracle/graal/hotspot/sourcegen/OptionsVerifier.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot.sourcegen/src/com/oracle/graal/hotspot/sourcegen/OptionsVerifier.java	Fri Oct 24 16:18:10 2014 +0200
@@ -182,4 +182,4 @@
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotOptionsLoader.java	Fri Oct 24 16:18:10 2014 +0200
@@ -54,4 +54,4 @@
     private static boolean isHotSpotOption(OptionDescriptor desc) {
         return desc.getClass().getName().startsWith("com.oracle.graal");
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/InitTimer.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/InitTimer.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/InitTimer.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,7 +31,7 @@
  * {@link DebugTimer} as it must be independent from all other Graal code so as to not perturb the
  * initialization sequence.
  */
-public class InitTimer implements AutoCloseable {
+public final class InitTimer implements AutoCloseable {
     final String name;
     final long start;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/PrintStreamOption.java	Fri Oct 24 16:18:10 2014 +0200
@@ -123,4 +123,4 @@
         }
         super.setValue(v);
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotConstantPool.java	Fri Oct 24 16:18:10 2014 +0200
@@ -549,7 +549,7 @@
                 index = getUncachedKlassRefIndexAt(index);
                 tag = getTagAt(index);
                 assert tag == JVM_CONSTANT.Class || tag == JVM_CONSTANT.UnresolvedClass || tag == JVM_CONSTANT.UnresolvedClassInError : tag;
-                // fall-through
+                // fall through
             case Class:
             case UnresolvedClass:
             case UnresolvedClassInError:
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Fri Oct 24 16:18:10 2014 +0200
@@ -83,7 +83,7 @@
         public int loopId;
 
         /**
-         * XXX to be removed - currently only used by baseline compiler
+         * XXX to be removed - currently only used by baseline compiler.
          */
         public Loop<BciBlock> loop;
         public boolean isLoopEnd;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/ComputeLoopFrequenciesClosure.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.phases.graph.*;
 
-public class ComputeLoopFrequenciesClosure extends ReentrantNodeIterator.NodeIteratorClosure<Double> {
+public final class ComputeLoopFrequenciesClosure extends ReentrantNodeIterator.NodeIteratorClosure<Double> {
 
     private static final ComputeLoopFrequenciesClosure INSTANCE = new ComputeLoopFrequenciesClosure();
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lcmp.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lcmp.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/bytecode/BC_lcmp.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,7 +50,7 @@
     }
 
     /**
-     * Test with ugly numbers (which probably does not fit into one instruction
+     * Test with ugly numbers (which probably does not fit into one instruction.
      *
      * @throws Throwable
      */
@@ -60,7 +60,7 @@
     }
 
     /**
-     * Test with big numbers where it makes difference if the value is handled with 64 bits
+     * Test with big numbers where it makes difference if the value is handled with 64 bits.
      *
      * @throws Throwable
      */
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/except/UntrustedInterfaces.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 public class UntrustedInterfaces extends JTTTest {
 
     public interface CallBack {
-        public int callBack(TestInterface ti);
+        int callBack(TestInterface ti);
     }
 
     private interface TestInterface {
@@ -38,27 +38,27 @@
     }
 
     /**
-     * What a GoodPill would look like:
+     * What a GoodPill would look like.
      *
      * <pre>
      * private static final class GoodPill extends Pill {
      *     public void setField() {
      *         field = new TestConstant();
      *     }
-     *
+     * 
      *     public void setStaticField() {
      *         staticField = new TestConstant();
      *     }
-     *
+     * 
      *     public int callMe(CallBack callback) {
      *         return callback.callBack(new TestConstant());
      *     }
-     *
+     * 
      *     public TestInterface get() {
      *         return new TestConstant();
      *     }
      * }
-     *
+     * 
      * private static final class TestConstant implements TestInterface {
      *     public int method() {
      *         return 42;
@@ -66,7 +66,7 @@
      * }
      * </pre>
      */
-    public static abstract class Pill {
+    public abstract static class Pill {
         public static TestInterface staticField;
         public TestInterface field;
 
@@ -143,11 +143,14 @@
 
     private static Pill poisonPill;
 
+    // Checkstyle: stop
     @BeforeClass
-    public static void setup() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+    public static void setUp() throws InstantiationException, IllegalAccessException, ClassNotFoundException {
         poisonPill = (Pill) new PoisonLoader().findClass(PoisonLoader.POISON_IMPL_NAME).newInstance();
     }
 
+    // Checkstyle: resume
+
     @Test
     public void testStaticField0() {
         runTest("staticFieldInvoke", poisonPill);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/lang/LambdaEagerTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -83,4 +83,4 @@
             return super.getCode(installedCodeOwner, graph, forceCompile);
         }
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams04.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams04.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/micro/BigMixedParams04.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 import com.oracle.graal.jtt.*;
 
 /**
- * Tests different alignment on the stack with extended parameters (index > 5)
+ * Tests different alignment on the stack with extended parameters (index > 5).
  */
 public class BigMixedParams04 extends JTTTest {
 
@@ -38,9 +38,9 @@
     public static long test(int choice, int i0, int i1, int i2, int i3, double d1, double d2, boolean bo1, boolean bo2, byte by, short sh, char ch, int in) {
         switch (choice) {
             case 0:
-                return bo1 ? 1l : 2l;
+                return bo1 ? 1L : 2L;
             case 1:
-                return bo2 ? 1l : 2l;
+                return bo2 ? 1L : 2L;
             case 2:
                 return by;
             case 3:
@@ -54,7 +54,7 @@
     }
 
     /**
-     * Test SPARC mixed params with double/single float register overlapping
+     * Test SPARC mixed params with double/single float register overlapping.
      *
      * @param f1
      * @param d2
@@ -64,15 +64,15 @@
     @SuppressWarnings("all")
     public static double test2(int i1, float f1, double d2, float f3,
     // @formatter:off
-                    double ad1 ,
-                    double ad2 ,
-                    double ad3 ,
-                    double ad4 ,
-                    double ad5 ,
-                    double ad6 ,
-                    double ad7 ,
-                    double ad8 ,
-                    double ad9 ,
+                    double ad1,
+                    double ad2,
+                    double ad3,
+                    double ad4,
+                    double ad5,
+                    double ad6,
+                    double ad7,
+                    double ad8,
+                    double ad9,
                     double ad10,
                     double ad11,
                     double ad12,
@@ -80,15 +80,15 @@
                     double ad14,
                     double ad15,
                     double ad16,
-                    float  af1 ,
-                    float  af2 ,
-                    float  af3 ,
-                    float  af4 ,
-                    float  af5 ,
-                    float  af6 ,
-                    float  af7 ,
-                    float  af8 ,
-                    float  af9 ,
+                    float  af1,
+                    float  af2,
+                    float  af3,
+                    float  af4,
+                    float  af5,
+                    float  af6,
+                    float  af7,
+                    float  af8,
+                    float  af9,
                     float  af10,
                     float  af11,
                     float  af12,
@@ -176,7 +176,7 @@
     }
 
     /**
-     * Test SPARC mixed params with double/single float register overlapping
+     * Test SPARC mixed params with double/single float register overlapping.
      *
      * @param f1
      * @param d2
@@ -186,15 +186,15 @@
     @SuppressWarnings("all")
     public static double test3(boolean f, int idx,
     // @formatter:off
-                    double ad1 ,
-                    double ad2 ,
-                    double ad3 ,
-                    double ad4 ,
-                    double ad5 ,
-                    double ad6 ,
-                    double ad7 ,
-                    double ad8 ,
-                    double ad9 ,
+                    double ad1,
+                    double ad2,
+                    double ad3,
+                    double ad4,
+                    double ad5,
+                    double ad6,
+                    double ad7,
+                    double ad8,
+                    double ad9,
                     double ad10,
                     double ad11,
                     double ad12,
@@ -202,15 +202,15 @@
                     double ad14,
                     double ad15,
                     double ad16,
-                    float  af1 ,
-                    float  af2 ,
-                    float  af3 ,
-                    float  af4 ,
-                    float  af5 ,
-                    float  af6 ,
-                    float  af7 ,
-                    float  af8 ,
-                    float  af9 ,
+                    float  af1,
+                    float  af2,
+                    float  af3,
+                    float  af4,
+                    float  af5,
+                    float  af6,
+                    float  af7,
+                    float  af8,
+                    float  af9,
                     float  af10,
                     float  af11,
                     float  af12,
@@ -220,15 +220,15 @@
                     float  af16
     ) {
         switch(f ? idx + 16 : idx) {
-            case 1 : return ad1 ;
-            case 2 : return ad2 ;
-            case 3 : return ad3 ;
-            case 4 : return ad4 ;
-            case 5 : return ad5 ;
-            case 6 : return ad6 ;
-            case 7 : return ad7 ;
-            case 8 : return ad8 ;
-            case 9 : return ad9 ;
+            case 1 : return ad1;
+            case 2 : return ad2;
+            case 3 : return ad3;
+            case 4 : return ad4;
+            case 5 : return ad5;
+            case 6 : return ad6;
+            case 7 : return ad7;
+            case 8 : return ad8;
+            case 9 : return ad9;
             case 10: return ad10;
             case 11: return ad11;
             case 12: return ad12;
@@ -236,15 +236,15 @@
             case 14: return ad14;
             case 15: return ad15;
             case 16: return ad16;
-            case 1  + 16: return af1 ;
-            case 2  + 16: return af2 ;
-            case 3  + 16: return af3 ;
-            case 4  + 16: return af4 ;
-            case 5  + 16: return af5 ;
-            case 6  + 16: return af6 ;
-            case 7  + 16: return af7 ;
-            case 8  + 16: return af8 ;
-            case 9  + 16: return af9 ;
+            case 1  + 16: return af1;
+            case 2  + 16: return af2;
+            case 3  + 16: return af3;
+            case 4  + 16: return af4;
+            case 5  + 16: return af5;
+            case 6  + 16: return af6;
+            case 7  + 16: return af7;
+            case 8  + 16: return af8;
+            case 9  + 16: return af9;
             case 10 + 16: return af10;
             case 11 + 16: return af11;
             case 12 + 16: return af12;
@@ -332,8 +332,8 @@
     @Test
     public void run7() throws Throwable {
         // @formatter:off
-        for(int i =0; i<32*2; i++)
-        runTest("test3", i%2==0, i/2,
+        for (int i = 0; i < 32 * 2; i++) {
+        runTest("test3", i % 2 == 0, i / 2,
                         1d,
                         2d,
                         3d,
@@ -367,6 +367,7 @@
                         15f,
                         16f
                         );
+        }
         // @formatter:on
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NestedLoop_EA.java
--- a/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NestedLoop_EA.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/NestedLoop_EA.java	Fri Oct 24 16:18:10 2014 +0200
@@ -49,14 +49,14 @@
     }
 
     static class Frame {
-        Object objects[] = new Object[10];
+        Object[] objects = new Object[10];
     }
 
-    final static int RESULT_SLOT = 0;
-    final static int K_SLOT = 1;
-    final static int I_SLOT = 2;
-    final static int ARG_SLOT = 3;
-    final static int STACK_BASE = 4;
+    static final int RESULT_SLOT = 0;
+    static final int K_SLOT = 1;
+    static final int I_SLOT = 2;
+    static final int ARG_SLOT = 3;
+    static final int STACK_BASE = 4;
 
     static class Pointer {
         public int sp = STACK_BASE;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java
--- a/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILControlFlow.java	Fri Oct 24 16:18:10 2014 +0200
@@ -125,9 +125,9 @@
     }
 
     public interface DeoptimizingOp {
-        public LIRFrameState getFrameState();
+        LIRFrameState getFrameState();
 
-        public int getCodeBufferPos();
+        int getCodeBufferPos();
     }
 
     /***
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILMove.java
--- a/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILMove.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.hsail/src/com/oracle/graal/lir/hsail/HSAILMove.java	Fri Oct 24 16:18:10 2014 +0200
@@ -175,7 +175,7 @@
     }
 
     /**
-     * A LoadOp that uses the HSAIL ld_acq instruction
+     * A LoadOp that uses the HSAIL ld_acq instruction.
      */
     public static class LoadAcquireOp extends LoadOp {
         public LoadAcquireOp(Kind kind, AllocatableValue result, HSAILAddressValue address, LIRFrameState state) {
@@ -207,7 +207,7 @@
     }
 
     /**
-     * A StoreOp that uses the HSAIL st_rel instruction
+     * A StoreOp that uses the HSAIL st_rel instruction.
      */
     public static class StoreReleaseOp extends StoreOp {
         public StoreReleaseOp(Kind kind, HSAILAddressValue address, AllocatableValue input, LIRFrameState state) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXControlFlow.java
--- a/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXControlFlow.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXControlFlow.java	Fri Oct 24 16:18:10 2014 +0200
@@ -42,7 +42,7 @@
 
 public class PTXControlFlow {
 
-    public static abstract class PTXPredicatedLIRInstruction extends PTXLIRInstruction {
+    public abstract static class PTXPredicatedLIRInstruction extends PTXLIRInstruction {
         private int predRegNum;
 
         PTXPredicatedLIRInstruction(int regNum) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCControlFlow.java	Fri Oct 24 16:18:10 2014 +0200
@@ -209,7 +209,8 @@
                 emitCBCond(masm, actualX, actualY, actualTrueTarget, conditionFlag);
                 new Nop().emit(masm);
             } finally {
-                if (scratch != null) {// release the scratch if used
+                if (scratch != null) {
+                    // release the scratch if used
                     scratch.close();
                 }
             }
@@ -468,7 +469,7 @@
             case AT:
             case BT:
             case BE:
-                GraalInternalError.unimplemented("Should not be required for float/dobule");
+                throw GraalInternalError.unimplemented("Should not be required for float/dobule");
             default:
                 throw GraalInternalError.shouldNotReachHere();
         }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCDelayedControlTransfer.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCDelayedControlTransfer.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCDelayedControlTransfer.java	Fri Oct 24 16:18:10 2014 +0200
@@ -55,7 +55,7 @@
      * @param crb
      * @param masm
      */
-    public void emitControlTransfer(CompilationResultBuilder crb, SPARCMacroAssembler masm);
+    void emitControlTransfer(CompilationResultBuilder crb, SPARCMacroAssembler masm);
 
-    public void resetState();
+    void resetState();
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMap.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,7 +35,7 @@
  *
  * <pre>
  *   Base       Contents
- * 
+ *
  *            :                                :  -----
  *   caller   | incoming overflow argument n   |    ^
  *   frame    :     ...                        :    | positive
@@ -108,7 +108,7 @@
     }
 
     /**
-     * In SPARC we have spill slots word aligned
+     * In SPARC we have spill slots word aligned.
      */
     @Override
     public int spillSlotSize(LIRKind kind) {
@@ -116,7 +116,7 @@
     }
 
     /**
-     * We must add the calleSaveAreaSize() when it is a in or out parameter
+     * We must add the calleSaveAreaSize() when it is a in or out parameter.
      */
     @Override
     public int offsetForStackSlot(StackSlot slot) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Fri Oct 24 16:18:10 2014 +0200
@@ -97,7 +97,7 @@
     }
 
     /**
-     * Move between floating-point and general purpose register domain (WITHOUT VIS3)
+     * Move between floating-point and general purpose register domain (WITHOUT VIS3).
      */
     @Opcode("MOVE")
     public static class MoveFpGp extends SPARCLIRInstruction implements MoveOp, SPARCTailDelayedLIRInstruction {
@@ -191,7 +191,7 @@
     }
 
     /**
-     * Move between floating-point and general purpose register domain (WITH VIS3)
+     * Move between floating-point and general purpose register domain (WITH VIS3).
      */
     @Opcode("MOVE")
     public static class MoveFpGpVIS3 extends SPARCLIRInstruction implements MoveOp, SPARCTailDelayedLIRInstruction {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCSaveRegistersOp.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,7 +39,7 @@
  */
 @Opcode("SAVE_REGISTER")
 public class SPARCSaveRegistersOp extends SPARCLIRInstruction implements SaveRegistersOp {
-    public static Register RETURN_REGISTER_STORAGE = SPARC.d62;
+    public static final Register RETURN_REGISTER_STORAGE = SPARC.d62;
     /**
      * The registers (potentially) saved by this operation.
      */
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTailDelayedLIRInstruction.java
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTailDelayedLIRInstruction.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCTailDelayedLIRInstruction.java	Fri Oct 24 16:18:10 2014 +0200
@@ -44,5 +44,5 @@
  * . The DelayedControlTransfer instruction will emit the code just with Nop in the delay slot.
  */
 public interface SPARCTailDelayedLIRInstruction {
-    public void setDelayedControlTransfer(SPARCDelayedControlTransfer holder);
+    void setDelayedControlTransfer(SPARCDelayedControlTransfer holder);
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMap.java	Fri Oct 24 16:18:10 2014 +0200
@@ -202,8 +202,8 @@
     public int offsetForStackSlot(StackSlot slot) {
         // @formatter:off
         assert (!slot.getRawAddFrameSize() && slot.getRawOffset() <  outgoingSize) ||
-               ( slot.getRawAddFrameSize() && slot.getRawOffset() <  0 && -slot.getRawOffset() <= spillSize) ||
-               ( slot.getRawAddFrameSize() && slot.getRawOffset() >= 0) :
+               (slot.getRawAddFrameSize() && slot.getRawOffset()  <  0 && -slot.getRawOffset() <= spillSize) ||
+               (slot.getRawAddFrameSize() && slot.getRawOffset()  >= 0) :
                    String.format("RawAddFrameSize: %b RawOffset: 0x%x spillSize: 0x%x outgoingSize: 0x%x", slot.getRawAddFrameSize(), slot.getRawOffset(), spillSize, outgoingSize);
         // @formatter:on
         if (slot.isInCallerFrame()) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilderImpl.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilderImpl.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilderImpl.java	Fri Oct 24 16:18:10 2014 +0200
@@ -70,4 +70,4 @@
         return frameMap;
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java	Fri Oct 24 16:18:10 2014 +0200
@@ -34,7 +34,7 @@
  * The {@code LIRInstruction} interface definition.
  */
 public interface LIRInstruction {
-    static final Value[] NO_OPERANDS = {};
+    Value[] NO_OPERANDS = {};
 
     /**
      * Constants denoting how a LIR instruction uses an operand.
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java	Fri Oct 24 16:18:10 2014 +0200
@@ -369,7 +369,7 @@
 
     /**
      * Tests if all values in this string are printable ASCII characters or value \0 (b in
-     * [0x20,0x7F]) or b == 0
+     * [0x20,0x7F]) or b == 0.
      *
      * @param array
      * @return true if there are only printable ASCII characters and \0, false otherwise
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/StateProcedure.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,4 +31,4 @@
     default void doState(LIRInstruction instruction, LIRFrameState state) {
         doState(state);
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java	Fri Oct 24 16:18:10 2014 +0200
@@ -45,7 +45,7 @@
  * a constant, which is potentially scheduled into a block with high probability, with one or more
  * definitions in blocks with a lower probability.
  */
-public class ConstantLoadOptimization {
+public final class ConstantLoadOptimization {
 
     public static class Options {
         // @formatter:off
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantTreeAnalyzer.java	Fri Oct 24 16:18:10 2014 +0200
@@ -33,7 +33,7 @@
 /**
  * Analyzes a {@link ConstantTree} and marks potential materialization positions.
  */
-public class ConstantTreeAnalyzer {
+public final class ConstantTreeAnalyzer {
     private final ConstantTree tree;
     private final BitSet visited;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/DefUseTree.java	Fri Oct 24 16:18:10 2014 +0200
@@ -78,4 +78,4 @@
         uses.forEach(action);
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/UseEntry.java	Fri Oct 24 16:18:10 2014 +0200
@@ -61,4 +61,4 @@
     public String toString() {
         return "Use[" + getValue() + ":" + instruction + ":" + block + "]";
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/VariableMap.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/VariableMap.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/VariableMap.java	Fri Oct 24 16:18:10 2014 +0200
@@ -84,4 +84,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/ElementException.java
--- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/ElementException.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/ElementException.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,4 +35,4 @@
         super(String.format(format, args));
         this.element = element;
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeVerifier.java
--- a/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeVerifier.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodeinfo.processor/src/com/oracle/graal/nodeinfo/processor/GraphNodeVerifier.java	Fri Oct 24 16:18:10 2014 +0200
@@ -45,6 +45,7 @@
     private final Types types;
     private final Elements elements;
 
+    // Checkstyle: stop
     private final TypeElement Input;
     private final TypeElement OptionalInput;
     private final TypeElement Successor;
@@ -53,6 +54,8 @@
     private final TypeElement NodeInputList;
     private final TypeElement NodeSuccessorList;
 
+    // Checkstyle: resume
+
     public GraphNodeVerifier(GraphNodeProcessor processor) {
         this.env = processor;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/InputType.java
--- a/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/InputType.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/InputType.java	Fri Oct 24 16:18:10 2014 +0200
@@ -61,4 +61,4 @@
      * exceptional cases and should never survive to later stages of compilation.
      */
     Unchecked
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/Verbosity.java
--- a/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/Verbosity.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodeinfo/src/com/oracle/graal/nodeinfo/Verbosity.java	Fri Oct 24 16:18:10 2014 +0200
@@ -48,4 +48,4 @@
      * All the other information plus all debug properties of the node.
      */
     All
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java
--- a/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodes.test/src/com/oracle/graal/nodes/test/ObjectStampTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -34,7 +34,7 @@
         Assert.assertEquals(StampFactory.object(), notTrusted);
     }
 
-    private static interface TrustedI extends TrustedInterface {
+    private interface TrustedI extends TrustedInterface {
 
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ForeignCallDescriptors.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ForeignCallDescriptors.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ForeignCallDescriptors.java	Fri Oct 24 16:18:10 2014 +0200
@@ -37,4 +37,4 @@
      */
     public static final ForeignCallDescriptor REGISTER_FINALIZER = new ForeignCallDescriptor("registerFinalizer", void.class, Object.class);
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/NewArrayNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -57,7 +57,7 @@
     }
 
     @NodeIntrinsic
-    static private native Object newArray(@ConstantNodeParameter Class<?> elementType, int length, @ConstantNodeParameter boolean fillContents);
+    private static native Object newArray(@ConstantNodeParameter Class<?> elementType, int length, @ConstantNodeParameter boolean fillContents);
 
     public static Object newUninitializedArray(Class<?> elementType, int length) {
         return newArray(elementType, length, false);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -67,13 +67,14 @@
     }
 
     /**
-     * Don't allow duplicate keys
+     * Don't allow duplicate keys.
      */
     private boolean assertKeys() {
         for (int i = 0; i < keys.length; i++) {
             for (int j = 0; j < keys.length; j++) {
-                if (i == j)
+                if (i == j) {
                     continue;
+                }
                 assert !keys[i].equals(keys[j]);
             }
         }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Fri Oct 24 16:18:10 2014 +0200
@@ -446,7 +446,7 @@
 
     /**
      * Returns an iterator that will return the given node followed by all its predecessors, up
-     * until the point where {@link Node#predecessor()} returns null;
+     * until the point where {@link Node#predecessor()} returns null.
      *
      * @param start the node at which to start iterating
      */
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,7 +50,7 @@
     private final boolean canonicalizeReads;
     private final CustomCanonicalizer customCanonicalizer;
 
-    public static abstract class CustomCanonicalizer {
+    public abstract static class CustomCanonicalizer {
 
         public Node canonicalize(Node node) {
             return node;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ProfileCompiledMethodsPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ProfileCompiledMethodsPhase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/ProfileCompiledMethodsPhase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -58,8 +58,8 @@
     private static final String GROUP_NAME_INVOKES = "~profiled invokes";
 
     private static final boolean WITH_SECTION_HEADER = false;
-    private static boolean WITH_INVOKE_FREE_SECTIONS = false;
-    private static boolean WITH_INVOKES = true;
+    private static final boolean WITH_INVOKE_FREE_SECTIONS = Boolean.parseBoolean(System.getProperty("ProfileCompiledMethodsPhase.WITH_FREE_SECTIONS", "false"));
+    private static final boolean WITH_INVOKES = Boolean.parseBoolean(System.getProperty("ProfileCompiledMethodsPhase.WITH_INVOKES", "true"));
 
     @Override
     protected void run(StructuredGraph graph) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/EquationalReasoner.java	Fri Oct 24 16:18:10 2014 +0200
@@ -381,7 +381,7 @@
     /**
      * The contract for this baseCase-style method is covered in
      * {@link EquationalReasoner#deverbosify(com.oracle.graal.graph.Node)
-     * EquationalReasoner#deverbosify()}
+     * EquationalReasoner#deverbosify()}.
      *
      * @return a {@link com.oracle.graal.nodes.calc.FloatingNode} different from the argument, in
      *         case a reduction was made. The node being returned might be already in the graph. In
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReductionPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReductionPhase.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowSensitiveReductionPhase.java	Fri Oct 24 16:18:10 2014 +0200
@@ -55,4 +55,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/FlowUtil.java	Fri Oct 24 16:18:10 2014 +0200
@@ -30,7 +30,7 @@
 import com.oracle.graal.nodeinfo.*;
 import com.oracle.graal.nodes.*;
 
-public class FlowUtil {
+public final class FlowUtil {
 
     private FlowUtil() {
         // no instances of this class
@@ -95,11 +95,11 @@
         } else {
             /*
              * Not comparable, two cases:
-             *
+             * 
              * Example 1: 'a' standing for j.l.Number and 'b' for j.l.String We return null for lack
              * of a value representing NullType, the right answer. Same goes when both arguments are
              * non-comparable interfaces.
-             *
+             * 
              * Example 2: 'a' standing for sun/nio/ch/DirectBuffer (an interface) and b for
              * java/nio/Buffer (an abstract class). The class always takes precedence.
              */
@@ -155,15 +155,15 @@
      * @return whether the first argument is strictly more precise than the second.
      */
     public static boolean isMorePrecise(ObjectStamp a, ObjectStamp b) {
-        int d0 = MINUS(a.alwaysNull(), b.alwaysNull());
+        int d0 = minus(a.alwaysNull(), b.alwaysNull());
         if (d0 == -1) {
             return false;
         }
-        int d1 = MINUS(a.nonNull(), b.nonNull());
+        int d1 = minus(a.nonNull(), b.nonNull());
         if (d1 == -1) {
             return false;
         }
-        int d2 = MINUS(a.isExactType(), b.isExactType());
+        int d2 = minus(a.isExactType(), b.isExactType());
         if (d2 == -1) {
             return false;
         }
@@ -188,7 +188,7 @@
         return maxScore > 0;
     }
 
-    private static int MINUS(boolean a, boolean b) {
+    private static int minus(boolean a, boolean b) {
         int aa = a ? 1 : 0;
         int bb = b ? 1 : 0;
         return aa - bb;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/State.java	Fri Oct 24 16:18:10 2014 +0200
@@ -454,6 +454,9 @@
 
     // @formatter:off
     /**
+     * Determines if the first argument is known not to conform to the second argument.
+     *
+     * <pre>
      *   \   |     |     |     |
      *    \ b|     |     |     |
      *   a \ |     |     |     |
@@ -472,7 +475,7 @@
      *    iface: interface
      *    final: exact non-interface reference-type
      *    non-f: non-exact non-interface reference-type
-     *
+     * </pre>
      * @return true iff the first argument is known not to conform to the second argument.
      */
     // @formatter:on
@@ -627,7 +630,7 @@
     }
 
     /**
-     * Ideas for the future:
+     * Ideas for the future.
      * <ul>
      * <li>track inferred less-than edges from (accumulated) CompareNode-s</li>
      * <li>track set-representative for equality classes determined by (chained) IntegerTestNode</li>
@@ -906,7 +909,7 @@
     }
 
     /**
-     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}
+     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}.
      */
     private Evidence outcomeIsNullNode(boolean isTrue, IsNullNode isNullNode) {
         if (isTrue) {
@@ -933,7 +936,7 @@
     }
 
     /**
-     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}
+     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}.
      */
     private Evidence outcomeInstanceOfNode(boolean isTrue, InstanceOfNode iOf) {
         final Witness w = typeInfo(iOf.getValue());
@@ -973,7 +976,7 @@
     }
 
     /**
-     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}
+     * Utility method for {@link #outcome(boolean, com.oracle.graal.nodes.LogicNode)}.
      */
     private Evidence outcomeShortCircuitOrNode(boolean isTrue, ShortCircuitOrNode orNode) {
         if (!isTrue) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/Witness.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/Witness.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/cfs/Witness.java	Fri Oct 24 16:18:10 2014 +0200
@@ -122,7 +122,7 @@
     }
 
     /**
-     * Counterpart to {@link #asStamp()}
+     * Counterpart to {@link #asStamp()}.
      */
     public Witness(ObjectStamp stamp, GuardingNode anchor) {
         assert stamp.isLegal();
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java	Fri Oct 24 16:18:10 2014 +0200
@@ -51,7 +51,7 @@
 
     /**
      * Graph in which inlining may be performed at one or more of the callsites containined in
-     * {@link #remainingInvokes}
+     * {@link #remainingInvokes}.
      */
     private final StructuredGraph graph;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Fri Oct 24 16:18:10 2014 +0200
@@ -480,6 +480,7 @@
     }
 
     /**
+     * Gets the freshly instantiated arguments.
      * <p>
      * A freshly instantiated argument is either:
      * <uL>
@@ -723,9 +724,9 @@
     }
 
     /**
-     * This method checks an invariant that {@link #moveForward()} must maintain: "the top
-     * invocation records how many concrete target methods (for it) remain on the
-     * {@link #graphQueue}; those targets 'belong' to the current invocation in question."
+     * Checks an invariant that {@link #moveForward()} must maintain: "the top invocation records
+     * how many concrete target methods (for it) remain on the {@link #graphQueue}; those targets
+     * 'belong' to the current invocation in question.
      */
     private boolean topGraphsForTopInvocation() {
         if (invocationQueue.isEmpty()) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/graph/SinglePassNodeIterator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -109,7 +109,7 @@
      * </ul>
      * </p>
      */
-    private static class PathStart<U> {
+    private static final class PathStart<U> {
         private final BeginNode node;
         private final U stateOnEntry;
 
@@ -259,7 +259,7 @@
     }
 
     /**
-     * Once all loop-end-nodes for a given loop-node have been visited:
+     * Once all loop-end-nodes for a given loop-node have been visited.
      * <ul>
      * <li>the state for that loop-node is updated based on the states of the loop-end-nodes</li>
      * <li>entries in {@link #nodeStates} are pruned for the loop (they aren't going to be looked up
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathSubstitutions.java
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathSubstitutions.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathSubstitutions.java	Fri Oct 24 16:18:10 2014 +0200
@@ -190,11 +190,14 @@
         return JStrictMath.pow(x, y);
     }
 
+    // Checkstyle: stop
     @MethodSubstitution
     public static double IEEEremainder(double x, double y) {
         return JStrictMath.IEEEremainder(x, y);
     }
 
+    // Checkstyle: resume
+
     @MethodSubstitution
     public static double sinh(double x) {
         return JStrictMath.sinh(x);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/JStrictMath.java	Fri Oct 24 16:18:10 2014 +0200
@@ -29,6 +29,8 @@
 
 import com.oracle.graal.api.replacements.*;
 
+// Checkstyle: stop
+
 /**
  * This class contains methods for performing basic numeric operations such as the elementary
  * exponential, logarithm, square root, and trigonometric functions. It is a Java port of the native
@@ -757,14 +759,14 @@
          * asin(x) on [0,0.5] by asin(x) = x + x*x^2*R(x^2) where R(x^2) is a rational approximation
          * of (asin(x)-x)/x^3 and its remez error is bounded by |(asin(x)-x)/x^3 - R(x^2)| <
          * 2^(-58.75)
-         *
+         * 
          * For x in [0.5,1] asin(x) = pi/2-2*asin(sqrt((1-x)/2)) Let y = (1-x), z = y/2, s :=
          * sqrt(z),and pio2_hi+pio2_lo=pi/2; then for x>0.98 asin(x) = pi/2 - 2*(s+s*z*R(z)) =
          * pio2_hi - (2*(s+s*z*R(z)) - pio2_lo) For x<=0.98, let pio4_hi = pio2_hi/2, then f = hi
          * part of s; c = sqrt(z) - f = (z-f*f)/(s+f) ...f+c=sqrt(z) and asin(x) = pi/2 -
          * 2*(s+s*z*R(z)) = pio4_hi+(pio4-2s)-(2s*z*R(z)-pio2_lo) =
          * pio4_hi+(pio4-2f)-(2s*z*R(z)-(pio2_lo+2c))
-         *
+         * 
          * Special cases: if x is NaN, return x itself; if |x|>1, return NaN with invalid signal.
          */
         int hx = __HI(a);
@@ -813,7 +815,7 @@
          * where f=hi part of s, and c= (z-f*f)/(s+f) is the correction term for f so that f+c ~
          * sqrt(z). For x<-0.5 acos(x) = pi - 2asin(sqrt((1-|x|)/2)) = pi - 0.5*(s+s*z*R(z)), where
          * z=(1-|x|)/2,s=sqrt(z)
-         *
+         * 
          * Special cases: if x is NaN, return x itself; if |x|>1, return NaN with invalid signal.
          */
 
@@ -880,7 +882,7 @@
          * Method 1. Reduce x to positive by atan(x) = -atan(-x). 2. According to the integer
          * k=4t+0.25 chopped, t=x, the argument is further reduced to one of the following intervals
          * and the arctangent of t is evaluated by the corresponding formula:
-         *
+         * 
          * [0,7/16] atan(x) = t-t^3*(a1+t^2*(a2+...(a10+t^2*a11)...) [7/16,11/16] atan(x) =
          * atan(1/2) + atan( (t-0.5)/(1+t/2) ) [11/16.19/16] atan(x) = atan( 1 ) + atan( (t-1)/(1+t)
          * ) [19/16,39/16] atan(x) = atan(3/2) + atan( (t-1.5)/(1+1.5t) ) [39/16,INF] atan(x) =
@@ -980,14 +982,14 @@
     public static double exp(double aa) {
         /*
          * exp(x) Returns the exponential of x.
-         *
+         * 
          * Method 1. Argument reduction: Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. Given x,
          * find r and integer k such that
-         *
+         * 
          * x = k*ln2 + r, |r| <= 0.5*ln2.
-         *
+         * 
          * Here r will be represented as r = hi-lo for better accuracy.
-         *
+         * 
          * 2. Approximation of exp(r) by a special rational function on the interval [0,0.34658]:
          * Write R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... We use a special
          * Reme algorithm on [0,0.34658] to generate a polynomial of degree 5 to approximate R. The
@@ -997,15 +999,15 @@
          * computation of exp(r) thus becomes 2*r exp(r) = 1 + ------- R - r r*R1(r) = 1 + r +
          * ----------- (for better accuracy) 2 - R1(r) where 2 4 10 R1(r) = r - (P1*r + P2*r + ... +
          * P5*r ).
-         *
+         * 
          * 3. Scale back to obtain exp(x): From step 1, we have exp(x) = 2^k * exp(r)
-         *
+         * 
          * Special cases: exp(INF) is INF, exp(NaN) is NaN; exp(-INF) is 0, and for finite argument,
          * only exp(0)=1 is exact.
-         *
+         * 
          * Accuracy: according to an error analysis, the error is always less than 1 ulp (unit in
          * the last place).
-         *
+         * 
          * Misc. info. For IEEE double if x > 7.09782712893383973096e+02 then exp(x) overflow if x <
          * -7.45133219101941108420e+02 then exp(x) underflow
          */
@@ -1087,10 +1089,10 @@
     public static double log(double xx) {
         /*
          * __ieee754_log(x) Return the logrithm of x
-         *
+         * 
          * Method : 1. Argument Reduction: find k and f such that x = 2^k * (1+f), where sqrt(2)/2 <
          * 1+f < sqrt(2) .
-         *
+         * 
          * 2. Approximation of log(1+f). Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s) =
          * 2s + 2/3 s**3 + 2/5 s**5 + ....., = 2s + s*R We use a special Reme algorithm on
          * [0,0.1716] to generate a polynomial of degree 14 to approximate R The maximum error of
@@ -1100,14 +1102,14 @@
          * 2s = f - s*f = f -hfsq + s*hfsq, where hfsq = f*f/2. In order to guarantee error in log
          * below 1ulp, we compute log by log(1+f) = f - s*(f - R) (if f is not too large) log(1+f) =
          * f - (hfsq - s*(hfsq+R)). (better accuracy)
-         *
+         * 
          * 3. Finally, log(x) =k*ln2 + log(1+f). =k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo))) Here ln2
          * is split into two floating point number: ln2_hi + ln2_lo, where n*ln2_hi is always exact
          * for |n| < 2000.
-         *
+         * 
          * Special cases: log(x) is NaN with signal if x < 0 (including -INF) ; log(+INF) is +INF;
          * log(0) is -INF with signal; log(NaN) is that NaN with no signal.
-         *
+         * 
          * Accuracy: according to an error analysis, the error is always less than 1 ulp (unit in
          * the last place).
          */
@@ -1175,15 +1177,15 @@
     public static double log10(double aa) {
         /*
          * __ieee754_log10(x) Return the base 10 logarithm of x
-         *
+         * 
          * Method : Let log10_2hi = leading 40 bits of log10(2) and log10_2lo = log10(2) -
          * log10_2hi, ivln10 = 1/log(10) rounded. Then n = ilogb(x), if(n<0) n = n+1; x =
          * scalbn(x,-n); log10(x) := n*log10_2hi + (n*log10_2lo + ivln10*log(x))
-         *
+         * 
          * Note 1: To guarantee log10(10**n)=n, where 10**n is normal, the rounding mode must set to
          * Round-to-Nearest. Note 2: [1/log(10)] rounded to 53 bits has error .198 ulps; log10 is
          * monotonic at all binary break points.
-         *
+         * 
          * Special cases: log10(x) is NaN with signal if x < 0; log10(+INF) is +INF with no signal;
          * log10(0) is -INF with signal; log10(NaN) is that NaN with no signal; log10(10**N) = N for
          * N=0,1,...,22.
@@ -1518,11 +1520,11 @@
          * double format does not have enough significand bits for a number that large to have any
          * fractional portion), an infinity, or a NaN. In any of these cases, rint of the argument
          * is the argument.
-         *
+         * 
          * Otherwise, the sum (twoToThe52 + a ) will properly round away any fractional portion of a
          * since ulp(twoToThe52) == 1.0; subtracting out twoToThe52 from this sum will then be exact
          * and leave the rounded integer portion of a.
-         *
+         * 
          * This method does *not* need to be declared strictfp to get fully reproducible results.
          * Whether or not a method is declared strictfp can only make a difference in the returned
          * result if some operation would overflow or underflow with strictfp semantics. The
@@ -1590,9 +1592,9 @@
          * __ieee754_atan2(y,x) Method : 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x). 2.
          * Reduce x to positive by (if x and y are unexceptional): ARG (x+iy) = arctan(y/x) ... if x
          * > 0, ARG (x+iy) = pi - arctan[y/(-x)] ... if x < 0,
-         *
+         * 
          * Special cases:
-         *
+         * 
          * ATAN2((anything), NaN ) is NaN; ATAN2(NAN , (anything) ) is NaN; ATAN2(+-0, +(anything
          * but NaN)) is +-0 ; ATAN2(+-0, -(anything but NaN)) is +-pi ; ATAN2(+-(anything but 0 and
          * NaN), 0) is +-pi/2; ATAN2(+-(anything but INF and NaN), +INF) is +-0 ; ATAN2(+-(anything
@@ -1817,11 +1819,11 @@
     public static double pow(double x, double y) {
         /*
          * __ieee754_pow(x,y) return x**y
-         *
+         * 
          * n Method: Let x = 2 * (1+f) 1. Compute and return log2(x) in two pieces: log2(x) = w1 +
          * w2, where w1 has 53-24 = 29 bit trailing zeros. 2. Perform y*log2(x) = n+y' by simulating
          * muti-precision arithmetic, where |y'|<=0.5. 3. Return x**y = 2**n*exp(y'*log2)
-         *
+         * 
          * Special cases: 1. (anything) ** 0 is 1 2. (anything) ** 1 is itself 3. (anything) ** NAN
          * is NAN 4. NAN ** (anything except 0) is NAN 5. +-(|x| > 1) ** +INF is +INF 6. +-(|x| > 1)
          * ** -INF is +0 7. +-(|x| < 1) ** +INF is +0 8. +-(|x| < 1) ** -INF is +INF 9. +-1 ** +-INF
@@ -1832,7 +1834,7 @@
          * (anything) = -0 ** (-anything) 18. (-anything) ** (integer) is
          * (-1)**(integer)*(+anything**integer) 19. (-anything except 0 and inf) ** (non-integer) is
          * NAN
-         *
+         * 
          * Accuracy: pow(x,y) returns x**y nearly rounded. In particular pow(integer,integer) always
          * returns the correct integer provided it is representable.
          */
@@ -2470,10 +2472,10 @@
          * __ieee754_sinh(x) Method : mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2 1.
          * Replace x by |x| (sinh(-x) = -sinh(x)). 2. E + E/(E+1) 0 <= x <= 22 : sinh(x) :=
          * --------------, E=expm1(x) 2
-         *
+         * 
          * 22 <= x <= lnovft : sinh(x) := exp(x)/2 lnovft <= x <= ln2ovft: sinh(x) := exp(x/2)/2 *
          * exp(x/2) ln2ovft < x : sinh(x) := x*shuge (overflow)
-         *
+         * 
          * Special cases: sinh(x) is |x| if x is +INF, -INF, or NaN. only sinh(0)=0 is exact for
          * finite x.
          */
@@ -2536,11 +2538,11 @@
          * __ieee754_cosh(x) Method : mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2 1.
          * Replace x by |x| (cosh(x) = cosh(-x)). 2. [ exp(x) - 1 ]^2 0 <= x <= ln2/2 : cosh(x) := 1
          * + ------------------- 2*exp(x)
-         *
+         * 
          * exp(x) + 1/exp(x) ln2/2 <= x <= 22 : cosh(x) := ------------------- 2 22 <= x <= lnovft :
          * cosh(x) := exp(x)/2 lnovft <= x <= ln2ovft: cosh(x) := exp(x/2)/2 * exp(x/2) ln2ovft < x
          * : cosh(x) := huge*huge (overflow)
-         *
+         * 
          * Special cases: cosh(x) is |x| if x is +INF, -INF, or NaN. only cosh(0)=1 is exact for
          * finite x.
          */
@@ -2610,12 +2612,12 @@
     public static double tanh(double xx) {
         /*
          * Tanh(x) Return the Hyperbolic Tangent of x
-         *
+         * 
          * Method : x -x e - e 0. tanh(x) is defined to be ----------- x -x e + e 1. reduce x to
          * non-negative by tanh(-x) = -tanh(x). 2. 0 <= x <= 2**-55 : tanh(x) := x*(one+x) -t 2**-55
          * < x <= 1 : tanh(x) := -----; t = expm1(-2x) t + 2 2 1 <= x <= 22.0 : tanh(x) := 1- -----
          * ; t=expm1(2x) t + 2 22.0 < x <= INF : tanh(x) := 1.
-         *
+         * 
          * Special cases: tanh(NaN) is NaN; only tanh(0)=0 is exact for finite argument.
          */
 
@@ -2677,22 +2679,22 @@
     public static double hypot(double aa, double bb) {
         /*
          * __ieee754_hypot(x,y)
-         *
+         * 
          * Method : If (assume round-to-nearest) z=x*x+y*y has error less than sqrt(2)/2 ulp, than
          * sqrt(z) has error less than 1 ulp (exercise).
-         *
+         * 
          * So, compute sqrt(x*x+y*y) with some care as follows to get the error below 1 ulp:
-         *
+         * 
          * Assume x>y>0; (if possible, set rounding to round-to-nearest) 1. if x > 2y use
          * x1*x1+(y*y+(x2*(x+x1))) for x*x+y*y where x1 = x with lower 32 bits cleared, x2 = x-x1;
          * else 2. if x <= 2y use t1*y1+((x-y)*(x-y)+(t1*y2+t2*y)) where t1 = 2x with lower 32 bits
          * cleared, t2 = 2x-t1, y1= y with lower 32 bits chopped, y2 = y-y1.
-         *
+         * 
          * NOTE: scaling may be necessary if some argument is too large or too tiny
-         *
+         * 
          * Special cases: hypot(x,y) is INF if x or y is +INF or -INF; else hypot(x,y) is NAN if x
          * or y is NAN.
-         *
+         * 
          * Accuracy: hypot(x,y) returns sqrt(x^2+y^2) with error less than 1 ulps (units in the last
          * place)
          */
@@ -2796,14 +2798,14 @@
     public static double expm1(double xx) {
         /*
          * expm1(x) Returns exp(x)-1, the exponential of x minus 1.
-         *
+         * 
          * Method 1. Argument reduction: Given x, find r and integer k such that
-         *
+         * 
          * x = k*ln2 + r, |r| <= 0.5*ln2 ~ 0.34658
-         *
+         * 
          * Here a correction term c will be computed to compensate the error in r when rounded to a
          * floating-point number.
-         *
+         * 
          * 2. Approximating expm1(r) by a special rational function on the interval [0,0.34658]:
          * Since r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 - r^4/360 + ... we define R1(r*r) by
          * r*(exp(r)+1)/(exp(r)-1) = 2+ r^2/6 * R1(r*r) That is, R1(r**2) = 6/r
@@ -2815,17 +2817,17 @@
          * 3.9682539681370365873E-4, Q3 = -9.9206344733435987357E-6, Q4 = 2.5051361420808517002E-7,
          * Q5 = -6.2843505682382617102E-9; (where z=r*r, and the values of Q1 to Q5 are listed
          * below) with error bounded by | 5 | -61 | 1.0+Q1*z+...+Q5*z - R1(z) | <= 2 | |
-         *
+         * 
          * expm1(r) = exp(r)-1 is then computed by the following specific way which minimize the
          * accumulation rounding error: 2 3 r r [ 3 - (R1 + R1*r/2) ] expm1(r) = r + --- + --- *
          * [--------------------] 2 2 [ 6 - r*(3 - R1*r/2) ]
-         *
+         * 
          * To compensate the error in the argument reduction, we use expm1(r+c) = expm1(r) + c +
          * expm1(r)*c ~ expm1(r) + c + r*c Thus c+r*c will be added in as the correction terms for
          * expm1(r+c). Now rearrange the term to avoid optimization screw up: ( 2 2 ) ({ ( r [ R1 -
          * (3 - R1*r/2) ] ) } r ) expm1(r+c)~r - ({r*(--- * [--------------------]-c)-c} - --- ) ({
          * ( 2 [ 6 - r*(3 - R1*r/2) ] ) } 2 ) ( )
-         *
+         * 
          * = r - E 3. Scale back to obtain expm1(x): From step 1, we have expm1(x) = either
          * 2^k*[expm1(r)+1] - 1 = or 2^k*[expm1(r) + (1-2^-k)] 4. Implementation notes: (A). To save
          * one multiplication, we scale the coefficient Qi to Qi*2^i, and replace z by (x^2)/2. (B).
@@ -2834,15 +2836,15 @@
          * (iv) if k=1 if r < -0.25, return 2*((r+0.5)- E) else return 1.0+2.0*(r-E); (v) if
          * (k<-2||k>56) return 2^k(1-(E-r)) - 1 (or exp(x)-1) (vi) if k <= 20, return
          * 2^k((1-2^-k)-(E-r)), else (vii) return 2^k(1-((E+2^-k)-r))
-         *
+         * 
          * Special cases: expm1(INF) is INF, expm1(NaN) is NaN; expm1(-INF) is -1, and for finite
          * argument, only expm1(0)=0 is exact.
-         *
+         * 
          * Accuracy: according to an error analysis, the error is always less than 1 ulp (unit in
          * the last place).
-         *
+         * 
          * Misc. info. For IEEE double if x > 7.09782712893383973096e+02 then expm1(x) overflow
-         *
+         * 
          * Constants: The hexadecimal values are the intended ones for the following constants. The
          * decimal values may be used, provided that the compiler will convert from decimal to
          * binary accurately enough to produce the hexadecimal values shown.
@@ -2960,15 +2962,15 @@
     public static double log1p(double x) {
         /*
          * double log1p(double x)
-         *
+         * 
          * Method : 1. Argument Reduction: find k and f such that 1+x = 2^k * (1+f), where sqrt(2)/2
          * < 1+f < sqrt(2) .
-         *
+         * 
          * Note. If k=0, then f=x is exact. However, if k!=0, then f may not be representable
          * exactly. In that case, a correction term is need. Let u=1+x rounded. Let c = (1+x)-u,
          * then log(1+x) - log(u) ~ c/u. Thus, we proceed to compute log(u), and add back the
          * correction term c/u. (Note: when x > 2**53, one can simply return log(x))
-         *
+         * 
          * 2. Approximation of log1p(f). Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s) =
          * 2s + 2/3 s**3 + 2/5 s**5 + ....., = 2s + s*R We use a special Reme algorithm on
          * [0,0.1716] to generate a polynomial of degree 14 to approximate R The maximum error of
@@ -2977,26 +2979,26 @@
          * listed in the program) and | 2 14 | -58.45 | Lp1*s +...+Lp7*s - R(z) | <= 2 | | Note that
          * 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2. In order to guarantee error in log
          * below 1ulp, we compute log by log1p(f) = f - (hfsq - s*(hfsq+R)).
-         *
+         * 
          * 3. Finally, log1p(x) = k*ln2 + log1p(f). = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo))) Here
          * ln2 is split into two floating point number: ln2_hi + ln2_lo, where n*ln2_hi is always
          * exact for |n| < 2000.
-         *
+         * 
          * Special cases: log1p(x) is NaN with signal if x < -1 (including -INF) ; log1p(+INF) is
          * +INF; log1p(-1) is -INF with signal; log1p(NaN) is that NaN with no signal.
-         *
+         * 
          * Accuracy: according to an error analysis, the error is always less than 1 ulp (unit in
          * the last place).
-         *
+         * 
          * Constants: The hexadecimal values are the intended ones for the following constants. The
          * decimal values may be used, provided that the compiler will convert from decimal to
          * binary accurately enough to produce the hexadecimal values shown.
-         *
+         * 
          * Note: Assuming log() return accurate answer, the following algorithm can be used to
          * compute log1p(x) to within a few ULP:
-         *
+         * 
          * u = 1+x; if(u==1.0) return x ; else return log(u)*(x/(u-1.0));
-         *
+         * 
          * See HP-15C Advanced Functions Handbook, p.193.
          */
         double f = 0;
@@ -3388,4 +3390,4 @@
         return (x >= 0.0 ? r : -r);
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/DeoptimizeOnExceptionTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -89,6 +89,7 @@
     public static void methodB() {
         Random r = new Random(System.currentTimeMillis());
         while (r.nextFloat() > .03f) {
+            // Empty
         }
 
         return;
@@ -97,6 +98,7 @@
     public static void methodA() {
         Random r = new Random(System.currentTimeMillis());
         while (r.nextDouble() > .05) {
+            // Empty
         }
         return;
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/EdgesTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -80,7 +80,7 @@
 
     /**
      * Checks that there are no checkcasts in the compiled version of
-     * {@link Edges#getNode(Node, int)}
+     * {@link Edges#getNode(Node, int)}.
      */
     @Test
     public void test0() {
@@ -89,7 +89,7 @@
 
     /**
      * Checks that there are no checkcasts in the compiled version of
-     * {@link Edges#getNodeList(Node, int)}
+     * {@link Edges#getNodeList(Node, int)}.
      */
     @Test
     public void test1() {
@@ -98,7 +98,7 @@
 
     /**
      * Checks that there are no checkcasts in the compiled version of
-     * {@link Edges#setNode(Node, int, Node)}
+     * {@link Edges#setNode(Node, int, Node)}.
      */
     @Test
     public void test2() {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/UnsafeSubstitutionsTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,18 +50,15 @@
         assert code != null;
 
         // Verify that the original method and the substitution produce the same value
-        {
-            Object expected = invokeSafe(originalMethod, receiver, args1);
-            Object actual = invokeSafe(testMethod, null, args2);
-            assertDeepEquals(expected, actual);
-        }
+        Object expected = invokeSafe(originalMethod, receiver, args1);
+        Object actual = invokeSafe(testMethod, null, args2);
+        assertDeepEquals(expected, actual);
 
         // Verify that the generated code and the original produce the same value
-        {
-            Object expected = invokeSafe(originalMethod, receiver, args1);
-            Object actual = executeVarargsSafe(code, args2);
-            assertDeepEquals(expected, actual);
-        }
+        expected = invokeSafe(originalMethod, receiver, args1);
+        actual = executeVarargsSafe(code, args2);
+        assertDeepEquals(expected, actual);
+
     }
 
     static long off(Object o, String name) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsUtil.java	Fri Oct 24 16:18:10 2014 +0200
@@ -25,7 +25,7 @@
 import com.oracle.graal.replacements.nodes.*;
 
 // JaCoCo Exclude
-public class ReplacementsUtil {
+public final class ReplacementsUtil {
     private ReplacementsUtil() {
         // empty
     }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java	Fri Oct 24 16:18:10 2014 +0200
@@ -74,8 +74,11 @@
  */
 public class SnippetTemplate {
 
+    // Checkstyle: stop
     public static boolean LAZY_SNIPPETS = true;
 
+    // Checkstyle: resume
+
     /**
      * Holds the {@link ResolvedJavaMethod} of the snippet, together with some information about the
      * method that needs to be computed only once. The {@link SnippetInfo} should be created once
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -58,7 +58,7 @@
     /**
      * If we are sub it sizes, we try to sign/zero extend the value to at least int as it is done in
      * the {@link com.oracle.graal.replacements.DefaultJavaLoweringProvider#implicitLoadConvert} and
-     * {@link com.oracle.graal.replacements.DefaultJavaLoweringProvider#createUnsafeRead}
+     * {@link com.oracle.graal.replacements.DefaultJavaLoweringProvider#createUnsafeRead}.
      *
      * @see com.oracle.graal.replacements.DefaultJavaLoweringProvider#implicitLoadConvert
      * @see com.oracle.graal.replacements.DefaultJavaLoweringProvider#createUnsafeRead
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARC.java
--- a/graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARC.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARC.java	Fri Oct 24 16:18:10 2014 +0200
@@ -219,7 +219,7 @@
     public static final int FLOAT_REGISTER_COUNT = 64;
 
     /**
-     * Alignment for valid memory access
+     * Alignment for valid memory access.
      */
     public static final int MEMORY_ACCESS_ALIGN = 4;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARCScratchRegister.java
--- a/graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARCScratchRegister.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARCScratchRegister.java	Fri Oct 24 16:18:10 2014 +0200
@@ -24,7 +24,7 @@
 
 import com.oracle.graal.api.code.*;
 
-public class SPARCScratchRegister implements AutoCloseable {
+public final class SPARCScratchRegister implements AutoCloseable {
     private final ThreadLocal<Boolean> locked = new ThreadLocal<>();
     private final ThreadLocal<Exception> where = new ThreadLocal<>();
     private final Register register;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitCore.java	Fri Oct 24 16:18:10 2014 +0200
@@ -55,7 +55,10 @@
         boolean color = false;
         boolean eagerStackTrace = false;
         boolean gcAfterTest = false;
-        for (String each : expandArgs(args)) {
+
+        String[] expandedArgs = expandArgs(args);
+        for (int i = 0; i < expandedArgs.length; i++) {
+            String each = expandedArgs[i];
             if (each.charAt(0) == '-') {
                 // command line arguments
                 if (each.contentEquals("-JUnitVerbose")) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitRunListener.java
--- a/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitRunListener.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.test/src/com/oracle/graal/test/GraalJUnitRunListener.java	Fri Oct 24 16:18:10 2014 +0200
@@ -35,14 +35,14 @@
      *
      * @param description describes the tests to be run
      */
-    public void testRunStarted(Description description);
+    void testRunStarted(Description description);
 
     /**
-     * Called when all tests have finished
+     * Called when all tests have finished.
      *
      * @param result the summary of the test run, including all the tests that failed
      */
-    public void testRunFinished(Result result);
+    void testRunFinished(Result result);
 
     /**
      * Called when a test class is about to be started.
@@ -86,7 +86,7 @@
      *
      * @param description describes the test that will not be run
      */
-    public void testIgnored(Description description);
+    void testIgnored(Description description);
 
     /**
      * Called when an atomic test succeeds.
@@ -96,33 +96,33 @@
     void testSucceeded(Description description);
 
     /**
-     * Called when an atomic test flags that it assumes a condition that is false
+     * Called when an atomic test flags that it assumes a condition that is false.
      *
      * @param failure describes the test that failed and the {@link AssumptionViolatedException}
      *            that was thrown
      */
-    public void testAssumptionFailure(Failure failure);
+    void testAssumptionFailure(Failure failure);
 
     /**
      * Called after {@link #testClassFinished(Class)}.
      */
-    public void testClassFinishedDelimiter();
+    void testClassFinishedDelimiter();
 
     /**
-     * Called after {@link #testClassStarted(Class)}
+     * Called after {@link #testClassStarted(Class)}.
      */
-    public void testClassStartedDelimiter();
+    void testClassStartedDelimiter();
 
     /**
-     * Called after {@link #testStarted(Description)}
+     * Called after {@link #testStarted(Description)}.
      */
-    public void testStartedDelimiter();
+    void testStartedDelimiter();
 
     /**
-     * Called after {@link #testFailed(Failure)}
+     * Called after {@link #testFailed(Failure)}.
      */
-    public void testFinishedDelimiter();
+    void testFinishedDelimiter();
 
-    public PrintStream getWriter();
+    PrintStream getWriter();
 
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleStampTest.java
--- a/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleStampTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle.test/src/com/oracle/graal/truffle/test/TruffleStampTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -38,9 +38,11 @@
     private static final Object TYPE1 = new Object();
     private static final Object TYPE2 = new Object();
 
-    @DataPoints public static Object[] data = new Object[]{1, 2, 1.0d, 2.0d, "1", "2", null,//
+    // @formatter:off
+    @DataPoints public static Object[] data = new Object[]{1, 2, 1.0d, 2.0d, "1", "2", null,
                     new TestTypedObject(TYPE1), new TestTypedObject(TYPE1), new TestTypedObject(TYPE2), //
                     new Object[]{1, "a", new TestTypedObject(TYPE1)}, new Object[0]};
+    // @formatter:on
 
     private TruffleStamp stamp;
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationPolicy.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationPolicy.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/CompilationPolicy.java	Fri Oct 24 16:18:10 2014 +0200
@@ -27,5 +27,4 @@
     boolean shouldCompile(CompilationProfile profile);
 
     void recordCompilationFailure(Throwable t);
-
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleSplittingStrategyNew.java	Fri Oct 24 16:18:10 2014 +0200
@@ -163,8 +163,7 @@
         String id = String.format("@%8h %s", target.hashCode(), target.getSourceCallTarget() == null ? "orig." : "split");
         String plusMinus = stamp.equals(newStamp) ? "+ " : (stamp.equals(oldStamp) ? "- " : "");
         System.out.printf("%16s%-20sCallers: %3d, Nodes:%10s %s%n", plusMinus, id, target.getKnownCallSiteCount(), //
-                        String.format("%d (%d/%d)", count(target, NodeCost.MONOMORPHIC), count(target, NodeCost.POLYMORPHIC), count(target, NodeCost.MEGAMORPHIC)),//
-                        stamp);
+                        String.format("%d (%d/%d)", count(target, NodeCost.MONOMORPHIC), count(target, NodeCost.POLYMORPHIC), count(target, NodeCost.MEGAMORPHIC)), stamp);
     }
 
     private static int count(OptimizedCallTarget target, final NodeCost otherCost) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleStamp.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleStamp.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/DefaultTruffleStamp.java	Fri Oct 24 16:18:10 2014 +0200
@@ -79,7 +79,7 @@
         return NO_TYPE;
     }
 
-    private static abstract class ValueStamp implements TruffleStamp {
+    private abstract static class ValueStamp implements TruffleStamp {
 
         Class<?> getClazz() {
             return NO_CLASS;
@@ -325,7 +325,7 @@
 
     }
 
-    private final static class ArrayStamp implements TruffleStamp {
+    private static final class ArrayStamp implements TruffleStamp {
 
         private static final ArrayStamp INSTANCE = new ArrayStamp(getInstance());
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetLog.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetLog.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetLog.java	Fri Oct 24 16:18:10 2014 +0200
@@ -179,8 +179,9 @@
             log(0, "opt done", target.toString(), properties);
         }
         if (TraceTruffleCompilationPolymorphism.getValue()) {
-            target.nodeStream(true).filter(node -> node != null && (node.getCost() == NodeCost.MEGAMORPHIC || node.getCost() == NodeCost.POLYMORPHIC))//
-            .forEach(node -> {
+            // @formatter:off
+            target.nodeStream(true).filter(node -> node != null && (node.getCost() == NodeCost.MEGAMORPHIC || node.getCost() == NodeCost.POLYMORPHIC)).
+            forEach(node -> {
                 NodeCost cost = node.getCost();
                 Map<String, Object> props = new LinkedHashMap<>();
                 props.put("simpleName", node.getClass().getSimpleName());
@@ -188,6 +189,7 @@
                 String msg = cost == NodeCost.MEGAMORPHIC ? "megamorphic" : "polymorphic";
                 log(0, msg, node.toString(), props);
             });
+            // @formatter:on
         }
     }
 
@@ -255,18 +257,21 @@
     }
 
     private static void printProfiling() {
-        Map<OptimizedCallTarget, List<OptimizedCallTarget>> groupedTargets = Truffle.getRuntime().getCallTargets().stream()//
-        .map(target -> (OptimizedCallTarget) target)//
-        .collect(Collectors.groupingBy(target -> {
+        // @formatter:off
+        Map<OptimizedCallTarget, List<OptimizedCallTarget>> groupedTargets = Truffle.getRuntime().getCallTargets().stream().
+        map(target -> (OptimizedCallTarget) target).
+        collect(Collectors.groupingBy(target -> {
             if (target.getSourceCallTarget() != null) {
                 return target.getSourceCallTarget();
             }
             return target;
         }));
+        // @formatter:on
 
-        List<OptimizedCallTarget> uniqueSortedTargets = groupedTargets.keySet().stream()//
-        .sorted((target1, target2) -> sumCalls(groupedTargets.get(target2), p -> p.getTotalCallCount()) - sumCalls(groupedTargets.get(target1), p -> p.getTotalCallCount()))//
-        .collect(Collectors.toList());
+        List<OptimizedCallTarget> uniqueSortedTargets = groupedTargets.keySet().stream().sorted(
+                        (target1, target2) -> sumCalls(groupedTargets.get(target2), p -> p.getTotalCallCount()) - sumCalls(groupedTargets.get(target1), p -> p.getTotalCallCount())).collect(
+                        Collectors.toList());
+        // @formatter:on
 
         int totalDirectCallCount = 0;
         int totalInlinedCallCount = 0;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/ReadOnlyFrame.java	Fri Oct 24 16:18:10 2014 +0200
@@ -131,4 +131,4 @@
     public boolean isDouble(FrameSlot slot) {
         return delegate.isDouble(slot);
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleInlining.java	Fri Oct 24 16:18:10 2014 +0200
@@ -165,9 +165,9 @@
      */
     public interface CallTreeNodeVisitor extends NodeVisitor {
 
-        public boolean visit(List<TruffleInlining> decisionStack, Node node);
+        boolean visit(List<TruffleInlining> decisionStack, Node node);
 
-        public default boolean visit(Node node) {
+        default boolean visit(Node node) {
             return visit(null, node);
         }
 
@@ -205,7 +205,7 @@
      * This visitor wraps an existing {@link NodeVisitor} or {@link CallTreeNodeVisitor} and
      * traverses the full Truffle tree including inlined call sites.
      */
-    private final static class CallTreeNodeVisitorImpl implements NodeVisitor {
+    private static final class CallTreeNodeVisitorImpl implements NodeVisitor {
 
         protected final List<TruffleInlining> stack = new ArrayList<>();
         private final NodeVisitor visitor;
@@ -216,7 +216,7 @@
             this.visitor = visitor;
         }
 
-        public final boolean visit(Node node) {
+        public boolean visit(Node node) {
             if (node instanceof OptimizedDirectCallNode) {
                 OptimizedDirectCallNode callNode = (OptimizedDirectCallNode) node;
                 TruffleInlining inlining = stack.get(stack.size() - 1);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleStamp.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleStamp.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleStamp.java	Fri Oct 24 16:18:10 2014 +0200
@@ -25,7 +25,7 @@
 /**
  * Experimental.
  */
-public abstract interface TruffleStamp {
+public interface TruffleStamp {
 
     TruffleStamp join(TruffleStamp p);
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/frame/ForceMaterializeNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -46,5 +46,5 @@
     }
 
     @NodeIntrinsic
-    public native static void force(Object object);
+    public static native void force(Object object);
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java
--- a/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.graal.virtual/src/com/oracle/graal/virtual/phases/ea/PartialEscapeClosure.java	Fri Oct 24 16:18:10 2014 +0200
@@ -124,7 +124,8 @@
     }
 
     private void processNodeWithState(NodeWithState nodeWithState, final BlockT state, final GraphEffectList effects) {
-        for (FrameState frameState : nodeWithState.states()) {
+        for (FrameState fs : nodeWithState.states()) {
+            FrameState frameState = fs;
             if (frameState.usages().count() > 1) {
                 FrameState copy = (FrameState) frameState.copyWithInputs();
                 nodeWithState.asNode().replaceFirstInput(frameState, copy);
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ContainsTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -50,7 +50,7 @@
     public void testContains1() {
         assertRuns(Contains1Factory.getInstance(), //
                         array(1, "a", 2, "b"), //
-                        array(2, "aa", 3, "ba"),//
+                        array(2, "aa", 3, "ba"), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (value instanceof String) {
@@ -122,7 +122,7 @@
     public void testContains3() {
         assertRuns(Contains3Factory.getInstance(), //
                         array(2, 1, 2, -3, -4), //
-                        array(-2, 2, -2, -3, -4),//
+                        array(-2, 2, -2, -3, -4), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 // assert that we are always monomorphic
@@ -175,7 +175,7 @@
     public void testContains4() {
         assertRuns(Contains4Factory.getInstance(), //
                         array(-1, 0, 1, 2), //
-                        array(1, 0, 1, 2),//
+                        array(1, 0, 1, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 Assert.assertEquals(NodeCost.MONOMORPHIC, node.getNode().getCost());
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/FallbackTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -47,7 +47,7 @@
     }
 
     /**
-     * test with fallback handler defined
+     * Test with fallback handler defined.
      */
     @SuppressWarnings("unused")
     @NodeChild("a")
@@ -72,7 +72,7 @@
     }
 
     /**
-     * test without fallback handler defined
+     * Test without fallback handler defined.
      */
     @SuppressWarnings("unused")
     @NodeChild("a")
@@ -93,7 +93,7 @@
     }
 
     /**
-     * test without fallback handler and unreachable
+     * Test without fallback handler and unreachable.
      */
     @SuppressWarnings("unused")
     @NodeChild("a")
@@ -136,7 +136,7 @@
     }
 
     /**
-     * test without fallback handler and unreachable
+     * Test without fallback handler and unreachable.
      */
     @SuppressWarnings("unused")
     @NodeChild("a")
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/InsertBeforeTest.java
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/InsertBeforeTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/InsertBeforeTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -120,7 +120,7 @@
     }
 
     @NodeChild("a")
-    static class InsertBefore1T6_1 extends InsertBefore1Base {
+    static class InsertBefore1T6part1 extends InsertBefore1Base {
 
         boolean g0(int a) {
             return a == 0;
@@ -134,7 +134,7 @@
     }
 
     @NodeChild("a")
-    static class InsertBefore1T6_2 extends InsertBefore1T6_1 {
+    static class InsertBefore1T6part2 extends InsertBefore1T6part1 {
 
         boolean g(int a) {
             return a == 0;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/PolymorphicTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -75,7 +75,7 @@
     public void testPolymorphic1() {
         assertRuns(Polymorphic1Factory.getInstance(), //
                         array(42, 43, true, false, "a", "b"), //
-                        array(42, 43, true, false, "a", "b"),//
+                        array(42, 43, true, false, "a", "b"), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 Polymorphic1 polymorphic = ((Polymorphic1) node.getNode());
@@ -119,7 +119,7 @@
     public void testPolymorphic2() {
         assertRuns(Polymorphic2Factory.getInstance(), //
                         array(0, 1, 1, "1", "2", 2, 3), //
-                        array(0, 1, 1, "1", "2", 2, 3),//
+                        array(0, 1, 1, "1", "2", 2, 3), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 Polymorphic2 polymorphic = ((Polymorphic2) node.getNode());
@@ -161,7 +161,7 @@
     public void testPolymorphic3() {
         assertRuns(Polymorphic3Factory.getInstance(), //
                         array("0", "1", 1, 1, 2, 2, 3, 3), //
-                        array("0", "1", 1, 1, 2, 2, 3, 3),//
+                        array("0", "1", 1, 1, 2, 2, 3, 3), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 Polymorphic3 polymorphic = ((Polymorphic3) node.getNode());
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java
--- a/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/SpecializationFallthroughTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -43,7 +43,7 @@
     public void testFallthrough0() {
         assertRuns(FallthroughTest0Factory.getInstance(), //
                         array(0, 0, 1, 2), //
-                        array(0, 0, 1, 2),//
+                        array(0, 0, 1, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
@@ -87,7 +87,7 @@
     public void testFallthrough1() {
         assertRuns(FallthroughTest1Factory.getInstance(), //
                         array(0, 0, 0, 1, 2), //
-                        array(0, 0, 0, 1, 2),//
+                        array(0, 0, 0, 1, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
@@ -133,7 +133,7 @@
     public void testFallthrough2() {
         assertRuns(FallthroughTest2Factory.getInstance(), //
                         array(0, 0, 1, 1, 2, 2), //
-                        array(0, 0, 1, 1, 2, 2),//
+                        array(0, 0, 1, 1, 2, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
@@ -189,7 +189,7 @@
     public void testFallthrough3() {
         assertRuns(FallthroughTest3Factory.getInstance(), //
                         array(0, 0, 1, 1, 2, 2), //
-                        array(0, 0, 1, 1, 2, 2),//
+                        array(0, 0, 1, 1, 2, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
@@ -237,7 +237,7 @@
     public void testFallthrough4() {
         assertRuns(FallthroughTest4Factory.getInstance(), //
                         array(0, 0, 1, 1, 2, 2), //
-                        array(0, 0, 1, 1, 2, 2),//
+                        array(0, 0, 1, 1, 2, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
@@ -290,7 +290,7 @@
     public void testFallthrough5() {
         assertRuns(FallthroughTest5Factory.getInstance(), //
                         array(0, 0, 1, 1, 2, 2), //
-                        array(0, 0, 1, 1, 2, 2),//
+                        array(0, 0, 1, 1, 2, 2), //
                         new ExecutionListener() {
                             public void afterExecution(TestRootNode<? extends ValueNode> node, int index, Object value, Object expectedResult, Object actualResult, boolean last) {
                                 if (!last) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java
--- a/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.dsl/src/com/oracle/truffle/api/dsl/internal/DSLShare.java	Fri Oct 24 16:18:10 2014 +0200
@@ -219,4 +219,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/InterfaceChildFieldTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -92,7 +92,7 @@
     }
 
     interface TestChildInterface {
-        public int executeIntf();
+        int executeIntf();
     }
 
     class TestLeafNode extends Node implements TestChildInterface {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java	Fri Oct 24 16:18:10 2014 +0200
@@ -54,7 +54,7 @@
     private TruffleRuntime runtime;
 
     @Before
-    public void setup() {
+    public void setUp() {
         this.runtime = Truffle.getRuntime();
     }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/.checkstyle_checks.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.truffle.api/.checkstyle_checks.xml	Fri Oct 24 16:18:10 2014 +0200
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: Maxine Checks
+    Description: none
+-->
+<module name="Checker">
+  <property name="severity" value="error"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="FileContentsHolder"/>
+    <module name="JavadocStyle">
+      <property name="checkHtml" value="false"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName">
+      <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="TypeName">
+      <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/>
+    </module>
+    <module name="RedundantImport"/>
+    <module name="LineLength">
+      <property name="max" value="250"/>
+    </module>
+    <module name="MethodParamPad"/>
+    <module name="NoWhitespaceAfter">
+      <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+    </module>
+    <module name="ParenPad"/>
+    <module name="TypecastParenPad">
+      <property name="tokens" value="RPAREN,TYPECAST"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround">
+      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+    </module>
+    <module name="RedundantModifier"/>
+    <module name="AvoidNestedBlocks">
+      <property name="allowInSwitchCase" value="true"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+      <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
+    </module>
+    <module name="LeftCurly"/>
+    <module name="NeedBraces"/>
+    <module name="RightCurly"/>
+    <module name="EmptyStatement"/>
+    <module name="HiddenField">
+      <property name="severity" value="ignore"/>
+      <property name="ignoreConstructorParameter" value="true"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+    <module name="FallThrough"/>
+    <module name="FinalLocalVariable">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="StringLiteralEquality">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="SuperFinalize"/>
+    <module name="UnnecessaryParentheses">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="Indentation">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="StaticVariableName">
+      <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="EmptyForInitializerPad"/>
+    <module name="EmptyForIteratorPad"/>
+    <module name="ModifierOrder"/>
+    <module name="DefaultComesLast"/>
+    <module name="InnerAssignment">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="JUnitTestCase"/>
+    <module name="ModifiedControlVariable"/>
+    <module name="MutableException">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ParameterAssignment">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
+      <property name="format" value="\s$"/>
+      <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/>
+      <property name="ignoreComments" value="true"/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/>
+      <property name="format" value=" ,"/>
+      <property name="message" value="illegal space before a comma"/>
+      <property name="ignoreComments" value="true"/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
+      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
+    </module>
+  </module>
+  <module name="RegexpHeader">
+    <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.  Oracle designates this\n \* particular file as subject to the &quot;Classpath&quot; exception as provided\n \* by Oracle in the LICENSE file that accompanied this code.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+  <module name="FileTabCharacter">
+    <property name="severity" value="error"/>
+  </module>
+  <module name="NewlineAtEndOfFile">
+    <property name="lineSeparator" value="lf"/>
+  </module>
+  <module name="Translation"/>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
+    <property name="checkFormat" value="ConstantNameCheck"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop method name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume method name check"/>
+    <property name="checkFormat" value="MethodName"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
+    <property name="checkFormat" value="ParameterAssignment"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
+    <property name="checkFormat" value="FinalLocalVariable"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop"/>
+    <property name="onCommentFormat" value="Checkstyle: resume"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
+    <property name="checkFormat" value="InnerAssignment"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="Checkstyle: stop field name check"/>
+    <property name="onCommentFormat" value="Checkstyle: resume field name check"/>
+    <property name="checkFormat" value="MemberName"/>
+    <property name="checkC" value="false"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
+  </module>
+  <module name="RegexpMultiline">
+    <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/>
+    <property name="format" value="\r\n"/>
+    <property name="message" value="illegal Windows line ending"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop system..print check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume system..print check"/>
+    <property name="checkFormat" value="RegexpSingleline"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable System.(out|err).print checks"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop header check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume header check"/>
+    <property name="checkFormat" value=".*Header"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
+  </module>
+  <module name="RegexpSingleline">
+    <property name="format" value="System\.(out|err)\.print"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+</module>
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/.checkstyle_checks.xml.disabled
--- a/graal/com.oracle.truffle.api/.checkstyle_checks.xml.disabled	Thu Oct 23 17:20:10 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-    Checkstyle-Configuration: Maxine Checks
-    Description: none
--->
-<module name="Checker">
-  <property name="severity" value="error"/>
-  <module name="TreeWalker">
-    <property name="tabWidth" value="4"/>
-    <module name="FileContentsHolder"/>
-    <module name="JavadocStyle">
-      <property name="checkHtml" value="false"/>
-    </module>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="MemberName">
-      <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
-    </module>
-    <module name="MethodName">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="TypeName">
-      <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/>
-    </module>
-    <module name="RedundantImport"/>
-    <module name="LineLength">
-      <property name="max" value="250"/>
-    </module>
-    <module name="MethodParamPad"/>
-    <module name="NoWhitespaceAfter">
-      <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBefore">
-      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
-    </module>
-    <module name="ParenPad"/>
-    <module name="TypecastParenPad">
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter"/>
-    <module name="WhitespaceAround">
-      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
-    </module>
-    <module name="RedundantModifier"/>
-    <module name="AvoidNestedBlocks">
-      <property name="allowInSwitchCase" value="true"/>
-    </module>
-    <module name="EmptyBlock">
-      <property name="option" value="text"/>
-      <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
-    </module>
-    <module name="LeftCurly"/>
-    <module name="NeedBraces"/>
-    <module name="RightCurly"/>
-    <module name="EmptyStatement"/>
-    <module name="HiddenField">
-      <property name="severity" value="ignore"/>
-      <property name="ignoreConstructorParameter" value="true"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="ArrayTypeStyle"/>
-    <module name="UpperEll"/>
-    <module name="FallThrough"/>
-    <module name="FinalLocalVariable">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="MultipleVariableDeclarations"/>
-    <module name="StringLiteralEquality">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="SuperFinalize"/>
-    <module name="UnnecessaryParentheses">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="Indentation">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="StaticVariableName">
-      <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/>
-    </module>
-    <module name="EmptyForInitializerPad"/>
-    <module name="EmptyForIteratorPad"/>
-    <module name="ModifierOrder"/>
-    <module name="DefaultComesLast"/>
-    <module name="InnerAssignment">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="JUnitTestCase"/>
-    <module name="ModifiedControlVariable"/>
-    <module name="MutableException">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="ParameterAssignment">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
-      <property name="format" value="\s$"/>
-      <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/>
-      <property name="ignoreComments" value="true"/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/>
-      <property name="format" value=" ,"/>
-      <property name="message" value="illegal space before a comma"/>
-      <property name="ignoreComments" value="true"/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
-      <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
-    </module>
-  </module>
-  <module name="RegexpHeader">
-    <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.  Oracle designates this\n \* particular file as subject to the &quot;Classpath&quot; exception as provided\n \* by Oracle in the LICENSE file that accompanied this code.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-  <module name="FileTabCharacter">
-    <property name="severity" value="error"/>
-  </module>
-  <module name="NewlineAtEndOfFile">
-    <property name="lineSeparator" value="lf"/>
-  </module>
-  <module name="Translation"/>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
-    <property name="checkFormat" value="ConstantNameCheck"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop method name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume method name check"/>
-    <property name="checkFormat" value="MethodName"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
-    <property name="checkFormat" value="ParameterAssignment"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
-    <property name="checkFormat" value="FinalLocalVariable"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop"/>
-    <property name="onCommentFormat" value="Checkstyle: resume"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
-    <property name="checkFormat" value="InnerAssignment"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="Checkstyle: stop field name check"/>
-    <property name="onCommentFormat" value="Checkstyle: resume field name check"/>
-    <property name="checkFormat" value="MemberName"/>
-    <property name="checkC" value="false"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
-  </module>
-  <module name="RegexpMultiline">
-    <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/>
-    <property name="format" value="\r\n"/>
-    <property name="message" value="illegal Windows line ending"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop system..print check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume system..print check"/>
-    <property name="checkFormat" value="RegexpSingleline"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable System.(out|err).print checks"/>
-  </module>
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle: stop header check"/>
-    <property name="onCommentFormat" value="CheckStyle: resume header check"/>
-    <property name="checkFormat" value=".*Header"/>
-    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
-  </module>
-  <module name="RegexpSingleline">
-    <property name="format" value="System\.(out|err)\.print"/>
-    <property name="fileExtensions" value="java"/>
-  </module>
-</module>
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExactMath.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExactMath.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExactMath.java	Fri Oct 24 16:18:10 2014 +0200
@@ -105,8 +105,10 @@
     }
 
     public static long multiplyHigh(long x, long y) {
+        // Checkstyle: stop
         long x0, y0, z0;
         long x1, y1, z1, z2, t;
+        // Checkstyle: resume
 
         x0 = x & 0xFFFFFFFFL;
         x1 = x >> 32;
@@ -124,8 +126,10 @@
     }
 
     public static long multiplyHighUnsigned(long x, long y) {
+        // Checkstyle: stop
         long x0, y0, z0;
         long x1, y1, z1, z2, t;
+        // Checkstyle: resume
 
         x0 = x & 0xFFFFFFFFL;
         x1 = x >>> 32;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java	Fri Oct 24 16:18:10 2014 +0200
@@ -161,7 +161,7 @@
     public abstract String getLanguageShortName();
 
     /**
-     * Establishes source event reporting
+     * Establishes source event reporting.
      */
     protected abstract void setSourceCallback(SourceCallback sourceCallback);
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultLoopNode.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultLoopNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultLoopNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -36,6 +36,7 @@
     @Override
     public void executeLoop(VirtualFrame frame) {
         while (executeRepeatingNode(frame)) {
+            // Empty
         }
     }
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SourceCallback.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SourceCallback.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/SourceCallback.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,9 +31,9 @@
  */
 public interface SourceCallback {
 
-    public void startLoading(Source source);
+    void startLoading(Source source);
 
-    public void endLoading(Source source);
+    void endLoading(Source source);
 
     /**
      * Inert (singleton) implementation of {@link SourceCallback}.
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/InstrumentationNode.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/InstrumentationNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/InstrumentationNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -334,7 +334,7 @@
         @CompilerDirectives.CompilationFinal private SyntaxTagTrap trap = null;
 
         /**
-         * The collection of tags for this instrumentation node
+         * The collection of tags for this instrumentation node.
          */
         private final ArrayList<SyntaxTag> tags = new ArrayList<>();
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToProbeCollectionMap.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToProbeCollectionMap.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToProbeCollectionMap.java	Fri Oct 24 16:18:10 2014 +0200
@@ -139,8 +139,9 @@
 
         ArrayList<Probe> probes = new ArrayList<>();
         for (LineLocation line : keySet) {
-            if (line.getLineNumber() == lineNumber)
+            if (line.getLineNumber() == lineNumber) {
                 probes.addAll(lineToProbesMap.get(line));
+            }
         }
 
         return probes;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToSourceSectionCollectionMap.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToSourceSectionCollectionMap.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/LineLocationToSourceSectionCollectionMap.java	Fri Oct 24 16:18:10 2014 +0200
@@ -121,8 +121,9 @@
 
         final ArrayList<SourceSection> sourceSections = new ArrayList<>();
         for (LineLocation line : keySet) {
-            if (line.getLineNumber() == lineNumber)
+            if (line.getLineNumber() == lineNumber) {
                 sourceSections.addAll(lineToSourceSectionsMap.get(line));
+            }
         }
 
         return sourceSections;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/ProbeManager.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/ProbeManager.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/ProbeManager.java	Fri Oct 24 16:18:10 2014 +0200
@@ -32,7 +32,7 @@
 import com.oracle.truffle.api.source.*;
 
 /**
- * Factory and services for AST {@link Probe}s
+ * Factory and services for AST {@link Probe}s.
  */
 public final class ProbeManager {
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java	Fri Oct 24 16:18:10 2014 +0200
@@ -348,7 +348,7 @@
         return new RecursiveNodeIterator(node);
     }
 
-    private final static class RecursiveNodeIterator implements Iterator<Node> {
+    private static final class RecursiveNodeIterator implements Iterator<Node> {
         private final List<Iterator<Node>> iteratorStack = new ArrayList<>();
 
         public RecursiveNodeIterator(final Node node) {
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/LineLocation.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/LineLocation.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/LineLocation.java	Fri Oct 24 16:18:10 2014 +0200
@@ -31,11 +31,11 @@
  */
 public interface LineLocation {
 
-    public Source getSource();
+    Source getSource();
 
     /**
-     * Gets the 1-based number of a line in the source
+     * Gets the 1-based number of a line in the source.
      */
-    public int getLineNumber();
+    int getLineNumber();
 
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/Source.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/Source.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/source/Source.java	Fri Oct 24 16:18:10 2014 +0200
@@ -773,52 +773,52 @@
         }
 
         @Override
-        public final Source getSource() {
+        public Source getSource() {
             return source;
         }
 
         @Override
-        public final int getStartLine() {
+        public int getStartLine() {
             return startLine;
         }
 
         @Override
-        public final LineLocation getLineLocation() {
+        public LineLocation getLineLocation() {
             return source.createLineLocation(startLine);
         }
 
         @Override
-        public final int getStartColumn() {
+        public int getStartColumn() {
             return startColumn;
         }
 
         @Override
-        public final int getCharIndex() {
+        public int getCharIndex() {
             return charIndex;
         }
 
         @Override
-        public final int getCharLength() {
+        public int getCharLength() {
             return charLength;
         }
 
         @Override
-        public final int getCharEndIndex() {
+        public int getCharEndIndex() {
             return charIndex + charLength;
         }
 
         @Override
-        public final String getIdentifier() {
+        public String getIdentifier() {
             return identifier;
         }
 
         @Override
-        public final String getCode() {
+        public String getCode() {
             return getSource().getCode(charIndex, charLength);
         }
 
         @Override
-        public final String getShortDescription() {
+        public String getShortDescription() {
             return String.format("%s:%d", source.getShortName(), startLine);
         }
 
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/JSONHelper.java
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/JSONHelper.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/utilities/JSONHelper.java	Fri Oct 24 16:18:10 2014 +0200
@@ -130,7 +130,7 @@
         return new JSONArrayBuilder();
     }
 
-    public static abstract class JSONStringBuilder {
+    public abstract static class JSONStringBuilder {
         @Override
         public final String toString() {
             StringBuilder sb = new StringBuilder();
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/CodeWriter.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/CodeWriter.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/CodeWriter.java	Fri Oct 24 16:18:10 2014 +0200
@@ -59,4 +59,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/generator/NodeCodeGenerator.java	Fri Oct 24 16:18:10 2014 +0200
@@ -322,12 +322,12 @@
     /**
      * <pre>
      * variant1 $condition != null
-     *
+     * 
      * $type $name = defaultValue($type);
      * if ($condition) {
      *     $name = $value;
      * }
-     *
+     * 
      * variant2 $condition != null
      * $type $name = $value;
      * </pre>
@@ -2530,10 +2530,11 @@
             } else {
                 builder.startNewArray(classArray, null);
                 for (SpecializationData specialization : list) {
-                    if (specialization.isGeneric() || specialization.isPolymorphic()) {
-                        specialization = getModel().getNode().getUninitializedSpecialization();
+                    SpecializationData s = specialization;
+                    if (s.isGeneric() || s.isPolymorphic()) {
+                        s = getModel().getNode().getUninitializedSpecialization();
                     }
-                    builder.startGroup().string(nodeSpecializationClassName(specialization)).string(".class").end();
+                    builder.startGroup().string(nodeSpecializationClassName(s)).string(".class").end();
                 }
                 builder.end();
             }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedPackageElement.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedPackageElement.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedPackageElement.java	Fri Oct 24 16:18:10 2014 +0200
@@ -79,4 +79,4 @@
         }
         return super.equals(obj);
     }
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeElement.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeElement.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeElement.java	Fri Oct 24 16:18:10 2014 +0200
@@ -33,4 +33,4 @@
         setEnclosingElement(packageElement);
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeMirror.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeMirror.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/model/GeneratedTypeMirror.java	Fri Oct 24 16:18:10 2014 +0200
@@ -33,5 +33,4 @@
     public GeneratedTypeMirror(String packageName, String name) {
         super(new GeneratedTypeElement(Collections.<Modifier> emptySet(), ElementKind.CLASS, new GeneratedPackageElement(packageName), name));
     }
-
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/AbstractCodeWriter.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/AbstractCodeWriter.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/java/transform/AbstractCodeWriter.java	Fri Oct 24 16:18:10 2014 +0200
@@ -518,12 +518,16 @@
             write(e.getBody());
             writeLn("}");
         } else {
-            writeLn("{ }");
+            writeLn(" {");
+            writeLn("}");
         }
         writeEmptyLn();
         return null;
     }
 
+    public void foo() {
+    }
+
     @Override
     public void visitTree(CodeTree e, Void p, Element enclosingElement) {
         CodeTreeKind kind = e.getCodeKind();
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/GuardExpression.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/GuardExpression.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/GuardExpression.java	Fri Oct 24 16:18:10 2014 +0200
@@ -110,7 +110,7 @@
         return Objects.hash(guardName, negated, resolvedGuard, resolvedChildren);
     }
 
-    public final boolean implies(GuardExpression other) {
+    public boolean implies(GuardExpression other) {
         if (equals(other)) {
             return true;
         }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MethodSpec.java
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MethodSpec.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/model/MethodSpec.java	Fri Oct 24 16:18:10 2014 +0200
@@ -209,7 +209,7 @@
         return toSignatureString("methodName");
     }
 
-    static class TypeDef {
+    static final class TypeDef {
 
         private final List<TypeMirror> types;
         private final String name;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLAssertionError.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLAssertionError.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLAssertionError.java	Fri Oct 24 16:18:10 2014 +0200
@@ -39,4 +39,4 @@
         return SLException.fillInSLStackTrace(this);
     }
 
-}
\ No newline at end of file
+}
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLRootNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -44,7 +44,7 @@
     /** The name of the function, for printing purposes only. */
     private final String name;
 
-    /** The Simple execution context for this tree **/
+    /** The Simple execution context for this tree. **/
     private final SLContext context;
 
     @CompilationFinal private boolean isCloningAllowed;
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java	Fri Oct 24 16:18:10 2014 +0200
@@ -89,8 +89,9 @@
     public Probe probe() {
         Node parent = getParent();
 
-        if (parent == null)
+        if (parent == null) {
             throw new IllegalStateException("Cannot probe a node without a parent");
+        }
 
         if (parent instanceof SLStatementWrapper) {
             return ((SLStatementWrapper) parent).getProbe();
@@ -108,8 +109,9 @@
     protected SLContext getRootNodeSLContext(Node node) {
         assert node != null;
 
-        if (node instanceof SLRootNode)
+        if (node instanceof SLRootNode) {
             return ((SLRootNode) node).getSLContext();
+        }
         return getRootNodeSLContext(node.getParent());
     }
 }
diff -r ab62800259ff -r c88ab4f1f04a graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLInstrumenter.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLInstrumenter.java	Thu Oct 23 17:20:10 2014 +0200
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLInstrumenter.java	Fri Oct 24 16:18:10 2014 +0200
@@ -54,8 +54,9 @@
                 Probe probe = expressionNode.probe();
                 // probe.tagAs(STATEMENT);
 
-                if (node instanceof SLWriteLocalVariableNode)
+                if (node instanceof SLWriteLocalVariableNode) {
                     probe.tagAs(ASSIGNMENT);
+                }
             }
         } else if (node instanceof SLStatementNode && node.getParent() != null) {
 
@@ -64,8 +65,9 @@
                 Probe probe = statementNode.probe();
                 probe.tagAs(STATEMENT);
 
-                if (node instanceof SLWhileNode)
+                if (node instanceof SLWhileNode) {
                     probe.tagAs(START_LOOP);
+                }
             }
         }
 
diff -r ab62800259ff -r c88ab4f1f04a mx/mx_graal.py
--- a/mx/mx_graal.py	Thu Oct 23 17:20:10 2014 +0200
+++ b/mx/mx_graal.py	Fri Oct 24 16:18:10 2014 +0200
@@ -1533,6 +1533,10 @@
         with Task('BuildJavaWithJavac', tasks):
             build(['-p', '--no-native', '--force-javac'])
 
+        with Task('Checkstyle', tasks) as t:
+            if mx.checkstyle([]) != 0:
+                t.abort('Checkstyle warnings were found')
+
         with Task('Checkheaders', tasks) as t:
             if checkheaders([]) != 0:
                 t.abort('Checkheaders warnings were found')
@@ -2271,7 +2275,7 @@
         if p.native:
             continue
 
-        csConfig = join(mx.project(p.checkstyleProj).dir, '.checkstyle_checks.xml.disabled')
+        csConfig = join(mx.project(p.checkstyleProj).dir, '.checkstyle_checks.xml')
         dom = xml.dom.minidom.parse(csConfig)
         for module in dom.getElementsByTagName('module'):
             if module.getAttribute('name') == 'RegexpHeader':
diff -r ab62800259ff -r c88ab4f1f04a mx/suite.py
--- a/mx/suite.py	Thu Oct 23 17:20:10 2014 +0200
+++ b/mx/suite.py	Fri Oct 24 16:18:10 2014 +0200
@@ -19,6 +19,15 @@
       "dependencies" : ["HAMCREST"],
     },
 
+    "CHECKSTYLE" : {
+      "path" : "lib/checkstyle-6.0-all.jar",
+      "urls" : [
+        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/checkstyle-6.0-all.jar",
+        "jar:http://sourceforge.net/projects/checkstyle/files/checkstyle/6.0/checkstyle-6.0-bin.zip/download!/checkstyle-6.0/checkstyle-6.0-all.jar",
+      ],
+      "sha1" : "2bedc7feded58b5fd65595323bfaf7b9bb6a3c7a",
+    },
+
     "HAMCREST" : {
       "path" : "lib/hamcrest-core-1.3.jar",
       "urls" : [
diff -r ab62800259ff -r c88ab4f1f04a mxtool/mx.py
--- a/mxtool/mx.py	Thu Oct 23 17:20:10 2014 +0200
+++ b/mxtool/mx.py	Fri Oct 24 16:18:10 2014 +0200
@@ -3146,9 +3146,10 @@
             continue
         sourceDirs = p.source_dirs()
 
-        csConfig = join(p.dir, '.checkstyle_checks.xml')
-        if not exists(csConfig):
-            abort('ERROR: Checkstyle configuration for project {} is missing: {}'.format(p.name, csConfig))
+        config = join(project(p.checkstyleProj).dir, '.checkstyle_checks.xml')
+        if not exists(config):
+            logv('[No Checkstyle configuration foudn for {0} - skipping]'.format(p))
+            continue
 
         # skip checking this Java project if its Java compliance level is "higher" than the configured JDK
         jdk = java(p.javaCompliance)
@@ -3174,26 +3175,7 @@
                     log('[all Java sources in {0} already checked - skipping]'.format(sourceDir))
                 continue
 
-            dotCheckstyleXML = xml.dom.minidom.parse(csConfig)
-            localCheckConfig = dotCheckstyleXML.getElementsByTagName('local-check-config')[0]
-            configLocation = localCheckConfig.getAttribute('location')
-            configType = localCheckConfig.getAttribute('type')
-            if configType == 'project':
-                # Eclipse plugin "Project Relative Configuration" format:
-                #
-                #  '/<project_name>/<suffix>'
-                #
-                if configLocation.startswith('/'):
-                    name, _, suffix = configLocation.lstrip('/').partition('/')
-                    config = join(project(name).dir, suffix)
-                else:
-                    config = join(p.dir, configLocation)
-            else:
-                logv('[unknown Checkstyle configuration type "' + configType + '" in {0} - skipping]'.format(sourceDir))
-                continue
-
             exclude = join(p.dir, '.checkstyle.exclude')
-
             if exists(exclude):
                 with open(exclude) as f:
                     # Convert patterns to OS separators