# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1359126341 -3600
# Node ID f701f2ce0f59a23588d75e84005b2d56aef3ff03
# Parent  223f645acb9b753a7a022c8eac668c5e172289b4# Parent  630ea5001e332bafd039dd05f4a6167e3b775238
Merge.

diff -r 223f645acb9b -r f701f2ce0f59 .hgignore
--- a/.hgignore	Fri Jan 25 16:05:11 2013 +0100
+++ b/.hgignore	Fri Jan 25 16:05:41 2013 +0100
@@ -20,6 +20,7 @@
 ~$
 .gdb_history
 \.csv$
+\.iml$
 \.swp$
 \.class$
 \.log$
@@ -59,6 +60,7 @@
 ^.hgtip
 .DS_Store
 javadoc/
+.idea/
 syntax: glob
 *.bgv
 core.*
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LinearScan.java	Fri Jan 25 16:05:41 2013 +0100
@@ -1894,8 +1894,7 @@
         Debug.dump(Arrays.copyOf(intervals, intervalsSize), label);
     }
 
-    void printLir(String label, @SuppressWarnings("unused")
-    boolean hirValid) {
+    void printLir(String label, @SuppressWarnings("unused") boolean hirValid) {
         Debug.dump(ir, label);
     }
 
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LineNumberTableImpl.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LineNumberTableImpl.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/debug/LineNumberTableImpl.java	Fri Jan 25 16:05:41 2013 +0100
@@ -45,8 +45,7 @@
     }
 
     @Override
-    public int getLineNumber(@SuppressWarnings("hiding")
-    int bci) {
+    public int getLineNumber(@SuppressWarnings("hiding") int bci) {
         for (int i = 0; i < this.bci.length - 1; i++) {
             if (this.bci[i] <= bci && bci < this.bci[i + 1]) {
                 return lineNumbers[i];
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMethodData.java	Fri Jan 25 16:05:41 2013 +0100
@@ -222,9 +222,7 @@
             return data.readUnsignedByte(position, config.dataLayoutFlagsOffset);
         }
 
-        protected int getDynamicSize(@SuppressWarnings("unused")
-        HotSpotMethodData data, @SuppressWarnings("unused")
-        int position) {
+        protected int getDynamicSize(@SuppressWarnings("unused") HotSpotMethodData data, @SuppressWarnings("unused") int position) {
             return 0;
         }
     }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/BeginLockScopeNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -63,6 +63,5 @@
     }
 
     @NodeIntrinsic
-    public static native Word beginLockScope(@ConstantNodeParameter
-    boolean eliminated);
+    public static native Word beginLockScope(@ConstantNodeParameter boolean eliminated);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -52,6 +52,5 @@
     }
 
     @NodeIntrinsic
-    public static native Word allocaDimsArray(@ConstantNodeParameter
-    int rank);
+    public static native Word allocaDimsArray(@ConstantNodeParameter int rank);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/InitializeArrayNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/InitializeArrayNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/InitializeArrayNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -85,8 +85,6 @@
     }
 
     @NodeIntrinsic
-    public static native Object initialize(Object memory, int length, int allocationSize, @ConstantNodeParameter
-    ResolvedJavaType type, @ConstantNodeParameter
-    boolean fillContents, @ConstantNodeParameter
-    boolean locked);
+    public static native Object initialize(Object memory, int length, int allocationSize, @ConstantNodeParameter ResolvedJavaType type, @ConstantNodeParameter boolean fillContents,
+                    @ConstantNodeParameter boolean locked);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java	Fri Jan 25 16:05:41 2013 +0100
@@ -70,6 +70,5 @@
     }
 
     @NodeIntrinsic
-    public static native Object call(Word hub, @ConstantNodeParameter
-    int rank, Word dims);
+    public static native Object call(Word hub, @ConstantNodeParameter int rank, Word dims);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/ArrayCopySnippets.java	Fri Jan 25 16:05:41 2013 +0100
@@ -80,8 +80,7 @@
     private static final Kind VECTOR_KIND = Kind.Long;
     private static final long VECTOR_SIZE = arrayIndexScale(Kind.Long);
 
