--- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/ComputeBlockOrder.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/ComputeBlockOrder.java	Wed Jan 23 16:34:57 2013 +0100
@@ -28,20 +28,24 @@
 import com.oracle.graal.nodes.cfg.*;
 
 /**
- * Computes an ordering of the block that can be used by the linear scan register allocator and the machine code
- * generator. The machine code generation order will start with the first block and produce a straight sequence
- * always following the most likely successor. Then it will continue with the most likely path that was left out during
- * this process. The process iteratively continues until all blocks are scheduled. Additionally, it is guaranteed that
- * all blocks of a loop are scheduled before any block following the loop is scheduled.
- *
- * The machine code generator order includes reordering of loop headers such that the backward jump is a conditional jump if there
- * is only one loop end block. Additionally, the target of loop backward jumps are always marked as aligned. Aligning the target of conditional
- * jumps does not bring a measurable benefit and is therefore avoided to keep the code size small.
- *
- * The linear scan register allocator order has an additional mechanism that prevents merge nodes from being scheduled if there is
- * at least one highly likely predecessor still unscheduled. This increases the probability that the merge node and the corresponding
- * predecessor are more closely together in the schedule thus decreasing the probability for inserted phi moves. Also, the algorithm sets
- * the linear scan order number of the block that corresponds to its index in the linear scan order.
+ * Computes an ordering of the block that can be used by the linear scan register allocator and the
+ * machine code generator. The machine code generation order will start with the first block and
+ * produce a straight sequence always following the most likely successor. Then it will continue
+ * with the most likely path that was left out during this process. The process iteratively
+ * continues until all blocks are scheduled. Additionally, it is guaranteed that all blocks of a
+ * loop are scheduled before any block following the loop is scheduled.
+ * 
+ * The machine code generator order includes reordering of loop headers such that the backward jump
+ * is a conditional jump if there is only one loop end block. Additionally, the target of loop
+ * backward jumps are always marked as aligned. Aligning the target of conditional jumps does not
+ * bring a measurable benefit and is therefore avoided to keep the code size small.
+ * 
+ * The linear scan register allocator order has an additional mechanism that prevents merge nodes
+ * from being scheduled if there is at least one highly likely predecessor still unscheduled. This
+ * increases the probability that the merge node and the corresponding predecessor are more closely
+ * together in the schedule thus decreasing the probability for inserted phi moves. Also, the
+ * algorithm sets the linear scan order number of the block that corresponds to its index in the
+ * linear scan order.
  */
 public final class ComputeBlockOrder {
 
@@ -51,15 +55,15 @@
     private static final int INITIAL_WORKLIST_CAPACITY = 10;
 
     /**
-     * Divisor used for degrading the probability of the current path versus unscheduled paths at a merge node when
-     * calculating the linear scan order. A high value means that predecessors of merge nodes are more likely to be
-     * scheduled before the merge node.
+     * Divisor used for degrading the probability of the current path versus unscheduled paths at a
+     * merge node when calculating the linear scan order. A high value means that predecessors of
+     * merge nodes are more likely to be scheduled before the merge node.
      */
     private static final int PENALTY_VERSUS_UNSCHEDULED = 10;
 
     /**
      * Computes the block order used for the linear scan register allocator.
-     *
+     * 
      * @return sorted list of blocks
      */
     public static List<Block> computeLinearScanOrder(int blockCount, Block startBlock) {
@@ -73,7 +77,7 @@
 
     /**
      * Computes the block order used for code emission.
-     *
+     * 
      * @return sorted list of blocks
      */
     public static List<Block> computeCodeEmittingOrder(int blockCount, Block startBlock) {
@@ -125,7 +129,8 @@
         enqueueSuccessors(block, worklist, visitedBlocks);
         if (mostLikelySuccessor != null) {
             if (!mostLikelySuccessor.isLoopHeader() && mostLikelySuccessor.getPredecessorCount() > 1) {
-                // We are at a merge. Check probabilities of predecessors that are not yet scheduled.
+                // We are at a merge. Check probabilities of predecessors that are not yet
+                // scheduled.
                 double unscheduledSum = 0.0;
                 for (Block pred : mostLikelySuccessor.getPredecessors()) {
                     if (!visitedBlocks.get(pred.getId())) {
@@ -148,7 +153,8 @@
      */
     private static void addPathToCodeEmittingOrder(Block block, List<Block> order, PriorityQueue<Block> worklist, BitSet visitedBlocks) {
 
-        // Skip loop headers if there is only a single loop end block to make the backward jump be a conditional jump.
+        // Skip loop headers if there is only a single loop end block to make the backward jump be a
+        // conditional jump.
         if (!skipLoopHeader(block)) {
 
             // Align unskipped loop headers as they are the target of the backward jump.
@@ -161,10 +167,12 @@
         Loop loop = block.getLoop();
         if (block.isLoopEnd() && skipLoopHeader(loop.header)) {
 
-            // This is the only loop end of a skipped loop header. Add the header immediately afterwards.
+            // This is the only loop end of a skipped loop header. Add the header immediately
+            // afterwards.
             addBlock(loop.header, order);
 
-            // Make sure the loop successors of the loop header are aligned as they are the target of the backward jump.
+            // Make sure the loop successors of the loop header are aligned as they are the target
+            // of the backward jump.
             for (Block successor : loop.header.getSuccessors()) {
                 if (successor.getLoopDepth() == block.getLoopDepth()) {
                     successor.setAlign(true);
@@ -217,7 +225,8 @@
     }
 
     /**
-     * Skip the loop header block if the loop consists of more than one block and it has only a single loop end block.
+     * Skip the loop header block if the loop consists of more than one block and it has only a
+     * single loop end block.
      */
     private static boolean skipLoopHeader(Block block) {
         return (block.isLoopHeader() && !block.isLoopEnd() && block.getLoop().loopBegin().loopEnds().count() == 1);

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Address.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Address.java	Wed Jan 23 16:34:57 2013 +0100
@@ -27,15 +27,17 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Represents an address in target machine memory, specified via some combination of a base register, an index register,
- * a displacement and a scale. Note that the base and index registers may be a variable that will get a register assigned
- * later by the register allocator.
+ * Represents an address in target machine memory, specified via some combination of a base
+ * register, an index register, a displacement and a scale. Note that the base and index registers
+ * may be a variable that will get a register assigned later by the register allocator.
  */
 public final class Address extends Value {
+
     private static final long serialVersionUID = -1003772042519945089L;
 
     /**
-     * A sentinel value used as a place holder in an instruction stream for an address that will be patched.
+     * A sentinel value used as a place holder in an instruction stream for an address that will be
+     * patched.
      */
     public static final Address Placeholder = new Address(Kind.Illegal, Value.ILLEGAL);
 
@@ -46,7 +48,7 @@
 
     /**
      * Creates an {@link Address} with given base register, no scaling and no displacement.
-     *
+     * 
      * @param kind the kind of the value being addressed
      * @param base the base register
      */
@@ -56,7 +58,7 @@
 
     /**
      * Creates an {@link Address} with given base register, no scaling and a given displacement.
-     *
+     * 
      * @param kind the kind of the value being addressed
      * @param base the base register
      * @param displacement the displacement
@@ -68,7 +70,7 @@
     /**
      * Creates an {@link Address} with given base and index registers, scaling and displacement.
      * This is the most general constructor.
-     *
+     * 
      * @param kind the kind of the value being addressed
      * @param base the base register
      * @param index the index register
@@ -90,10 +92,7 @@
      * A scaling factor used in complex addressing modes such as those supported by x86 platforms.
      */
     public enum Scale {
-        Times1(1, 0),
-        Times2(2, 1),
-        Times4(4, 2),
-        Times8(8, 3);
+        Times1(1, 0), Times2(2, 1), Times4(4, 2), Times8(8, 3);
 
         private Scale(int value, int log2) {
             this.value = value;
@@ -112,11 +111,16 @@
 
         public static Scale fromInt(int scale) {
             switch (scale) {
-                case 1:  return Times1;
-                case 2:  return Times2;
-                case 4:  return Times4;
-                case 8:  return Times8;
-                default: throw new IllegalArgumentException(String.valueOf(scale));
+                case 1:
+                    return Times1;
+                case 2:
+                    return Times2;
+                case 4:
+                    return Times4;
+                case 8:
+                    return Times8;
+                default:
+                    throw new IllegalArgumentException(String.valueOf(scale));
             }
         }
     }
@@ -151,7 +155,8 @@
     public boolean equals(Object obj) {
         if (obj instanceof Address) {
             Address addr = (Address) obj;
-            return getKind() == addr.getKind() && getDisplacement() == addr.getDisplacement() && getBase().equals(addr.getBase()) && getScale() == addr.getScale() && getIndex().equals(addr.getIndex());
+            return getKind() == addr.getKind() && getDisplacement() == addr.getDisplacement() && getBase().equals(addr.getBase()) && getScale() == addr.getScale() &&
+                            getIndex().equals(addr.getIndex());
         }
         return false;
     }
@@ -162,8 +167,8 @@
     }
 
     /**
-     * @return Base register that defines the start of the address computation.
-     * If not present, is denoted by {@link Value#ILLEGAL}.
+     * @return Base register that defines the start of the address computation. If not present, is
+     *         denoted by {@link Value#ILLEGAL}.
      */
     public Value getBase() {
         return base;
@@ -174,8 +179,8 @@
     }
 
     /**
-     * @return Index register, the value of which (possibly scaled by {@link #scale}) is added to {@link #base}.
-     * If not present, is denoted by {@link Value#ILLEGAL}.
+     * @return Index register, the value of which (possibly scaled by {@link #scale}) is added to
+     *         {@link #base}. If not present, is denoted by {@link Value#ILLEGAL}.
      */
     public Value getIndex() {
         return index;

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Architecture.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Architecture.java	Wed Jan 23 16:34:57 2013 +0100
@@ -26,10 +26,9 @@
 
 import com.oracle.graal.api.code.Register.*;
 
-
 /**
- * Represents a CPU architecture, including information such as its endianness, CPU
- * registers, word width, etc.
+ * Represents a CPU architecture, including information such as its endianness, CPU registers, word
+ * width, etc.
  */
 public abstract class Architecture {
 
@@ -37,18 +36,19 @@
      * The endianness of the architecture.
      */
     public static enum ByteOrder {
-        LittleEndian,
-        BigEndian
+        LittleEndian, BigEndian
     }
 
     /**
-     * The number of bits required in a bit map covering all the registers that may store references.
-     * The bit position of a register in the map is the register's {@linkplain Register#number number}.
+     * The number of bits required in a bit map covering all the registers that may store
+     * references. The bit position of a register in the map is the register's
+     * {@linkplain Register#number number}.
      */
     private final int registerReferenceMapBitCount;
 
     /**
-     * Represents the natural size of words (typically registers and pointers) of this architecture, in bytes.
+     * Represents the natural size of words (typically registers and pointers) of this architecture,
+     * in bytes.
      */
     private final int wordSize;
 
@@ -69,8 +69,8 @@
     private final ByteOrder byteOrder;
 
     /**
-     * Mask of the barrier constants denoting the barriers that
-     * are not required to be explicitly inserted under this architecture.
+     * Mask of the barrier constants denoting the barriers that are not required to be explicitly
+     * inserted under this architecture.
      */
     private final int implicitMemoryBarriers;
 
@@ -80,8 +80,8 @@
     private final int machineCodeCallDisplacementOffset;
 
     /**
-     * The size of the return address pushed to the stack by a call instruction.
-     * A value of 0 denotes that call linkage uses registers instead (e.g. SPARC).
+     * The size of the return address pushed to the stack by a call instruction. A value of 0
+     * denotes that call linkage uses registers instead (e.g. SPARC).
      */
     private final int returnAddressSize;
 
@@ -89,7 +89,7 @@
 
     /**
      * Gets the register for a given {@linkplain Register#encoding encoding} and type.
-     *
+     * 
      * @param encoding a register value as used in a machine instruction
      * @param type the type of the register
      */
@@ -101,13 +101,7 @@
         return reg;
     }
 
-    protected Architecture(String name,
-                    int wordSize,
-                    ByteOrder byteOrder,
-                    Register[] registers,
-                    int implicitMemoryBarriers,
-                    int nativeCallDisplacementOffset,
-                    int registerReferenceMapBitCount,
+    protected Architecture(String name, int wordSize, ByteOrder byteOrder, Register[] registers, int implicitMemoryBarriers, int nativeCallDisplacementOffset, int registerReferenceMapBitCount,
                     int returnAddressSize) {
         this.name = name;
         this.registers = registers;
@@ -133,6 +127,7 @@
 
     /**
      * Converts this architecture to a string.
+     * 
      * @return the string representation of this architecture
      */
     @Override
@@ -145,7 +140,8 @@
     }
 
     /**
-     * Gets the natural size of words (typically registers and pointers) of this architecture, in bytes.
+     * Gets the natural size of words (typically registers and pointers) of this architecture, in
+     * bytes.
      */
     public int getWordSize() {
         return wordSize;
@@ -159,8 +155,8 @@
     }
 
     /**
-     * Gets an array of all available registers on this architecture. The index of each register in this
-     * array is equal to its {@linkplain Register#number number}.
+     * Gets an array of all available registers on this architecture. The index of each register in
+     * this array is equal to its {@linkplain Register#number number}.
      */
     public Register[] getRegisters() {
         return registers.clone();
@@ -171,16 +167,16 @@
     }
 
     /**
-     * Gets a mask of the barrier constants denoting the barriers that
-     * are not required to be explicitly inserted under this architecture.
+     * Gets a mask of the barrier constants denoting the barriers that are not required to be
+     * explicitly inserted under this architecture.
      */
     public int getImplicitMemoryBarriers() {
         return implicitMemoryBarriers;
     }
 
     /**
-     * Gets the size of the return address pushed to the stack by a call instruction.
-     * A value of 0 denotes that call linkage uses registers instead.
+     * Gets the size of the return address pushed to the stack by a call instruction. A value of 0
+     * denotes that call linkage uses registers instead.
      */
     public int getReturnAddressSize() {
         return returnAddressSize;
@@ -194,8 +190,9 @@
     }
 
     /**
-     * Determines the barriers in a given barrier mask that are explicitly required on this architecture.
-     *
+     * Determines the barriers in a given barrier mask that are explicitly required on this
+     * architecture.
+     * 
      * @param barriers a mask of the barrier constants
      * @return the value of {@code barriers} minus the barriers unnecessary on this architecture
      */

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java	Wed Jan 23 16:34:57 2013 +0100
@@ -99,8 +99,8 @@
         private static final long serialVersionUID = -7636746737947390059L;
 
         /**
-         * A virtual (or interface) method whose unique implementation for the receiver type
-         * in {@link #context} is {@link #impl}.
+         * A virtual (or interface) method whose unique implementation for the receiver type in
+         * {@link #context} is {@link #impl}.
          */
         public final ResolvedJavaMethod method;
 
@@ -182,7 +182,8 @@
     }
 
     /**
-     * Array with the assumptions. This field is directly accessed from C++ code in the Graal/HotSpot implementation.
+     * Array with the assumptions. This field is directly accessed from C++ code in the
+     * Graal/HotSpot implementation.
      */
     private Assumption[] list;
     private boolean useOptimisticAssumptions;
@@ -194,6 +195,7 @@
 
     /**
      * Returns whether any assumptions have been registered.
+     * 
      * @return {@code true} if at least one assumption has been registered, {@code false} otherwise.
      */
     public boolean isEmpty() {
@@ -207,16 +209,20 @@
     @Override
     public Iterator<Assumption> iterator() {
         return new Iterator<Assumptions.Assumption>() {
+
             int index;
+
             public void remove() {
                 throw new UnsupportedOperationException();
             }
+
             public Assumption next() {
                 if (index >= count) {
                     throw new NoSuchElementException();
                 }
                 return list[index++];
             }
+
             public boolean hasNext() {
                 return index < count;
             }
@@ -225,9 +231,10 @@
 
     /**
      * Records an assumption that the specified type has no finalizable subclasses.
-     *
+     * 
      * @param receiverType the type that is assumed to have no finalizable subclasses
-     * @return {@code true} if the assumption was recorded and can be assumed; {@code false} otherwise
+     * @return {@code true} if the assumption was recorded and can be assumed; {@code false}
+     *         otherwise
      */
     public boolean recordNoFinalizableSubclassAssumption(ResolvedJavaType receiverType) {
         // TODO (thomaswue): Record that assumption correctly.
@@ -236,7 +243,9 @@
     }
 
     /**
-     * Records that {@code subtype} is the only concrete subtype in the class hierarchy below {@code context}.
+     * Records that {@code subtype} is the only concrete subtype in the class hierarchy below
+     * {@code context}.
+     * 
      * @param context the root of the subtree of the class hierarchy that this assumptions is about
      * @param subtype the one concrete subtype
      */
@@ -248,7 +257,7 @@
     /**
      * Records that {@code impl} is the only possible concrete target for a virtual call to
      * {@code method} with a receiver of type {@code context}.
-     *
+     * 
      * @param method a method that is the target of a virtual call
      * @param context the receiver type of a call to {@code method}
      * @param impl the concrete method that is the only possible target for the virtual call
@@ -260,7 +269,7 @@
 
     /**
      * Records that {@code method} was used during the compilation.
-     *
+     * 
      * @param method a method whose contents were used
      */
     public void recordMethodContents(ResolvedJavaMethod method) {

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BailoutException.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BailoutException.java	Wed Jan 23 16:34:57 2013 +0100
@@ -25,9 +25,9 @@
 import java.util.*;
 
 /**
- * Exception thrown when the compiler refuses to compile a method because of problems with the method.
- * e.g. bytecode wouldn't verify, too big, JSR/ret too complicated, etc. This exception is <i>not</i>
- * meant to indicate problems with the compiler itself.
+ * Exception thrown when the compiler refuses to compile a method because of problems with the
+ * method. e.g. bytecode wouldn't verify, too big, JSR/ret too complicated, etc. This exception is
+ * <i>not</i> meant to indicate problems with the compiler itself.
  */
 public class BailoutException extends RuntimeException {
 
@@ -35,7 +35,7 @@
 
     /**
      * Creates a new {@link BailoutException}.
-     *
+     * 
      * @param reason a message indicating the reason
      */
     public BailoutException(String reason) {
@@ -44,7 +44,7 @@
 
     /**
      * Creates a new {@link BailoutException}.
-     *
+     * 
      * @param args parameters to the formatter
      */
     public BailoutException(String format, Object... args) {
@@ -53,7 +53,7 @@
 
     /**
      * Creates a new {@link BailoutException} due to an internal exception being thrown.
-     *
+     * 
      * @param reason a message indicating the reason
      * @param cause the throwable that was the cause of the bailout
      */

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodeFrame.java	Wed Jan 23 16:34:57 2013 +0100
@@ -27,26 +27,43 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Represents the Java bytecode frame state(s) at a given position
- * including {@link Value locations} where to find the local variables,
- * operand stack values and locked objects of the bytecode frame(s).
+ * Represents the Java bytecode frame state(s) at a given position including {@link Value locations}
+ * where to find the local variables, operand stack values and locked objects of the bytecode
+ * frame(s).
  */
 public class BytecodeFrame extends BytecodePosition implements Serializable {
+
     private static final long serialVersionUID = -345025397165977565L;
 
     /**
-     * An array of values representing how to reconstruct the state of the Java frame.
-     * This is array is partitioned as follows:
+     * An array of values representing how to reconstruct the state of the Java frame. This is array
+     * is partitioned as follows:
      * <p>
      * <table border="1" cellpadding="5" frame="void", rules="all">
-     * <tr><th>Start index (inclusive)</th><th>End index (exclusive)</th><th>Description</th></tr>
-     * <tr><td>0</td>                   <td>numLocals</td>           <td>Local variables</td></tr>
-     * <tr><td>numLocals</td>           <td>numLocals + numStack</td><td>Operand stack</td></tr>
-     * <tr><td>numLocals + numStack</td><td>values.length</td>       <td>Locked objects</td></tr>
+     * <tr>
+     * <th>Start index (inclusive)</th>
+     * <th>End index (exclusive)</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td>0</td>
+     * <td>numLocals</td>
+     * <td>Local variables</td>
+     * </tr>
+     * <tr>
+     * <td>numLocals</td>
+     * <td>numLocals + numStack</td>
+     * <td>Operand stack</td>
+     * </tr>
+     * <tr>
+     * <td>numLocals + numStack</td>
+     * <td>values.length</td>
+     * <td>Locked objects</td>
+     * </tr>
      * </table>
      * <p>
-     * Note that the number of locals and the number of stack slots may be smaller than the
-     * maximum number of locals and stack slots as specified in the compiled method.
+     * Note that the number of locals and the number of stack slots may be smaller than the maximum
+     * number of locals and stack slots as specified in the compiled method.
      */
     public final Value[] values;
 
@@ -66,8 +83,10 @@
     public final int numLocks;
 
     /**
-     * In case this frame state belongs to a deoptimization, the leafGraphId will contain the StructuredGraph.graphId() of the graph that originally introduced this deoptimization point.
-     * This id is later on used by the runtime system to evict graphs from the graph cache when deoptimizations originating from them have been hit.
+     * In case this frame state belongs to a deoptimization, the leafGraphId will contain the
+     * StructuredGraph.graphId() of the graph that originally introduced this deoptimization point.
+     * This id is later on used by the runtime system to evict graphs from the graph cache when
+     * deoptimizations originating from them have been hit.
      */
     public final long leafGraphId;
 
@@ -77,17 +96,19 @@
 
     /**
      * Creates a new frame object.
-     *
+     * 
      * @param caller the caller frame (which may be {@code null})
      * @param method the method
      * @param bci a BCI within the method
-     * @param rethrowException specifies if the VM should re-throw the pending exception when deopt'ing using this frame
+     * @param rethrowException specifies if the VM should re-throw the pending exception when
+     *            deopt'ing using this frame
      * @param values the frame state {@link #values}
      * @param numLocals the number of local variables
      * @param numStack the depth of the stack
      * @param numLocks the number of locked objects
      */
-    public BytecodeFrame(BytecodeFrame caller, ResolvedJavaMethod method, int bci, boolean rethrowException, boolean duringCall, Value[] values, int numLocals, int numStack, int numLocks, long leafGraphId) {
+    public BytecodeFrame(BytecodeFrame caller, ResolvedJavaMethod method, int bci, boolean rethrowException, boolean duringCall, Value[] values, int numLocals, int numStack, int numLocks,
+                    long leafGraphId) {
         super(caller, method, bci);
         assert values != null;
         this.rethrowException = rethrowException;
@@ -102,6 +123,7 @@
 
     /**
      * Gets the value representing the specified local variable.
+     * 
      * @param i the local variable index
      * @return the value that can be used to reconstruct the local's current value
      */
@@ -111,6 +133,7 @@
 
     /**
      * Gets the value representing the specified stack slot.
+     * 
      * @param i the stack index
      * @return the value that can be used to reconstruct the stack slot's current value
      */
@@ -120,6 +143,7 @@
 
     /**
      * Gets the value representing the specified lock.
+     * 
      * @param i the lock index
      * @return the value that can be used to reconstruct the lock's current value
      */
@@ -129,7 +153,7 @@
 
     /**
      * Gets the caller of this frame.
-     *
+     * 
      * @return {@code null} if this frame has no caller
      */
     public BytecodeFrame caller() {

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodePosition.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/BytecodePosition.java	Wed Jan 23 16:34:57 2013 +0100
@@ -27,10 +27,10 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Represents a code position, that is, a chain of inlined methods with bytecode
- * locations, that is communicated from the compiler to the runtime system. A code position
- * can be used by the runtime system to reconstruct a source-level stack trace
- * for exceptions and to create {@linkplain BytecodeFrame frames} for deoptimization.
+ * Represents a code position, that is, a chain of inlined methods with bytecode locations, that is
+ * communicated from the compiler to the runtime system. A code position can be used by the runtime
+ * system to reconstruct a source-level stack trace for exceptions and to create
+ * {@linkplain BytecodeFrame frames} for deoptimization.
  */
 public abstract class BytecodePosition implements Serializable {
 
@@ -42,7 +42,7 @@
 
     /**
      * Constructs a new object representing a given parent/caller, a given method, and a given BCI.
-     *
+     * 
      * @param caller the parent position
      * @param method the method
      * @param bci a BCI within the method
@@ -56,6 +56,7 @@
 
     /**
      * Converts this code position to a string representation.
+     * 
      * @return a string representation of this code position
      */
     @Override
@@ -89,9 +90,9 @@
     }
 
     /**
-     * @return The location within the method, as a bytecode index. The constant
-     * {@code -1} may be used to indicate the location is unknown, for example
-     * within code synthesized by the compiler.
+     * @return The location within the method, as a bytecode index. The constant {@code -1} may be
+     *         used to indicate the location is unknown, for example within code synthesized by the
+     *         compiler.
      */
     public int getBCI() {
         return bci;

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CalleeSaveLayout.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CalleeSaveLayout.java	Wed Jan 23 16:34:57 2013 +0100
@@ -24,13 +24,11 @@
 
 import java.util.*;
 
-
 /**
- * The callee save area (CSA) is a contiguous space in a stack frame
- * used to save (and restore) the values of the caller's registers.
- * This class describes the layout of a CSA in terms of its
- * {@linkplain #size size}, {@linkplain #slotSize slot size} and
- * the {@linkplain #registers callee save registers} covered by the CSA.
+ * The callee save area (CSA) is a contiguous space in a stack frame used to save (and restore) the
+ * values of the caller's registers. This class describes the layout of a CSA in terms of its
+ * {@linkplain #size size}, {@linkplain #slotSize slot size} and the {@linkplain #registers callee
+ * save registers} covered by the CSA.
  */
 public class CalleeSaveLayout {
 
@@ -57,16 +55,18 @@
     public final Register[] registers;
 
     /**
-     * The offset from the frame pointer to the CSA. If this is not known, then this field
-     * will have the value {@link Integer#MAX_VALUE}.
+     * The offset from the frame pointer to the CSA. If this is not known, then this field will have
+     * the value {@link Integer#MAX_VALUE}.
      */
     public final int frameOffsetToCSA;
 
     /**
      * Creates a CSA layout.
-     *
-     * @param size size (in bytes) of the CSA. If this is {@code -1}, then the CSA size will be computed from {@code registers}.
-     * @param slotSize the size (in bytes) of an {@linkplain #registerAt(int) indexable} slot in the CSA
+     * 
+     * @param size size (in bytes) of the CSA. If this is {@code -1}, then the CSA size will be
+     *            computed from {@code registers}.
+     * @param slotSize the size (in bytes) of an {@linkplain #registerAt(int) indexable} slot in the
+     *            CSA
      * @param registers the registers that can be saved in the CSA
      */
     public CalleeSaveLayout(int frameOffsetToCSA, int size, int slotSize, Register... registers) {
@@ -109,7 +109,7 @@
 
     /**
      * Gets the offset of a given register in the CSA.
-     *
+     * 
      * @return the offset (in bytes) of {@code reg} in the CSA
      * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA
      */
@@ -119,7 +119,7 @@
 
     /**
      * Gets the index of a given register in the CSA.
-     *
+     * 
      * @return the index of {@code reg} in the CSA
      * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA
      */
@@ -132,7 +132,7 @@
 
     /**
      * Gets the offset of a given register in the CSA.
-     *
+     * 
      * @return the offset (in bytes) of {@code reg} in the CSA
      * @throws IllegalArgumentException if {@code reg} does not have a slot in the CSA
      */
@@ -142,7 +142,7 @@
 
     /**
      * Determines if the CSA includes a slot for a given register.
-     *
+     * 
      * @param reg the register to test
      * @return true if the CSA contains a slot for {@code reg}
      */
@@ -152,10 +152,10 @@
 
     /**
      * Gets the register whose slot in the CSA is at a given index.
-     *
+     * 
      * @param index an index of a slot in the CSA
-     * @return the register whose slot in the CSA is at  {@code index} or {@code null} if {@code index} does not denote a
-     *         slot in the CSA aligned with a register
+     * @return the register whose slot in the CSA is at {@code index} or {@code null} if
+     *         {@code index} does not denote a slot in the CSA aligned with a register
      */
     public Register registerAt(int index) {
         if (index < 0 || index >= indexToReg.length) {

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CallingConvention.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CallingConvention.java	Wed Jan 23 16:34:57 2013 +0100
@@ -26,10 +26,9 @@
 
 import com.oracle.graal.api.meta.*;
 
-
 /**
- * A calling convention describes the locations in which the arguments for a call are placed,
- * the location in which the return value is placed if the call is not void and any
+ * A calling convention describes the locations in which the arguments for a call are placed, the
+ * location in which the return value is placed if the call is not void and any
  * {@linkplain #getTemporaries() extra} locations used (and killed) by the call.
  */
 public class CallingConvention {
@@ -49,13 +48,14 @@
         JavaCallee(false),
 
         /**
-         * A request for the outgoing argument locations at a call site to the runtime (which may be Java or native code).
+         * A request for the outgoing argument locations at a call site to the runtime (which may be
+         * Java or native code).
          */
         RuntimeCall(true),
 
         /**
-         * A request for the outgoing argument locations at a call site to
-         * external native code that complies with the platform ABI.
+         * A request for the outgoing argument locations at a call site to external native code that
+         * complies with the platform ABI.
          */
         NativeCall(true);
 
@@ -90,9 +90,11 @@
 
     /**
      * Creates a description of the registers and stack locations used by a call.
-     *
-     * @param stackSize amount of stack space (in bytes) required for the stack-based arguments of the call
-     * @param returnLocation the location for the return value or {@link Value#ILLEGAL} if a void call
+     * 
+     * @param stackSize amount of stack space (in bytes) required for the stack-based arguments of
+     *            the call
+     * @param returnLocation the location for the return value or {@link Value#ILLEGAL} if a void
+     *            call
      * @param argumentLocations the ordered locations in which the arguments are placed
      */
     public CallingConvention(int stackSize, Value returnLocation, Value... argumentLocations) {
@@ -101,10 +103,13 @@
 
     /**
      * Creates a description of the registers and stack locations used by a call.
-     *
-     * @param temporaryLocations the locations used (and killed) by the call in addition to {@code arguments}
-     * @param stackSize amount of stack space (in bytes) required for the stack-based arguments of the call
-     * @param returnLocation the location for the return value or {@link Value#ILLEGAL} if a void call
+     * 
+     * @param temporaryLocations the locations used (and killed) by the call in addition to
+     *            {@code arguments}
+     * @param stackSize amount of stack space (in bytes) required for the stack-based arguments of
+     *            the call
+     * @param returnLocation the location for the return value or {@link Value#ILLEGAL} if a void
+     *            call
      * @param argumentLocations the ordered locations in which the arguments are placed
      */
     public CallingConvention(Value[] temporaryLocations, int stackSize, Value returnLocation, Value... argumentLocations) {
@@ -147,7 +152,8 @@
     }
 
     /**
-     * Gets the locations used (and killed) by the call apart from the {@linkplain #getArgument(int) arguments}.
+     * Gets the locations used (and killed) by the call apart from the
+     * {@linkplain #getArgument(int) arguments}.
      */
     public Value[] getTemporaries() {
         if (temporaryLocations.length == 0) {

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java	Wed Jan 23 16:34:57 2013 +0100
@@ -32,14 +32,15 @@
 public interface CodeCacheProvider extends MetaAccessProvider {
 
     /**
-     * Adds the given compilation result as an implementation of the given method without making it the default
-     * implementation.
-     *
+     * Adds the given compilation result as an implementation of the given method without making it
+     * the default implementation.
+     * 
      * @param method a method to which the executable code is begin added
      * @param compResult the compilation result to be added
-     * @param info the object into which details of the installed code will be written. Ignored if null, otherwise the
-     *            info is written to index 0 of this array.
-     * @return a reference to the compiled and ready-to-run code or null if the code installation failed
+     * @param info the object into which details of the installed code will be written. Ignored if
+     *            null, otherwise the info is written to index 0 of this array.
+     * @return a reference to the compiled and ready-to-run code or null if the code installation
+     *         failed
      */
     InstalledCode addMethod(ResolvedJavaMethod method, CompilationResult compResult, CodeInfo[] info);
 
@@ -50,30 +51,31 @@
 
     /**
      * Returns a disassembly of the given installed code.
-     *
+     * 
      * @param code the code that should be disassembled
-     * @return a disassembly. This will be of length 0 if the runtime does not support disassembling.
+     * @return a disassembly. This will be of length 0 if the runtime does not support
+     *         disassembling.
      */
     String disassemble(CodeInfo code, CompilationResult tm);
 
     /**
      * Gets the register configuration to use when compiling a given method.
-     *
+     * 
      * @param method the top level method of a compilation
      */
     RegisterConfig lookupRegisterConfig(ResolvedJavaMethod method);
 
     /**
      * Custom area on the stack of each compiled method that the VM can use for its own purposes.
-     *
+     * 
      * @return the size of the custom area in bytes
      */
     int getCustomStackAreaSize();
 
     /**
-     * Minimum size of the stack area reserved for outgoing parameters. This area is reserved in all cases, even when
-     * the compiled method has no regular call instructions.
-     *
+     * Minimum size of the stack area reserved for outgoing parameters. This area is reserved in all
+     * cases, even when the compiled method has no regular call instructions.
+     * 
      * @return the minimum size of the outgoing parameter area in bytes
      */
     int getMinimumOutgoingSize();
@@ -90,15 +92,15 @@
 
     /**
      * Encodes a deoptimization action and a deoptimization reason in an integer value.
-     *
+     * 
      * @return the encoded value as an integer
      */
     int encodeDeoptActionAndReason(DeoptimizationAction action, DeoptimizationReason reason);
 
     /**
-     * Determines if a {@link DataPatch} should be created for a given {@linkplain Constant#getPrimitiveAnnotation() annotated}
-     * primitive constant that part of a {@link CompilationResult}. A data patch is always
-     * created for an object constant.
+     * Determines if a {@link DataPatch} should be created for a given
+     * {@linkplain Constant#getPrimitiveAnnotation() annotated} primitive constant that part of a
+     * {@link CompilationResult}. A data patch is always created for an object constant.
      */
     boolean needsDataPatch(Constant constant);
 }

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeInfo.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeInfo.java	Wed Jan 23 16:34:57 2013 +0100
@@ -25,9 +25,9 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Represents some code installed in the code cache of the runtime.
- * This encapsulated details are only for informational purposes.
- * At any time, the runtime may invalidate the underlying code (e.g. due to deopt etc).
+ * Represents some code installed in the code cache of the runtime. This encapsulated details are
+ * only for informational purposes. At any time, the runtime may invalidate the underlying code
+ * (e.g. due to deopt etc).
  */
 public interface CodeInfo {
 

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeUtil.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeUtil.java	Wed Jan 23 16:34:57 2013 +0100
@@ -27,7 +27,8 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Miscellaneous collection of utility methods used by {@code com.oracle.graal.api.code} and its clients.
+ * Miscellaneous collection of utility methods used by {@code com.oracle.graal.api.code} and its
+ * clients.
  */
 public class CodeUtil {
 
@@ -46,7 +47,7 @@
 
     /**
      * Checks whether the specified integer is a power of two.
-     *
+     * 
      * @param val the value to check
      * @return {@code true} if the value is a power of two; {@code false} otherwise
      */
@@ -56,7 +57,7 @@
 
     /**
      * Checks whether the specified long is a power of two.
-     *
+     * 
      * @param val the value to check
      * @return {@code true} if the value is a power of two; {@code false} otherwise
      */
@@ -65,9 +66,9 @@
     }
 
     /**
-     * Computes the log (base 2) of the specified integer, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4}
-     * )
-     *
+     * Computes the log (base 2) of the specified integer, rounding down. (E.g {@code log2(8) = 3},
+     * {@code log2(21) = 4} )
+     * 
      * @param val the value
      * @return the log base 2 of the value
      */
@@ -77,8 +78,9 @@
     }
 
     /**
-     * Computes the log (base 2) of the specified long, rounding down. (E.g {@code log2(8) = 3}, {@code log2(21) = 4})
-     *
+     * Computes the log (base 2) of the specified long, rounding down. (E.g {@code log2(8) = 3},
+     * {@code log2(21) = 4})
+     * 
      * @param val the value
      * @return the log base 2 of the value
      */
@@ -89,7 +91,7 @@
 
     /**
      * Formats the values in a frame as a tabulated string.
-     *
+     * 
      * @param frame
      * @return the values in {@code frame} as a tabulated string
      */
@@ -127,8 +129,9 @@
     }
 
     /**
-     * Formats a given table as a string. The value of each cell is produced by {@link String#valueOf(Object)}.
-     *
+     * Formats a given table as a string. The value of each cell is produced by
+     * {@link String#valueOf(Object)}.
+     * 
      * @param cells the cells of the table in row-major order
      * @param cols the number of columns per row
      * @param lpad the number of space padding inserted before each formatted cell value
@@ -176,7 +179,7 @@
 
     /**
      * Appends a formatted code position to a {@link StringBuilder}.
-     *
+     * 
      * @param sb the {@link StringBuilder} to append to
      * @param pos the code position to format and append to {@code sb}
      * @return the value of {@code sb}
@@ -192,7 +195,7 @@
 
     /**
      * Appends a formatted frame to a {@link StringBuilder}.
-     *
+     * 
      * @param sb the {@link StringBuilder} to append to
      * @param frame the frame to format and append to {@code sb}
      * @return the value of {@code sb}
@@ -243,8 +246,8 @@
         private final Register[] registers;
 
         /**
-         * The offset (in bytes) from the slot pointed to by {@link #fp} to the slot corresponding to bit 0 in the frame
-         * reference map.
+         * The offset (in bytes) from the slot pointed to by {@link #fp} to the slot corresponding
+         * to bit 0 in the frame reference map.
          */
         public final int refMapToFPOffset;
 
@@ -272,7 +275,7 @@
 
     /**
      * Appends a formatted debug info to a {@link StringBuilder}.
-     *
+     * 
      * @param sb the {@link StringBuilder} to append to
      * @param info the debug info to format and append to {@code sb}
      * @return the value of {@code sb}

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java	Wed Jan 23 16:34:57 2013 +0100
@@ -28,8 +28,8 @@
 import com.oracle.graal.api.meta.*;
 
 /**
- * Represents the output from compiling a method, including the compiled machine code, associated data and references,
- * relocation information, deoptimization information, etc.
+ * Represents the output from compiling a method, including the compiled machine code, associated
+ * data and references, relocation information, deoptimization information, etc.
  */
 public class CompilationResult implements Serializable {
 
@@ -39,6 +39,7 @@
      * Represents a code position with associated additional information.
      */
     public abstract static class Site implements Serializable {
+
         private static final long serialVersionUID = -8214214947651979102L;
         /**
          * The position (or offset) of this site with respect to the start of the target method.
@@ -54,6 +55,7 @@
      * Represents a safepoint with associated debug info.
      */
     public static class Safepoint extends Site implements Comparable<Safepoint> {
+
         private static final long serialVersionUID = 2479806696381720162L;
         public final DebugInfo debugInfo;
 
@@ -86,6 +88,7 @@
      * Represents a call in the code.
      */
     public static final class Call extends Safepoint {
+
         private static final long serialVersionUID = 1440741241631046954L;
 
         /**
@@ -99,9 +102,9 @@
         public final int size;
 
         /**
-         * Specifies if this call is direct or indirect. A direct call has an immediate operand encoding
-         * the absolute or relative (to the call itself) address of the target. An indirect call has a
-         * register or memory operand specifying the target address of the call.
+         * Specifies if this call is direct or indirect. A direct call has an immediate operand
+         * encoding the absolute or relative (to the call itself) address of the target. An indirect
+         * call has a register or memory operand specifying the target address of the call.
          */
         public final boolean direct;
 
@@ -132,6 +135,7 @@
      * Represents a reference to data from the code. The associated data can be any constant.
      */
     public static final class DataPatch extends Site {
+
         private static final long serialVersionUID = 5771730331604867476L;
         public final Constant constant;
         public final int alignment;
@@ -155,10 +159,12 @@
     }
 
     /**
-     * Provides extra information about instructions or data at specific positions in {@link CompilationResult#getTargetCode()}.
-     * This is optional information that can be used to enhance a disassembly of the code.
+     * Provides extra information about instructions or data at specific positions in
+     * {@link CompilationResult#getTargetCode()}. This is optional information that can be used to
+     * enhance a disassembly of the code.
      */
     public abstract static class CodeAnnotation implements Serializable {
+
         private static final long serialVersionUID = -7903959680749520748L;
         public final int position;
 
@@ -171,11 +177,13 @@
      * A string comment about one or more instructions at a specific position in the code.
      */
     public static final class CodeComment extends CodeAnnotation {
+
         /**
          *
          */
         private static final long serialVersionUID = 6802287188701961401L;
         public final String value;
+
         public CodeComment(int position, String comment) {
             super(position);
             this.value = comment;
@@ -191,8 +199,10 @@
      * Labels some inline data in the code.
      */
     public static final class InlineData extends CodeAnnotation {
+
         private static final long serialVersionUID = 305997507263827108L;
         public final int size;
+
         public InlineData(int position, int size) {
             super(position);
             this.size = size;
@@ -205,13 +215,16 @@
     }
 
     /**
-     * Describes a table of signed offsets embedded in the code. The offsets are relative to the starting
-     * address of the table. This type of table maybe generated when translating a multi-way branch
-     * based on a key value from a dense value set (e.g. the {@code tableswitch} JVM instruction).
-     *
-     * The table is indexed by the contiguous range of integers from {@link #low} to {@link #high} inclusive.
+     * Describes a table of signed offsets embedded in the code. The offsets are relative to the
+     * starting address of the table. This type of table maybe generated when translating a
+     * multi-way branch based on a key value from a dense value set (e.g. the {@code tableswitch}
+     * JVM instruction).
+     * 
+     * The table is indexed by the contiguous range of integers from {@link #low} to {@link #high}
+     * inclusive.
      */
     public static final class JumpTable extends CodeAnnotation {
+
         private static final long serialVersionUID = 2222194398353801831L;
 
         /**
@@ -243,11 +256,12 @@
     }
 
     /**
-     * Describes a table of key and offset pairs. The offset in each table entry is relative to the address of
-     * the table. This type of table maybe generated when translating a multi-way branch
+     * Describes a table of key and offset pairs. The offset in each table entry is relative to the
+     * address of the table. This type of table maybe generated when translating a multi-way branch
      * based on a key value from a sparse value set (e.g. the {@code lookupswitch} JVM instruction).
      */
     public static final class LookupTable extends CodeAnnotation {
+
         private static final long serialVersionUID = 8367952567559116160L;
 
         /**
@@ -279,10 +293,11 @@
     }
 
     /**
-     * Represents exception handler information for a specific code position. It includes the catch code position as
-     * well as the caught exception type.
+     * Represents exception handler information for a specific code position. It includes the catch
+     * code position as well as the caught exception type.
      */
     public static final class ExceptionHandler extends Site {
+
         private static final long serialVersionUID = 4897339464722665281L;
         public final int handlerPos;
 
@@ -298,10 +313,11 @@
     }
 
     /**
-     * Represents a mark in the machine code that can be used by the runtime for its own purposes. A mark
-     * can reference other marks.
+     * Represents a mark in the machine code that can be used by the runtime for its own purposes. A
+     * mark can reference other marks.
      */
     public static final class Mark extends Site {
+
         private static final long serialVersionUID = 3612943150662354844L;
         public final Object id;
         public final Mark[] references;
@@ -358,9 +374,9 @@
     }
 
     /**
-     * Sets the frame size in bytes. Does not include the return address pushed onto the
-     * stack, if any.
-     *
+     * Sets the frame size in bytes. Does not include the return address pushed onto the stack, if
+     * any.
+     * 
      * @param size the size of the frame in bytes
      */
     public void setFrameSize(int size) {
@@ -369,7 +385,7 @@
 
     /**
      * Sets the machine that has been generated by the compiler.
-     *
+     * 
      * @param code the machine code generated
      * @param size the size of the machine code
      */
@@ -380,7 +396,7 @@
 
     /**
      * Sets the info on callee-saved registers used by this method.
-     *
+     * 
      * @param csl the register-saving info.
      */
     public void setCalleeSaveLayout(CalleeSaveLayout csl) {
@@ -388,11 +404,13 @@
     }
 
     /**
-     * Records a reference to the data section in the code section (e.g. to load an integer or floating point constant).
-     *
+     * Records a reference to the data section in the code section (e.g. to load an integer or
+     * floating point constant).
+     * 
      * @param codePos the position in the code where the data reference occurs
      * @param data the data that is referenced
-     * @param alignment the alignment requirement of the data or 0 if there is no alignment requirement
+     * @param alignment the alignment requirement of the data or 0 if there is no alignment
+     *            requirement
      * @param inlined specifies if the data is encoded inline or is loaded from a separate data area
      */
     public void recordDataReference(int codePos, Constant data, int alignment, boolean inlined) {
@@ -402,7 +420,7 @@
 
     /**
      * Records a call in the code array.
-     *
+     * 
      * @param codePos the position of the call in the code array
      * @param size the size of the call instruction
      * @param target the {@link CodeCacheProvider#lookupCallTarget(Object) target} being called
@@ -416,9 +434,9 @@
 
     /**
      * Records an exception handler for this method.
-     *
-     * @param codePos  the position in the code that is covered by the handler
-     * @param handlerPos    the position of the handler
+     * 
+     * @param codePos the position in the code that is covered by the handler
+     * @param handlerPos the position of the handler
      */
     public void recordExceptionHandler(int codePos, int handlerPos) {
         getExceptionHandlers().add(new ExceptionHandler(codePos, handlerPos));
@@ -426,7 +444,7 @@
 
     /**
      * Records a safepoint in the code array.
-     *
+     * 
      * @param codePos the position of the safepoint in the code array
      * @param debugInfo the debug info for the safepoint
      */
@@ -445,7 +463,7 @@
 
     /**
      * Records an instruction mark within this method.
-     *
+     * 
      * @param codePos the position in the code that is covered by the handler
      * @param id the identifier for this mark
      * @param references an array of other marks that this mark references
@@ -457,9 +475,10 @@
     }
 
     /**
-     * Allows a method to specify the offset of the epilogue that restores the callee saved registers. Must be called
-     * iff the method is a callee saved method and stores callee registers on the stack.
-     *
+     * Allows a method to specify the offset of the epilogue that restores the callee saved
+     * registers. Must be called iff the method is a callee saved method and stores callee registers
+     * on the stack.
+     * 
      * @param registerRestoreEpilogueOffset the offset in the machine code where the epilogue begins
      */
     public void setRegisterRestoreEpilogueOffset(int registerRestoreEpilogueOffset) {
@@ -469,7 +488,7 @@
 
     /**
      * The frame size of the method in bytes.
-     *
+     * 
      * @return the frame size
      */
     public int getFrameSize() {
@@ -478,8 +497,8 @@
     }
 
     /**
-     * @return the code offset of the start of the epilogue that restores all callee saved registers, or -1 if this is
-     *         not a callee saved method
+     * @return the code offset of the start of the epilogue that restores all callee saved
+     *         registers, or -1 if this is not a callee saved method
      */
     public int getRegisterRestoreEpilogueOffset() {
         return registerRestoreEpilogueOffset;
@@ -487,6 +506,7 @@
 
     /**
      * Offset in bytes for the custom stack area (relative to sp).
+     * 
      * @return the offset in bytes
      */
     public int getCustomStackAreaOffset() {

--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/DebugInfo.java	Wed Jan 23 16:34:38 2013 +0100
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/DebugInfo.java	Wed Jan 23 16:34:57 2013 +0100
@@ -26,8 +26,8 @@
 import java.util.*;
 
 /**
- * Represents the debugging information for a particular place in the code,
- * which includes the code position, a reference map, and deoptimization information.
+ * Represents the debugging information for a particular place in the code, which includes the code
+ * position, a reference map, and deoptimization information.
  */
 public class DebugInfo implements Serializable {
 
@@ -39,8 +39,9 @@
 
     /**
      * Creates a new {@link DebugInfo} from the given values.
-     *
-     * @param codePos the {@linkplain BytecodePosition code position} or {@linkplain BytecodeFrame frame} info
+     * 
+     * @param codePos the {@linkplain BytecodePosition code position} or {@linkplain BytecodeFrame
+     *            frame} info
      * @param registerRefMap the register map
      * @param frameRefMap the reference map for {@code frame}, which may be {@code null}
      */
@@ -71,10 +72,9 @@
         return getFrameRefMap() != null && getFrameRefMap().size() > 0;
     }
 
-
     /**
      * Gets the deoptimization information for each inlined frame (if available).
-     *
+     * 
      * @return {@code null} if no frame de-opt info is {@linkplain #hasFrame() available}
      */
     public BytecodeFrame frame() {
@@ -90,25 +90,26 @@
     }
 
     /**
-     * @return The code position (including all inlined methods) of this debug info.
-     * If this is a {@link BytecodeFrame} instance, then it is also the deoptimization information for each inlined frame.
+     * @return The code position (including all inlined methods) of this debug info. If this is a
+     *         {@link BytecodeFrame} instance, then it is also the deoptimization information for
+     *         each inlined frame.
      */
     public BytecodePosition getBytecodePosition() {
         return bytecodePosition;
     }
 
     /**
-     * @return The reference map for the registers at this point. The reference map is <i>packed</i> in that
-     * for bit {@code k} in byte {@code n}, it refers to the register whose
-     * {@linkplain Register#number number} is {@code (k + n * 8)}.
+     * @return The reference map for the registers at this point. The reference map is <i>packed</i>
+     *         in that for bit {@code k} in byte {@code n}, it refers to the register whose
+     *         {@linkplain Register#number number} is {@code (k + n * 8)}.
      */
     public BitSet getRegisterRefMap() {
         return registerRefMap;
     }
 
     /**
-     * @return The reference map for the stack frame at this point. A set bit at {@code k} in the map
-     * represents stack slot number {@code k}.
+     * @return The reference map for the stack frame at this point. A set bit at {@code k} in the
+     *         map represents stack slot number {@code k}.
      */
     public BitSet getFrameRefMap() {
         return frameRefMap;