Mercurial > hg > truffle
changeset 14950:d5a1206e1923
NodeLIRBuilderTool: fix typo in interface name.
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Wed Apr 02 17:53:06 2014 +0200 @@ -52,7 +52,7 @@ /** * This class traverses the HIR instructions and generates LIR instructions from them. */ -public abstract class NodeLIRBuilder implements NodeLIRBuiderTool { +public abstract class NodeLIRBuilder implements NodeLIRBuilderTool { private final NodeMap<Value> nodeOperands; private final DebugInfoBuilder debugInfoBuilder;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenResLowerable.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/LIRGenResLowerable.java Wed Apr 02 17:53:06 2014 +0200 @@ -32,5 +32,5 @@ */ public interface LIRGenResLowerable { - void generate(NodeLIRBuiderTool generator, LIRGenerationResult genRes); + void generate(NodeLIRBuilderTool generator, LIRGenerationResult genRes); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Wed Apr 02 17:53:06 2014 +0200 @@ -47,7 +47,7 @@ private final HotSpotVMConfig config; - public AMD64HotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, NodeLIRBuiderTool tool) { + public AMD64HotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, NodeLIRBuilderTool tool) { this.state = state; this.config = config; if (isPollingPageFar(config) || ImmutableCode.getValue()) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Wed Apr 02 17:53:06 2014 +0200 @@ -31,7 +31,7 @@ /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition - * to abstract methods from {@link LIRGenerator} and {@link NodeLIRBuiderTool}. + * to abstract methods from {@link LIRGenerator} and {@link NodeLIRBuilderTool}. */ public interface HotSpotLIRGenerator {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotNodeLIRBuilder.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotNodeLIRBuilder.java Wed Apr 02 17:53:06 2014 +0200 @@ -29,7 +29,7 @@ /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition - * to abstract methods from {@link LIRGenerator} and {@link NodeLIRBuiderTool}. + * to abstract methods from {@link LIRGenerator} and {@link NodeLIRBuilderTool}. */ public interface HotSpotNodeLIRBuilder {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/AllocaNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -58,7 +58,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { StackSlot array = res.getFrameMap().allocateStackSlots(slots, objects, null); Value result = gen.getLIRGeneratorTool().emitAddress(array); gen.setResult(this, result);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CStringNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -45,7 +45,7 @@ gen.setResult(this, emitCString(gen, string)); } - public static AllocatableValue emitCString(NodeLIRBuiderTool gen, String value) { + public static AllocatableValue emitCString(NodeLIRBuilderTool gen, String value) { AllocatableValue dst = gen.getLIRGeneratorTool().newVariable(gen.getLIRGeneratorTool().target().wordKind); gen.getLIRGeneratorTool().emitData(dst, toCString(value)); return dst;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CompressionNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -103,7 +103,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { HotSpotLIRGenerator hsGen = (HotSpotLIRGenerator) gen.getLIRGeneratorTool(); Value result; switch (op) {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -41,7 +41,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Register rawThread = ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).getProviders().getRegisters().getThreadRegister(); gen.setResult(this, rawThread.asValue(this.getKind())); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentLockNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -42,7 +42,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { assert lockDepth != -1; HotSpotLIRGenerator hsGen = (HotSpotLIRGenerator) gen.getLIRGeneratorTool(); StackSlot slot = hsGen.getLockSlot(lockDepth);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -45,7 +45,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ((HotSpotLIRGenerator) gen.getLIRGeneratorTool()).emitDeoptimizeCaller(action, reason); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DimensionsNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -48,7 +48,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { int size = rank * 4; int wordSize = gen.getLIRGeneratorTool().target().wordSize; int slots = roundUp(size, wordSize) / wordSize;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/EndLockScopeNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -49,7 +49,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { } @NodeIntrinsic
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -45,7 +45,7 @@ public static native long get(Object array); @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { AllocatableValue obj = gen.getLIRGeneratorTool().newVariable(gen.getLIRGeneratorTool().target().wordKind); gen.getLIRGeneratorTool().emitMove(obj, gen.operand(object)); gen.setResult(this, obj);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -46,7 +46,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ((HotSpotNodeLIRBuilder) gen).emitJumpToExceptionHandlerInCaller(handlerInCallerPc, exception, exceptionPc); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/MonitorCounterNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -42,7 +42,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { assert graph().getNodes().filter(MonitorCounterNode.class).count() == 1 : "monitor counters not canonicalized to single instance"; StackSlot counter = res.getFrameMap().allocateStackSlots(1, new BitSet(0), null); Value result = gen.getLIRGeneratorTool().emitAddress(counter);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewInstanceStubCall.java Wed Apr 02 17:53:06 2014 +0200 @@ -57,7 +57,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(NEW_INSTANCE); Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, this, gen.operand(hub)); gen.setResult(this, result);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Wed Apr 02 17:53:06 2014 +0200 @@ -61,7 +61,7 @@ } @Override - protected Value[] operands(NodeLIRBuiderTool gen) { + protected Value[] operands(NodeLIRBuilderTool gen) { return new Value[]{gen.operand(hub), Constant.forInt(rank), gen.operand(dims)}; }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -41,7 +41,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ((HotSpotNodeLIRBuilder) gen).emitPatchReturnAddress(address); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -57,7 +57,7 @@ return foreignCalls.getKilledLocations(descriptor); } - protected Value[] operands(NodeLIRBuiderTool gen) { + protected Value[] operands(NodeLIRBuilderTool gen) { Value[] operands = new Value[arguments.size()]; for (int i = 0; i < operands.length; i++) { operands[i] = gen.operand(arguments.get(i)); @@ -66,7 +66,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { assert graph().start() instanceof StubStartNode; ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(descriptor); Value[] operands = operands(gen);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/TailcallNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -58,7 +58,7 @@ this.frameState = frameState; } - public void generate(NodeLIRBuiderTool gen, LIRGenerationResult res) { + public void generate(NodeLIRBuilderTool gen, LIRGenerationResult res) { HotSpotVMConfig config = runtime().getConfig(); ResolvedJavaMethod method = frameState.method(); boolean isStatic = Modifier.isStatic(method.getModifiers());
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/VMErrorNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -49,7 +49,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { String whereString; if (stateBefore() != null) { String nl = CodeUtil.NEW_LINE;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -128,7 +128,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // nop }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -35,7 +35,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitEndNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -54,7 +54,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitBreakpointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -54,7 +54,7 @@ public abstract String targetName(); @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // nop } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -120,7 +120,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { assert ConstantNodeRecordsUsages : "LIR generator should generate constants per-usage"; if (gen.getLIRGeneratorTool().canInlineConstant(value) || onlyUsedInVirtualState()) { gen.setResult(this, value);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -62,7 +62,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.getLIRGeneratorTool().emitDeoptimize(gen.getLIRGeneratorTool().getMetaAccess().encodeDeoptActionAndReason(action, reason, debugId), speculation, this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -54,7 +54,7 @@ return getSpeculation(); } - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.getLIRGeneratorTool().emitDeoptimize(generator.operand(actionAndReason), generator.operand(speculation), this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -38,7 +38,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { throw new GraalInternalError("OnStackReplacementNode should not survive"); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -53,7 +53,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { if (object.getKind() != Kind.Void && object.getKind() != Kind.Illegal) { generator.setResult(this, generator.operand(object)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -127,7 +127,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.emitIf(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -41,7 +41,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.visitInfopointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -113,7 +113,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.emitInvoke(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -133,7 +133,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.emitInvoke(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -68,7 +68,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { // nothing to do } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -98,7 +98,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // Nothing to emit, since this is node is used for structural purposes only. }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -64,7 +64,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitLoopEnd(this); super.generate(gen); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -42,7 +42,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -41,7 +41,7 @@ @Input(notDataflow = true) private final NodeInputList<AbstractEndNode> ends = new NodeInputList<>(this); @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitMerge(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -62,7 +62,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { if (object.getKind() != Kind.Void && object.getKind() != Kind.Illegal) { generator.setResult(this, generator.operand(object)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -57,7 +57,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { if (this.result() == null) { gen.getLIRGeneratorTool().emitReturn(null); } else {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -35,7 +35,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitSafepointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -49,7 +49,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.getLIRGeneratorTool().emitUnwind(gen.operand(exception())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/AndNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -81,7 +81,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitAnd(gen.operand(x()), gen.operand(y()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -75,7 +75,7 @@ public abstract boolean unorderedIsTrue(); @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { } private LogicNode optimizeConditional(Constant constant, ConditionalNode conditionalNode, ConstantReflectionProvider constantReflection, Condition cond) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -109,7 +109,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.emitConditional(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatAddNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -65,7 +65,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value op1 = gen.operand(x()); Value op2 = gen.operand(y()); if (!y().isConstant() && !livesLonger(this, y(), gen)) { @@ -76,7 +76,7 @@ gen.setResult(this, gen.getLIRGeneratorTool().emitAdd(op1, op2)); } - public static boolean livesLonger(ValueNode after, ValueNode value, NodeLIRBuiderTool gen) { + public static boolean livesLonger(ValueNode after, ValueNode value, NodeLIRBuilderTool gen) { for (Node usage : value.usages()) { if (usage != after && usage instanceof ValueNode && gen.hasOperand(((ValueNode) usage))) { return true;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatConvertNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -201,7 +201,7 @@ tool.getLowerer().lower(this, tool); } - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitFloatConvert(op, gen.operand(getInput()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatDivNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -57,7 +57,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitDiv(gen.operand(x()), gen.operand(y()), null)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatMulNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -60,7 +60,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value op1 = gen.operand(x()); Value op2 = gen.operand(y()); if (!y().isConstant() && !FloatAddNode.livesLonger(this, y(), gen)) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatRemNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -57,7 +57,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitRem(gen.operand(x()), gen.operand(y()), null)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/FloatSubNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -76,7 +76,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitSub(gen.operand(x()), gen.operand(y()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerAddNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -89,7 +89,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value op1 = gen.operand(x()); assert op1 != null : x() + ", this=" + this; Value op2 = gen.operand(y());
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -106,7 +106,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitDiv(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerMulNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -75,7 +75,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value op1 = gen.operand(x()); Value op2 = gen.operand(y()); if (!y().isConstant() && !FloatAddNode.livesLonger(this, y(), gen)) {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -61,7 +61,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitRem(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerSubNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -117,7 +117,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitSub(gen.operand(x()), gen.operand(y()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -60,7 +60,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -50,7 +50,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // Nothing to do. }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/LeftShiftNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -92,7 +92,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitShl(gen.operand(x()), gen.operand(y()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NarrowNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -110,7 +110,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitNarrow(gen.operand(getInput()), getResultBits())); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NegateNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -88,7 +88,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitNegate(gen.operand(x()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/NotNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -73,7 +73,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitNot(gen.operand(x()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/OrNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -73,7 +73,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitOr(gen.operand(x()), gen.operand(y()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ReinterpretNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -102,7 +102,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { PlatformKind kind = gen.getLIRGeneratorTool().getPlatformKind(stamp()); gen.setResult(this, gen.getLIRGeneratorTool().emitReinterpret(kind, gen.operand(value()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/RightShiftNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -98,7 +98,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitShr(gen.operand(x()), gen.operand(y()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/SignExtendNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -105,7 +105,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitSignExtend(gen.operand(getInput()), getInputBits(), getResultBits())); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -71,7 +71,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitUDiv(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -70,7 +70,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitURem(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRightShiftNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -92,7 +92,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitUShr(gen.operand(x()), gen.operand(y()))); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/XorNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -72,7 +72,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitXor(gen.operand(x()), gen.operand(y()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ZeroExtendNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -85,7 +85,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitZeroExtend(gen.operand(getInput()), getInputBits(), getResultBits())); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -107,7 +107,7 @@ } @Override - public Value generateAddress(NodeLIRBuiderTool gen, Value base) { + public Value generateAddress(NodeLIRBuilderTool gen, Value base) { Value xAddr = getX().generateAddress(gen, base); return getY().generateAddress(gen, xAddr); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -48,7 +48,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value addr = getLocation().generateAddress(gen, gen.operand(getObject())); gen.setResult(this, addr); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -65,7 +65,7 @@ } @Override - public Value generateAddress(NodeLIRBuiderTool gen, Value base) { + public Value generateAddress(NodeLIRBuilderTool gen, Value base) { return gen.getLIRGeneratorTool().emitAddress(base, getDisplacement(), Value.ILLEGAL, 0); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -49,7 +49,7 @@ public static native <T> T getObject(Object object); @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.setResult(this, generator.operand(object)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -60,7 +60,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value address = location().generateAddress(gen, gen.operand(object())); PlatformKind readKind = gen.getLIRGeneratorTool().getPlatformKind(stamp()); gen.setResult(this, gen.getLIRGeneratorTool().emitLoad(readKind, address, this));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -82,7 +82,7 @@ return foreignCalls.getKilledLocations(descriptor); } - protected Value[] operands(NodeLIRBuiderTool gen) { + protected Value[] operands(NodeLIRBuilderTool gen) { Value[] operands = new Value[arguments.size()]; for (int i = 0; i < operands.length; i++) { operands[i] = gen.operand(arguments.get(i)); @@ -91,7 +91,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(descriptor); Value[] operands = operands(gen); Value result = gen.getLIRGeneratorTool().emitForeignCall(linkage, this, operands);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -96,7 +96,7 @@ } @Override - public Value generateAddress(NodeLIRBuiderTool gen, Value base) { + public Value generateAddress(NodeLIRBuilderTool gen, Value base) { return gen.getLIRGeneratorTool().emitAddress(base, displacement, gen.operand(getIndex()), getIndexScaling()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -101,7 +101,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.emitSwitch(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -56,9 +56,9 @@ public abstract LocationIdentity getLocationIdentity(); @Override - public final void generate(NodeLIRBuiderTool generator) { + public final void generate(NodeLIRBuilderTool generator) { // nothing to do... } - public abstract Value generateAddress(NodeLIRBuiderTool gen, Value base); + public abstract Value generateAddress(NodeLIRBuilderTool gen, Value base); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -56,7 +56,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.getLIRGeneratorTool().emitMembar(barriers); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -40,7 +40,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.emitNullCheck(object, this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -53,7 +53,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value address = location().generateAddress(gen, gen.operand(object())); PlatformKind readKind = gen.getLIRGeneratorTool().getPlatformKind(stamp()); gen.setResult(this, gen.getLIRGeneratorTool().emitLoad(readKind, address, this));
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -100,7 +100,7 @@ } @Override - public Value generateAddress(NodeLIRBuiderTool gen, Value base) { + public Value generateAddress(NodeLIRBuilderTool gen, Value base) { throw new GraalInternalError("locationIdentity must be a constant so that this node can be canonicalized: " + locationIdentity); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -94,7 +94,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { assert getKind() == Kind.Object && object.getKind() == Kind.Object; /* * The LIR only cares about the kind of an operand, not the actual type of an object. So we
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -42,7 +42,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // Nothing to emit, since this node is used for structural purposes only. }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -43,7 +43,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value address = location().generateAddress(gen, gen.operand(object())); // It's possible a constant was forced for other usages so inspect the value directly and // use a constant if it can be directly stored.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -72,7 +72,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.visitCompareAndSwap(this, location().generateAddress(gen, gen.operand(object()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -49,7 +49,7 @@ this.lockDepth = lockDepth; } - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { // nothing to do } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -51,7 +51,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { ForeignCallLinkage linkage = gen.getLIRGeneratorTool().getForeignCalls().lookupForeignCall(REGISTER_FINALIZER); gen.getLIRGeneratorTool().emitForeignCall(linkage, this, gen.operand(object())); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -29,7 +29,7 @@ import com.oracle.graal.graph.GraalInternalError; import com.oracle.graal.graph.NodeInputList; import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.spi.NodeLIRBuiderTool; +import com.oracle.graal.nodes.spi.NodeLIRBuilderTool; import com.oracle.graal.nodes.spi.Lowerable; import com.oracle.graal.nodes.spi.LoweringTool; @@ -78,7 +78,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { throw GraalInternalError.shouldNotReachHere("should have replaced itself"); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -92,7 +92,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.emitSwitch(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/ArithmeticLIRLowerable.java Wed Apr 02 17:53:06 2014 +0200 @@ -26,5 +26,5 @@ public interface ArithmeticLIRLowerable extends ArithmeticOperation { - void generate(NodeLIRBuiderTool gen); + void generate(NodeLIRBuilderTool gen); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRLowerable.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRLowerable.java Wed Apr 02 17:53:06 2014 +0200 @@ -24,5 +24,5 @@ public interface LIRLowerable { - void generate(NodeLIRBuiderTool generator); + void generate(NodeLIRBuilderTool generator); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuiderTool.java Wed Apr 02 16:52:47 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.nodes.spi; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.api.meta.*; -import com.oracle.graal.nodes.*; -import com.oracle.graal.nodes.calc.*; -import com.oracle.graal.nodes.extended.*; -import com.oracle.graal.nodes.java.*; - -public interface NodeLIRBuiderTool extends NodeMappableLIRBuilder { - - void emitNullCheck(ValueNode v, DeoptimizingNode deopting); - - void emitIf(IfNode i); - - void emitConditional(ConditionalNode i); - - void emitSwitch(SwitchNode i); - - void emitInvoke(Invoke i); - - // Handling of block-end nodes still needs to be unified in the LIRGenerator. - void visitMerge(MergeNode i); - - void visitEndNode(AbstractEndNode i); - - void visitLoopEnd(LoopEndNode i); - - void visitCompareAndSwap(LoweredCompareAndSwapNode i, Value address); - - // These methods define the contract a runtime specific backend must provide. - - void visitSafepointNode(SafepointNode i); - - void visitBreakpointNode(BreakpointNode i); - - void visitInfopointNode(InfopointNode i); - - LIRGeneratorTool getLIRGeneratorTool(); - - void emitOverflowCheckBranch(AbstractBeginNode overflowSuccessor, AbstractBeginNode next, double probability); - - Value[] visitInvokeArguments(CallingConvention cc, Collection<ValueNode> arguments); - - MemoryArithmeticLIRLowerer getMemoryLowerer(); -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeLIRBuilderTool.java Wed Apr 02 17:53:06 2014 +0200 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.nodes.spi; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.api.meta.*; +import com.oracle.graal.nodes.*; +import com.oracle.graal.nodes.calc.*; +import com.oracle.graal.nodes.extended.*; +import com.oracle.graal.nodes.java.*; + +public interface NodeLIRBuilderTool extends NodeMappableLIRBuilder { + + void emitNullCheck(ValueNode v, DeoptimizingNode deopting); + + void emitIf(IfNode i); + + void emitConditional(ConditionalNode i); + + void emitSwitch(SwitchNode i); + + void emitInvoke(Invoke i); + + // Handling of block-end nodes still needs to be unified in the LIRGenerator. + void visitMerge(MergeNode i); + + void visitEndNode(AbstractEndNode i); + + void visitLoopEnd(LoopEndNode i); + + void visitCompareAndSwap(LoweredCompareAndSwapNode i, Value address); + + // These methods define the contract a runtime specific backend must provide. + + void visitSafepointNode(SafepointNode i); + + void visitBreakpointNode(BreakpointNode i); + + void visitInfopointNode(InfopointNode i); + + LIRGeneratorTool getLIRGeneratorTool(); + + void emitOverflowCheckBranch(AbstractBeginNode overflowSuccessor, AbstractBeginNode next, double probability); + + Value[] visitInvokeArguments(CallingConvention cc, Collection<ValueNode> arguments); + + MemoryArithmeticLIRLowerer getMemoryLowerer(); +}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -56,7 +56,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // nothing to do... }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -91,7 +91,7 @@ public abstract ValueNode getMaterializedRepresentation(FixedNode fixed, ValueNode[] entries, LockState locks); @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { // nothing to do... } }
--- a/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64FloatConvertNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -51,7 +51,7 @@ throw GraalInternalError.shouldNotReachHere(); } - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitFloatConvert(op, gen.operand(value))); } }
--- a/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements.hsail/src/com/oracle/graal/replacements/hsail/HSAILMathIntrinsicsNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -85,7 +85,7 @@ * Generates the LIR instructions for the math operation represented by this node. */ @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value input = gen.operand(getParameter()); Value result; switch (operation()) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -46,7 +46,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { gen.setResult(this, gen.getLIRGeneratorTool().emitLoad(readKind, gen.operand(address), null)); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -48,7 +48,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value v = gen.operand(value); gen.getLIRGeneratorTool().emitStore(kind, gen.operand(address), v, null); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MathIntrinsicNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MathIntrinsicNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -61,7 +61,7 @@ } @Override - public void generate(NodeLIRBuiderTool gen) { + public void generate(NodeLIRBuilderTool gen) { Value input = gen.operand(x()); Value result; switch (operation()) {
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/ReadRegisterNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -74,7 +74,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { Value result = register.asValue(getKind()); if (incoming) { generator.getLIRGeneratorTool().emitIncomingValues(new Value[]{result});
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -52,7 +52,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { Value val = generator.operand(value); generator.getLIRGeneratorTool().emitMove(register.asValue(val.getKind()), val); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(NodeLIRBuiderTool gen) { + protected Value generateArithmetic(NodeLIRBuilderTool gen) { return gen.getLIRGeneratorTool().emitAdd(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -70,12 +70,12 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { generator.setResult(this, generateArithmetic(generator)); generator.emitOverflowCheckBranch(getOverflowSuccessor(), getNext(), probability(getOverflowSuccessor())); } - protected abstract Value generateArithmetic(NodeLIRBuiderTool generator); + protected abstract Value generateArithmetic(NodeLIRBuilderTool generator); static void lower(LoweringTool tool, IntegerExactArithmeticNode node) { if (node.asNode().graph().getGuardsStage() == StructuredGraph.GuardsStage.FIXED_DEOPTS) {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(NodeLIRBuiderTool gen) { + protected Value generateArithmetic(NodeLIRBuilderTool gen) { return gen.getLIRGeneratorTool().emitMul(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(NodeLIRBuiderTool gen) { + protected Value generateArithmetic(NodeLIRBuilderTool gen) { return gen.getLIRGeneratorTool().emitSub(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Wed Apr 02 16:52:47 2014 +0200 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Wed Apr 02 17:53:06 2014 +0200 @@ -67,7 +67,7 @@ } @Override - public void generate(NodeLIRBuiderTool generator) { + public void generate(NodeLIRBuilderTool generator) { assert getKind() != input.getKind(); assert generator.getLIRGeneratorTool().target().getSizeInBytes(getKind()) == generator.getLIRGeneratorTool().target().getSizeInBytes(input.getKind());