-    public static void vectorizedCopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter("baseKind")
-    Kind baseKind) {
+    public static void vectorizedCopy(Object src, int srcPos, Object dest, int destPos, int length, @ConstantParameter("baseKind") Kind baseKind) {
         checkInputs(src, srcPos, dest, destPos, length);
         int header = arrayBaseOffset(baseKind);
         int elementSize = arrayIndexScale(baseKind);
@@ -90,7 +89,7 @@
         long srcOffset = (long) srcPos * elementSize;
         long destOffset = (long) destPos * elementSize;
         if (src == dest && srcPos < destPos) { // bad aliased case
-            probability(0.1);
+            probability(NOT_FREQUENT_PROBABILITY);
             for (long i = byteLength - elementSize; i >= byteLength - nonVectorBytes; i -= elementSize) {
                 UnsafeStoreNode.store(dest, header, i + destOffset, UnsafeLoadNode.load(src, header, i + srcOffset, baseKind), baseKind);
             }
@@ -112,37 +111,37 @@
 
     public static void checkInputs(Object src, int srcPos, Object dest, int destPos, int length) {
         if (src == null) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkNPECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (dest == null) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkNPECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (srcPos < 0) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkAIOOBECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (destPos < 0) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkAIOOBECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (length < 0) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkAIOOBECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (srcPos + length > ArrayLengthNode.arrayLength(src)) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkAIOOBECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
         if (destPos + length > ArrayLengthNode.arrayLength(dest)) {
-            probability(0.01);
+            probability(DEOPT_PATH_PROBABILITY);
             checkAIOOBECounter.inc();
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/CheckCastSnippets.java	Fri Jan 25 16:05:41 2013 +0100
@@ -75,12 +75,12 @@
                     @Parameter("exactHub") Word exactHub,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.1);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
         } else {
             Word objectHub = loadHub(object);
             if (objectHub != exactHub) {
-                probability(0.01);
+                probability(DEOPT_PATH_PROBABILITY);
                 exactMiss.inc();
                 //bkpt(object, exactHub, objectHub);
                 DeoptimizeNode.deopt(InvalidateReprofile, ClassCastException);
@@ -104,12 +104,12 @@
                     @ConstantParameter("checkNull") boolean checkNull,
                     @ConstantParameter("superCheckOffset") int superCheckOffset) {
         if (checkNull && object == null) {
-            probability(0.1);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
         } else {
             Word objectHub = loadHub(object);
             if (objectHub.readWord(superCheckOffset) != hub) {
-                probability(0.1);
+                probability(DEOPT_PATH_PROBABILITY);
                 displayMiss.inc();
                 DeoptimizeNode.deopt(InvalidateReprofile, ClassCastException);
             }
@@ -128,7 +128,7 @@
                     @VarargsParameter("hints") Word[] hints,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.1);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
         } else {
             Word objectHub = loadHub(object);
@@ -158,7 +158,7 @@
                     @Parameter("object") Object object,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.1);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
         } else {
             Word objectHub = loadHub(object);
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/HotSpotSnippetUtils.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/HotSpotSnippetUtils.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/HotSpotSnippetUtils.java	Fri Jan 25 16:05:41 2013 +0100
@@ -294,17 +294,13 @@
     }
 
     @NodeIntrinsic(value = RegisterNode.class, setStampFromReturnType = true)
-    public static native Word registerAsWord(@ConstantNodeParameter
-    Register register);
+    public static native Word registerAsWord(@ConstantNodeParameter Register register);
 
     @NodeIntrinsic(value = UnsafeLoadNode.class, setStampFromReturnType = true)
-    private static native Word loadWordFromObjectIntrinsic(Object object, @ConstantNodeParameter
-    int displacement, long offset, @ConstantNodeParameter
-    Kind wordKind);
+    private static native Word loadWordFromObjectIntrinsic(Object object, @ConstantNodeParameter int displacement, long offset, @ConstantNodeParameter Kind wordKind);
 
     @NodeIntrinsic(value = LoadHubNode.class, setStampFromReturnType = true)
-    static native Word loadHubIntrinsic(Object object, @ConstantNodeParameter
-    Kind word);
+    static native Word loadHubIntrinsic(Object object, @ConstantNodeParameter Kind word);
 
     @Fold
     public static int log2WordSize() {
@@ -463,10 +459,10 @@
         // this code is independent from biased locking (although it does not look that way)
         final Word biasedLock = mark.and(biasedLockMaskInPlace());
         if (biasedLock == Word.unsigned(unlockedMask())) {
-            probability(0.99);
+            probability(FAST_PATH_PROBABILITY);
             int hash = (int) mark.unsignedShiftRight(identityHashCodeShift()).rawValue();
             if (hash != uninitializedIdentityHashCodeValue()) {
-                probability(0.99);
+                probability(FAST_PATH_PROBABILITY);
                 return hash;
             }
         }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/InstanceOfSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/InstanceOfSnippets.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/InstanceOfSnippets.java	Fri Jan 25 16:05:41 2013 +0100
@@ -68,13 +68,13 @@
                     @Parameter("falseValue") Object falseValue,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.01);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
             return falseValue;
         }
         Word objectHub = loadHub(object);
         if (objectHub != exactHub) {
-            probability(0.75);
+            probability(LIKELY_PROBABILITY);
             exactMiss.inc();
             return falseValue;
         }
@@ -94,13 +94,13 @@
                     @ConstantParameter("checkNull") boolean checkNull,
                     @ConstantParameter("superCheckOffset") int superCheckOffset) {
         if (checkNull && object == null) {
-            probability(0.01);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
             return falseValue;
         }
         Word objectHub = loadHub(object);
         if (objectHub.readWord(superCheckOffset) != hub) {
-            probability(0.45);
+            probability(NOT_LIKELY_PROBABILITY);
             displayMiss.inc();
             return falseValue;
         }
@@ -120,7 +120,7 @@
                     @VarargsParameter("hints") Word[] hints,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.01);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
             return falseValue;
         }
