# HG changeset patch # User Josef Eisl # Date 1395938515 -3600 # Node ID 9c089e418bc9edcb495ceb1c55c76221ccef7b83 # Parent 0d158f22f14cc3e907e72b4b250832db43e185d2 Fix eclipse format. diff -r 0d158f22f14c -r 9c089e418bc9 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Thu Mar 27 17:31:20 2014 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Thu Mar 27 17:41:55 2014 +0100 @@ -782,14 +782,14 @@ private void genReturn(Value x) { // frameState.setRethrowException(false); frameState.clearStack(); -// if (graphBuilderConfig.eagerInfopointMode()) { -// append(new InfopointNode(InfopointReason.METHOD_END, frameState.create(bci()))); -// } + // if (graphBuilderConfig.eagerInfopointMode()) { + // append(new InfopointNode(InfopointReason.METHOD_END, frameState.create(bci()))); + // } -// synchronizedEpilogue(FrameState.AFTER_BCI, x); -// if (frameState.lockDepth() != 0) { -// throw new BailoutException("unbalanced monitors"); -// } + // synchronizedEpilogue(FrameState.AFTER_BCI, x); + // if (frameState.lockDepth() != 0) { + // throw new BailoutException("unbalanced monitors"); + // } // lirGen.visitReturn(x); throw GraalInternalError.unimplemented(); diff -r 0d158f22f14c -r 9c089e418bc9 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java Thu Mar 27 17:31:20 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java Thu Mar 27 17:41:55 2014 +0100 @@ -58,15 +58,6 @@ */ public abstract class NodeLIRGenerator implements NodeLIRGeneratorTool { - public static class Options { - // @formatter:off -// @Option(help = "Print HIR along side LIR as the latter is generated") -// public static final OptionValue PrintIRWithLIR = new OptionValue<>(false); -// @Option(help = "The trace level for the LIR generator") -// public static final OptionValue TraceLIRGeneratorLevel = new OptionValue<>(0); - // @formatter:on - } - private final NodeMap nodeOperands; private final DebugInfoBuilder debugInfoBuilder; @@ -641,24 +632,6 @@ } } -// public abstract void emitJump(LabelRef label); -// -// public abstract void emitCompareBranch(Value left, Value right, Condition cond, boolean -// unorderedIsTrue, LabelRef trueDestination, LabelRef falseDestination, double -// trueDestinationProbability); -// -// public abstract void emitOverflowCheckBranch(LabelRef overflow, LabelRef noOverflow, double -// overflowProbability); -// -// public abstract void emitIntegerTestBranch(Value left, Value right, LabelRef trueDestination, -// LabelRef falseDestination, double trueSuccessorProbability); -// -// public abstract Variable emitConditionalMove(Value leftVal, Value right, Condition cond, boolean -// unorderedIsTrue, Value trueValue, Value falseValue); -// -// public abstract Variable emitIntegerTestMove(Value leftVal, Value right, Value trueValue, Value -// falseValue); - @Override public void emitInvoke(Invoke x) { LoweredCallTargetNode callTarget = (LoweredCallTargetNode) x.callTarget(); diff -r 0d158f22f14c -r 9c089e418bc9 graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Mar 27 17:31:20 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Thu Mar 27 17:41:55 2014 +0100 @@ -87,7 +87,7 @@ // public ArrayList successors = new ArrayList<>(2); // public ArrayList predecessors = new ArrayList<>(2); // only used in the -// baseline + // baseline public long exits;