@@ -130,7 +130,7 @@
         for (int i = 0; i < hints.length; i++) {
             Word hintHub = hints[i];
             if (hintHub == objectHub) {
-                probability(0.01);
+                probability(NOT_FREQUENT_PROBABILITY);
                 hintsHit.inc();
                 return trueValue;
             }
@@ -152,7 +152,7 @@
                     @Parameter("falseValue") Object falseValue,
                     @ConstantParameter("checkNull") boolean checkNull) {
         if (checkNull && object == null) {
-            probability(0.01);
+            probability(NOT_FREQUENT_PROBABILITY);
             isNull.inc();
             return falseValue;
         }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/MonitorSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/MonitorSnippets.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/MonitorSnippets.java	Fri Jan 25 16:05:41 2013 +0100
@@ -76,10 +76,7 @@
     public static final boolean CHECK_BALANCED_MONITORS = Boolean.getBoolean("graal.monitors.checkBalanced");
 
     @Snippet
-    public static void monitorenter(@Parameter("object")
-    Object object, @ConstantParameter("checkNull")
-    boolean checkNull, @ConstantParameter("trace")
-    boolean trace) {
+    public static void monitorenter(@Parameter("object") Object object, @ConstantParameter("checkNull") boolean checkNull, @ConstantParameter("trace") boolean trace) {
         verifyOop(object);
 
         if (checkNull && object == null) {
@@ -108,7 +105,7 @@
             if (biasableLockBits != Word.unsigned(biasedLockPattern())) {
                 // Biasing not enabled -> fall through to lightweight locking
             } else {
-                probability(0.75);
+                probability(FREQUENT_PROBABILITY);
                 // The bias pattern is present in the object's mark word. Need to check
                 // whether the bias owner and the epoch are both still current.
                 Word hub = loadHub(object);
@@ -120,7 +117,7 @@
                 trace(trace, "              tmp: 0x%016lx\n", tmp);
                 if (tmp == Word.zero()) {
                     // Object is already biased to current thread -> done
-                    probability(0.75);
+                    probability(FREQUENT_PROBABILITY);
                     traceObject(trace, "+lock{bias:existing}", object);
                     return;
                 }
@@ -135,7 +132,7 @@
                 // the prototype header is no longer biasable and we have to revoke
                 // the bias on this object.
                 if (tmp.and(biasedLockMaskInPlace()) == Word.zero()) {
-                    probability(0.75);
+                    probability(FREQUENT_PROBABILITY);
                     // Biasing is still enabled for object's type. See whether the
                     // epoch of the current bias is still valid, meaning that the epoch
                     // bits of the mark word are equal to the epoch bits of the
@@ -146,7 +143,7 @@
                     // otherwise the manipulations it performs on the mark word are
                     // illegal.
                     if (tmp.and(epochMaskInPlace()) == Word.zero()) {
-                        probability(0.75);
+                        probability(FREQUENT_PROBABILITY);
                         // The epoch of the current bias is still valid but we know nothing
                         // about the owner; it might be set or it might be clear. Try to
                         // acquire the bias of the object using an atomic operation. If this
@@ -165,7 +162,7 @@
                         // If the biasing toward our thread failed, this means that another thread
                         // owns the bias and we need to revoke that bias. The revocation will occur
                         // in the interpreter runtime.
-                        probability(0.0001);
+                        probability(DEOPT_PATH_PROBABILITY);
                         traceObject(trace, "+lock{stub:revoke}", object);
                         MonitorEnterStubCall.call(object, lock);
                         return;
@@ -186,7 +183,7 @@
                         // If the biasing toward our thread failed, then another thread
                         // succeeded in biasing it toward itself and we need to revoke that
                         // bias. The revocation will occur in the runtime in the slow case.
-                        probability(0.0001);
+                        probability(DEOPT_PATH_PROBABILITY);
                         traceObject(trace, "+lock{stub:epoch-expired}", object);
                         MonitorEnterStubCall.call(object, lock);
                         return;
@@ -244,7 +241,7 @@
             final Word stackPointer = stackPointer();
             if (currentMark.subtract(stackPointer).and(alignedMask.subtract(pageSize())) != Word.zero()) {
                 // Most likely not a recursive lock, go into a slow runtime call
-                probability(0.001);
+                probability(DEOPT_PATH_PROBABILITY);
                 traceObject(trace, "+lock{stub:failed-cas}", object);
                 MonitorEnterStubCall.call(object, lock);
                 return;
@@ -268,10 +265,7 @@
      * Calls straight out to the monitorenter stub.
      */
     @Snippet
-    public static void monitorenterStub(@Parameter("object")
-    Object object, @ConstantParameter("checkNull")
-    boolean checkNull, @ConstantParameter("trace")
-    boolean trace) {
+    public static void monitorenterStub(@Parameter("object") Object object, @ConstantParameter("checkNull") boolean checkNull, @ConstantParameter("trace") boolean trace) {
         verifyOop(object);
         incCounter();
         if (checkNull && object == null) {
@@ -285,9 +279,7 @@
     }
 
     @Snippet
-    public static void monitorexit(@Parameter("object")
-    Object object, @ConstantParameter("trace")
-    boolean trace) {
+    public static void monitorexit(@Parameter("object") Object object, @ConstantParameter("trace") boolean trace) {
         trace(trace, "           object: 0x%016lx\n", Word.fromObject(object));
         if (useBiasedLocking()) {
             // Check for biased locking unlock case, which is a no-op
@@ -299,7 +291,7 @@
             final Word mark = loadWordFromObject(object, markOffset());
             trace(trace, "             mark: 0x%016lx\n", mark);
             if (mark.and(biasedLockMaskInPlace()) == Word.unsigned(biasedLockPattern())) {
-                probability(0.75);
+                probability(FREQUENT_PROBABILITY);
                 endLockScope();
                 decCounter();
                 traceObject(trace, "-lock{bias}", object);
@@ -324,7 +316,7 @@
             if (DirectCompareAndSwapNode.compareAndSwap(object, markOffset(), lock, displacedMark) != lock) {
                 // The object's mark word was not pointing to the displaced header,
                 // we do unlocking via runtime call.
-                probability(0.001);
+                probability(DEOPT_PATH_PROBABILITY);
                 traceObject(trace, "-lock{stub}", object);
                 MonitorExitStubCall.call(object);
             } else {
@@ -339,9 +331,7 @@
      * Calls straight out to the monitorexit stub.
      */
     @Snippet
-    public static void monitorexitStub(@Parameter("object")
-    Object object, @ConstantParameter("trace")
-    boolean trace) {
+    public static void monitorexitStub(@Parameter("object") Object object, @ConstantParameter("trace") boolean trace) {
         verifyOop(object);
         traceObject(trace, "-lock{stub}", object);
         MonitorExitStubCall.call(object);
@@ -434,8 +424,7 @@
             this.useFastLocking = useFastLocking;
         }
 
-        public void lower(MonitorEnterNode monitorenterNode, @SuppressWarnings("unused")
-        LoweringTool tool) {
+        public void lower(MonitorEnterNode monitorenterNode, @SuppressWarnings("unused") LoweringTool tool) {
             StructuredGraph graph = (StructuredGraph) monitorenterNode.graph();
 
             checkBalancedMonitors(graph);
@@ -466,8 +455,7 @@
             }
         }
 
-        public void lower(MonitorExitNode monitorexitNode, @SuppressWarnings("unused")
-        LoweringTool tool) {
+        public void lower(MonitorExitNode monitorexitNode, @SuppressWarnings("unused") LoweringTool tool) {
             StructuredGraph graph = (StructuredGraph) monitorexitNode.graph();
             FrameState stateAfter = monitorexitNode.stateAfter();
             boolean eliminated = monitorexitNode.eliminated();
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/NewObjectSnippets.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/NewObjectSnippets.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/NewObjectSnippets.java	Fri Jan 25 16:05:41 2013 +0100
@@ -67,7 +67,7 @@
         Word newTop = top.add(size);
         // this check might lead to problems if the TLAB is within 16GB of the address space end (checked in c++ code)
         if (newTop.belowOrEqual(end)) {
-            probability(0.99);
+            probability(FAST_PATH_PROBABILITY);
             thread.writeWord(threadTlabTopOffset(), newTop);
             return top;
         }
@@ -88,7 +88,7 @@
             new_stub.inc();
             result = NewInstanceStubCall.call(hub);
         } else {
-            probability(0.99);
+            probability(FAST_PATH_PROBABILITY);
             if (locked) {
                 formatObject(hub, size, memory, thread().or(biasedLockPattern()), fillContents);
             } else {
@@ -122,7 +122,7 @@
             newarray_stub.inc();
             result = NewArrayStubCall.call(hub, length);
         } else {
-            probability(0.99);
+            probability(FAST_PATH_PROBABILITY);
             newarray_loopInit.inc();
             formatArray(hub, allocationSize, length, headerSize, memory, prototypeMarkWord, fillContents);
             result = memory.toObject();
@@ -143,10 +143,10 @@
                     @ConstantParameter("log2ElementSize") int log2ElementSize,
                     @ConstantParameter("type") ResolvedJavaType type) {
         if (!belowThan(length, MAX_ARRAY_FAST_PATH_ALLOCATION_LENGTH)) {
+            probability(DEOPT_PATH_PROBABILITY);
             // This handles both negative array sizes and very large array sizes
             DeoptimizeNode.deopt(DeoptimizationAction.None, DeoptimizationReason.RuntimeConstraint);
         }
-        probability(0.99);
         int allocationSize = computeArrayAllocationSize(length, alignment, headerSize, log2ElementSize);
         Word memory = TLABAllocateNode.allocateVariableSize(allocationSize);
         return InitializeArrayNode.initialize(memory, length, allocationSize, type, true, false);
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/SystemSubstitutions.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/SystemSubstitutions.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/SystemSubstitutions.java	Fri Jan 25 16:05:41 2013 +0100
@@ -58,7 +58,7 @@
     @MethodSubstitution
     public static int identityHashCode(Object x) {
         if (x == null) {
-            probability(0.01);
+            probability(NOT_FREQUENT_PROBABILITY);
             return 0;
         }
 
@@ -66,6 +66,5 @@
     }
 
     @NodeIntrinsic(value = RuntimeCallNode.class, setStampFromReturnType = true)
-    public static native long callLong(@ConstantNodeParameter
-    Descriptor descriptor);
+    public static native long callLong(@ConstantNodeParameter Descriptor descriptor);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/TypeCheckSnippetUtils.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/TypeCheckSnippetUtils.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/snippets/TypeCheckSnippetUtils.java	Fri Jan 25 16:05:41 2013 +0100
@@ -85,7 +85,7 @@
         int length = secondarySupers.readInt(metaspaceArrayLengthOffset());
         for (int i = 0; i < length; i++) {
             if (t == loadWordElement(secondarySupers, i)) {
-                probability(0.01);
+                probability(NOT_LIKELY_PROBABILITY);
                 s.writeWord(secondarySuperCacheOffset(), t);
                 secondariesHit.inc();
                 return true;
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java	Fri Jan 25 16:05:41 2013 +0100
@@ -66,11 +66,7 @@
      * @param log specifies if logging is enabled
      */
     @Snippet
-    private static Object newArray(@Parameter("hub")
-    Word hub, @Parameter("length")
-    int length, @ConstantParameter("intArrayHub")
-    Word intArrayHub, @ConstantParameter("log")
-    boolean log) {
+    private static Object newArray(@Parameter("hub") Word hub, @Parameter("length") int length, @ConstantParameter("intArrayHub") Word intArrayHub, @ConstantParameter("log") boolean log) {
         int layoutHelper = hub.readInt(layoutHelperOffset());
         int log2ElementSize = (layoutHelper >> layoutHelperLog2ElementSizeShift()) & layoutHelperLog2ElementSizeMask();
         int headerSize = (layoutHelper >> layoutHelperHeaderSizeShift()) & layoutHelperHeaderSizeMask();
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java	Fri Jan 25 16:05:41 2013 +0100
@@ -66,10 +66,7 @@
      * @param intArrayHub the hub for {@code int[].class}
      */
     @Snippet
-    private static Object newInstance(@Parameter("hub")
-    Word hub, @ConstantParameter("intArrayHub")
-    Word intArrayHub, @ConstantParameter("log")
-    boolean log) {
+    private static Object newInstance(@Parameter("hub") Word hub, @ConstantParameter("intArrayHub") Word intArrayHub, @ConstantParameter("log") boolean log) {
         int sizeInBytes = hub.readInt(klassInstanceSizeOffset());
         if (!forceSlowPath() && inlineContiguousAllocationSupported()) {
             if (hub.readInt(klassStateOffset()) == klassStateFullyInitialized()) {
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -73,7 +73,5 @@
     }
 
     @NodeIntrinsic
-    public static native void deopt(@ConstantNodeParameter
-    DeoptimizationAction action, @ConstantNodeParameter
-    DeoptimizationReason reason);
+    public static native void deopt(@ConstantNodeParameter DeoptimizationAction action, @ConstantNodeParameter DeoptimizationReason reason);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MaterializeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MaterializeNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MaterializeNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -54,12 +54,10 @@
     }
 
     @NodeIntrinsic
-    public static native boolean materialize(@ConstantNodeParameter
-    Condition condition, int x, int y);
+    public static native boolean materialize(@ConstantNodeParameter Condition condition, int x, int y);
 
     @NodeIntrinsic
-    public static native boolean materialize(@ConstantNodeParameter
-    Condition condition, long x, long y);
+    public static native boolean materialize(@ConstantNodeParameter Condition condition, long x, long y);
 
     @NodeIntrinsic
     public static native boolean isInstance(Class mirror, Object object);
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConvertNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -150,6 +150,5 @@
     }
 
     @NodeIntrinsic
-    public static native <S, T> S convert(@ConstantNodeParameter
-    Op op, T value);
+    public static native <S, T> S convert(@ConstantNodeParameter Op op, T value);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -48,6 +48,5 @@
     }
 
     @NodeIntrinsic
-    public static native void memoryBarrier(@ConstantNodeParameter
-    int barriers);
+    public static native void memoryBarrier(@ConstantNodeParameter int barriers);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -130,8 +130,5 @@
      * @return the value read from memory
      */
     @NodeIntrinsic(setStampFromReturnType = true)
-    public static native <T> T read(Object base, @ConstantNodeParameter
-    int displacement, @ConstantNodeParameter
-    Object locationIdentity, @ConstantNodeParameter
-    Kind kind);
+    public static native <T> T read(Object base, @ConstantNodeParameter int displacement, @ConstantNodeParameter Object locationIdentity, @ConstantNodeParameter Kind kind);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeArrayCastNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeArrayCastNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeArrayCastNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -51,6 +51,5 @@
     }
 
     @NodeIntrinsic
-    public static native <T> T unsafeArrayCast(Object object, int length, @ConstantNodeParameter
-    Stamp stamp);
+    public static native <T> T unsafeArrayCast(Object object, int length, @ConstantNodeParameter Stamp stamp);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -104,12 +104,8 @@
     }
 
     @NodeIntrinsic
-    public static native <T> T unsafeCast(Object object, @ConstantNodeParameter
-    Stamp stamp);
+    public static native <T> T unsafeCast(Object object, @ConstantNodeParameter Stamp stamp);
 
     @NodeIntrinsic
-    public static native <T> T unsafeCast(Object object, @ConstantNodeParameter
-    Class<T> toType, @ConstantNodeParameter
-    boolean exactType, @ConstantNodeParameter
-    boolean nonNull);
+    public static native <T> T unsafeCast(Object object, @ConstantNodeParameter Class<T> toType, @ConstantNodeParameter boolean exactType, @ConstantNodeParameter boolean nonNull);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeLoadNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -94,7 +94,5 @@
     }
 
     @NodeIntrinsic
-    public static native <T> T load(Object object, @ConstantNodeParameter
-    int displacement, long offset, @ConstantNodeParameter
-    Kind kind);
+    public static native <T> T load(Object object, @ConstantNodeParameter int displacement, long offset, @ConstantNodeParameter Kind kind);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -115,48 +115,30 @@
 
     // specialized on value type until boxing/unboxing is sorted out in intrinsification
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, Object value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, Object value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, boolean value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, boolean value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, byte value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, byte value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, char value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, char value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, double value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, double value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, float value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, float value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, int value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, int value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, long value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, long value, @ConstantNodeParameter Kind kind);
 
     @NodeIntrinsic
-    public static native void store(Object object, @ConstantNodeParameter
-    int displacement, long offset, short value, @ConstantNodeParameter
-    Kind kind);
+    public static native void store(Object object, @ConstantNodeParameter int displacement, long offset, short value, @ConstantNodeParameter Kind kind);
 
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/CompareAndSwapNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -82,14 +82,11 @@
 
     // specialized on value type until boxing/unboxing is sorted out in intrinsification
     @NodeIntrinsic
-    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter
-    int displacement, long offset, Object expected, Object newValue);
+    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter int displacement, long offset, Object expected, Object newValue);
 
     @NodeIntrinsic
-    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter
-    int displacement, long offset, long expected, long newValue);
+    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter int displacement, long offset, long expected, long newValue);
 
     @NodeIntrinsic
-    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter
-    int displacement, long offset, int expected, int newValue);
+    public static native boolean compareAndSwap(Object object, @ConstantNodeParameter int displacement, long offset, int expected, int newValue);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -54,8 +54,7 @@
 
     public abstract String fieldName(int i);
 
-    public void materializeAt(@SuppressWarnings("unused")
-    FixedNode fixed) {
+    public void materializeAt(@SuppressWarnings("unused") FixedNode fixed) {
         // nothing to do in here - this method allows subclasses to respond to materialization
     }
 
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Util.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Util.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/Util.java	Fri Jan 25 16:05:41 2013 +0100
@@ -56,8 +56,7 @@
      * Statically cast an object to an arbitrary Object type. Dynamically checked.
      */
     @SuppressWarnings("unchecked")
-    public static <T> T uncheckedCast(@SuppressWarnings("unused")
-    Class<T> type, Object object) {
+    public static <T> T uncheckedCast(@SuppressWarnings("unused") Class<T> type, Object object) {
         return (T) object;
     }
 
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Log.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Log.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/Log.java	Fri Jan 25 16:05:41 2013 +0100
@@ -48,16 +48,13 @@
     private static final int LOG_OBJECT_ADDRESS = 0x04;
 
     @NodeIntrinsic(RuntimeCallNode.class)
-    private static native void log(@ConstantNodeParameter
-    Descriptor logObject, Object object, int flags);
+    private static native void log(@ConstantNodeParameter Descriptor logObject, Object object, int flags);
 
     @NodeIntrinsic(RuntimeCallNode.class)
-    private static native void log(@ConstantNodeParameter
-    Descriptor logPrimitive, int typeChar, long value, boolean newline);
+    private static native void log(@ConstantNodeParameter Descriptor logPrimitive, int typeChar, long value, boolean newline);
 
     @NodeIntrinsic(RuntimeCallNode.class)
-    private static native void printf(@ConstantNodeParameter
-    Descriptor logPrintf, String format, long v1, long v2, long v3);
+    private static native void printf(@ConstantNodeParameter Descriptor logPrintf, String format, long v1, long v2, long v3);
 
     public static void print(boolean value) {
         log(LOG_PRIMITIVE, Kind.Boolean.getTypeChar(), value ? 1L : 0L, false);
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/MathSubstitutionsX86.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/MathSubstitutionsX86.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/MathSubstitutionsX86.java	Fri Jan 25 16:05:41 2013 +0100
@@ -96,6 +96,5 @@
     public static final Descriptor ARITHMETIC_TAN = new Descriptor("arithmeticTan", false, double.class, double.class);
 
     @NodeIntrinsic(value = RuntimeCallNode.class, setStampFromReturnType = true)
-    public static native double callDouble(@ConstantNodeParameter
-    Descriptor descriptor, double value);
+    public static native double callDouble(@ConstantNodeParameter Descriptor descriptor, double value);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsafeSubstitutions.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsafeSubstitutions.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsafeSubstitutions.java	Fri Jan 25 16:05:41 2013 +0100
@@ -36,26 +36,22 @@
 public class UnsafeSubstitutions {
 
     @MethodSubstitution(isStatic = false)
-    public static boolean compareAndSwapObject(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, Object expected, Object x) {
+    public static boolean compareAndSwapObject(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, Object expected, Object x) {
         return CompareAndSwapNode.compareAndSwap(o, 0, offset, expected, x);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static boolean compareAndSwapInt(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, int expected, int x) {
+    public static boolean compareAndSwapInt(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, int expected, int x) {
         return CompareAndSwapNode.compareAndSwap(o, 0, offset, expected, x);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static boolean compareAndSwapLong(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, long expected, long x) {
+    public static boolean compareAndSwapLong(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, long expected, long x) {
         return CompareAndSwapNode.compareAndSwap(o, 0, offset, expected, x);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static Object getObject(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static Object getObject(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         return UnsafeLoadNode.load(o, 0, offset, Kind.Object);
     }
 
@@ -68,8 +64,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putObject(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, Object x) {
+    public static void putObject(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, Object x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Object);
     }
 
@@ -88,8 +83,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static int getInt(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static int getInt(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         Integer value = UnsafeLoadNode.load(o, 0, offset, Kind.Int);
         return value;
     }
@@ -103,8 +97,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putInt(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, int x) {
+    public static void putInt(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, int x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Int);
     }
 
@@ -123,8 +116,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static boolean getBoolean(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static boolean getBoolean(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Boolean result = UnsafeLoadNode.load(o, 0, offset, Kind.Boolean);
         return result;
@@ -139,8 +131,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putBoolean(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, boolean x) {
+    public static void putBoolean(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, boolean x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Boolean);
     }
 
@@ -152,8 +143,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static byte getByte(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static byte getByte(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Byte result = UnsafeLoadNode.load(o, 0, offset, Kind.Byte);
         return result;
@@ -168,8 +158,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putByte(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, byte x) {
+    public static void putByte(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, byte x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Byte);
     }
 
@@ -181,8 +170,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static short getShort(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static short getShort(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Short result = UnsafeLoadNode.load(o, 0, offset, Kind.Short);
         return result;
@@ -197,8 +185,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putShort(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, short x) {
+    public static void putShort(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, short x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Short);
     }
 
@@ -210,8 +197,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static char getChar(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static char getChar(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Character result = UnsafeLoadNode.load(o, 0, offset, Kind.Char);
         return result;
@@ -226,8 +212,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putChar(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, char x) {
+    public static void putChar(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, char x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Char);
     }
 
@@ -239,8 +224,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static long getLong(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static long getLong(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Long result = UnsafeLoadNode.load(o, 0, offset, Kind.Long);
         return result;
@@ -255,8 +239,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putLong(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, long x) {
+    public static void putLong(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, long x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Long);
     }
 
@@ -275,8 +258,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static float getFloat(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static float getFloat(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Float result = UnsafeLoadNode.load(o, 0, offset, Kind.Float);
         return result;
@@ -291,8 +273,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putFloat(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, float x) {
+    public static void putFloat(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, float x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Float);
     }
 
@@ -304,8 +285,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static double getDouble(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset) {
+    public static double getDouble(@SuppressWarnings("unused") final Object thisObj, Object o, long offset) {
         @JavacBug(id = 6995200)
         Double result = UnsafeLoadNode.load(o, 0, offset, Kind.Double);
         return result;
@@ -320,8 +300,7 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putDouble(@SuppressWarnings("unused")
-    final Object thisObj, Object o, long offset, double x) {
+    public static void putDouble(@SuppressWarnings("unused") final Object thisObj, Object o, long offset, double x) {
         UnsafeStoreNode.store(o, 0, offset, x, Kind.Double);
     }
 
@@ -333,86 +312,72 @@
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putByte(@SuppressWarnings("unused")
-    final Object thisObj, long address, byte value) {
+    public static void putByte(@SuppressWarnings("unused") final Object thisObj, long address, byte value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putShort(@SuppressWarnings("unused")
-    final Object thisObj, long address, short value) {
+    public static void putShort(@SuppressWarnings("unused") final Object thisObj, long address, short value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putChar(@SuppressWarnings("unused")
-    final Object thisObj, long address, char value) {
+    public static void putChar(@SuppressWarnings("unused") final Object thisObj, long address, char value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putInt(@SuppressWarnings("unused")
-    final Object thisObj, long address, int value) {
+    public static void putInt(@SuppressWarnings("unused") final Object thisObj, long address, int value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putLong(@SuppressWarnings("unused")
-    final Object thisObj, long address, long value) {
+    public static void putLong(@SuppressWarnings("unused") final Object thisObj, long address, long value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putFloat(@SuppressWarnings("unused")
-    final Object thisObj, long address, float value) {
+    public static void putFloat(@SuppressWarnings("unused") final Object thisObj, long address, float value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static void putDouble(@SuppressWarnings("unused")
-    final Object thisObj, long address, double value) {
+    public static void putDouble(@SuppressWarnings("unused") final Object thisObj, long address, double value) {
         DirectStoreNode.store(address, value);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static byte getByte(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static byte getByte(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Byte);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static short getShort(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static short getShort(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Short);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static char getChar(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static char getChar(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Char);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static int getInt(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static int getInt(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Int);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static long getLong(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static long getLong(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Long);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static float getFloat(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static float getFloat(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Float);
     }
 
     @MethodSubstitution(isStatic = false)
-    public static double getDouble(@SuppressWarnings("unused")
-    final Object thisObj, long address) {
+    public static double getDouble(@SuppressWarnings("unused") final Object thisObj, long address) {
         return DirectReadNode.read(address, Kind.Double);
     }
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsignedMathSubstitutions.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsignedMathSubstitutions.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/UnsignedMathSubstitutions.java	Fri Jan 25 16:05:41 2013 +0100
@@ -127,18 +127,14 @@
     }
 
     @NodeIntrinsic(UnsignedDivNode.class)
-    private static native int unsignedDivide(@ConstantNodeParameter
-    Kind kind, int a, int b);
+    private static native int unsignedDivide(@ConstantNodeParameter Kind kind, int a, int b);
 
     @NodeIntrinsic(UnsignedDivNode.class)
-    private static native long unsignedDivide(@ConstantNodeParameter
-    Kind kind, long a, long b);
+    private static native long unsignedDivide(@ConstantNodeParameter Kind kind, long a, long b);
 
     @NodeIntrinsic(UnsignedRemNode.class)
-    private static native int unsignedRemainder(@ConstantNodeParameter
-    Kind kind, int a, int b);
+    private static native int unsignedRemainder(@ConstantNodeParameter Kind kind, int a, int b);
 
     @NodeIntrinsic(UnsignedRemNode.class)
-    private static native long unsignedRemainder(@ConstantNodeParameter
-    Kind kind, long a, long b);
+    private static native long unsignedRemainder(@ConstantNodeParameter Kind kind, long a, long b);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/BranchProbabilityNode.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/BranchProbabilityNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/BranchProbabilityNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -34,6 +34,18 @@
  */
 public class BranchProbabilityNode extends FixedWithNextNode implements Simplifiable {
 
+    public static final double LIKELY_PROBABILITY = 0.6;
+    public static final double NOT_LIKELY_PROBABILITY = 1 - LIKELY_PROBABILITY;
+
+    public static final double FREQUENT_PROBABILITY = 0.9;
+    public static final double NOT_FREQUENT_PROBABILITY = 1 - FREQUENT_PROBABILITY;
+
+    public static final double FAST_PATH_PROBABILITY = 0.99;
+    public static final double SLOW_PATH_PROBABILITY = 1 - FAST_PATH_PROBABILITY;
+
+    public static final double NOT_DEOPT_PATH_PROBABILITY = 0.999;
+    public static final double DEOPT_PATH_PROBABILITY = 1 - NOT_DEOPT_PATH_PROBABILITY;
+
     private final double probability;
 
     public BranchProbabilityNode(double probability) {
@@ -64,7 +76,6 @@
     }
 
     @NodeIntrinsic
-    public static native void probability(@ConstantNodeParameter
-    double probability);
+    public static native void probability(@ConstantNodeParameter double probability);
 
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectObjectStoreNode.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectObjectStoreNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectObjectStoreNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -48,20 +48,16 @@
     }
 
     @NodeIntrinsic
-    public static native void storeObject(Object obj, @ConstantNodeParameter
-    int displacement, long offset, Object value);
+    public static native void storeObject(Object obj, @ConstantNodeParameter int displacement, long offset, Object value);
 
     @NodeIntrinsic
-    public static native void storeLong(Object obj, @ConstantNodeParameter
-    int displacement, long offset, long value);
+    public static native void storeLong(Object obj, @ConstantNodeParameter int displacement, long offset, long value);
 
     @NodeIntrinsic
-    public static native void storeWord(Object obj, @ConstantNodeParameter
-    int displacement, long offset, Word value);
+    public static native void storeWord(Object obj, @ConstantNodeParameter int displacement, long offset, Word value);
 
     @NodeIntrinsic
-    public static native void storeInt(Object obj, @ConstantNodeParameter
-    int displacement, long offset, int value);
+    public static native void storeInt(Object obj, @ConstantNodeParameter int displacement, long offset, int value);
 
     @Override
     public void lower(LoweringTool tool) {
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectReadNode.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectReadNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/DirectReadNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -50,6 +50,5 @@
     }
 
     @NodeIntrinsic
-    public static native <T> T read(long address, @ConstantNodeParameter
-    Kind kind);
+    public static native <T> T read(long address, @ConstantNodeParameter Kind kind);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java
--- a/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/nodes/MathIntrinsicNode.java	Fri Jan 25 16:05:41 2013 +0100
@@ -113,6 +113,5 @@
     }
 
     @NodeIntrinsic
-    public static native double compute(double x, @ConstantNodeParameter
-    Operation op);
+    public static native double compute(double x, @ConstantNodeParameter Operation op);
 }
diff -r 223f645acb9b -r f701f2ce0f59 graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLTypes.java
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLTypes.java	Fri Jan 25 16:05:11 2013 +0100
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/SLTypes.java	Fri Jan 25 16:05:41 2013 +0100
@@ -66,8 +66,7 @@
     }
 
     @TypeCheck
-    public boolean isBigInteger(@SuppressWarnings("unused")
-    int value) {
+    public boolean isBigInteger(@SuppressWarnings("unused") int value) {
         return true;
     }
 }
diff -r 223f645acb9b -r f701f2ce0f59 mx/eclipse-settings/org.eclipse.jdt.core.prefs
--- a/mx/eclipse-settings/org.eclipse.jdt.core.prefs	Fri Jan 25 16:05:11 2013 +0100
+++ b/mx/eclipse-settings/org.eclipse.jdt.core.prefs	Fri Jan 25 16:05:41 2013 +0100
@@ -218,7 +218,7 @@
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert