Mercurial > hg > graal-compiler
changeset 14836:1cf373d2b415
Rename LIRGeneratorTool to NodeBasedLIRGeneratorTool.
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Tue Mar 25 15:37:02 2014 +0100 @@ -58,7 +58,7 @@ /** * This class traverses the HIR instructions and generates LIR instructions from them. */ -public abstract class LIRGenerator implements LIRGeneratorTool, LIRTypeTool, LIRGeneratorCommon, NodeBasedLIRGenerator, BaselineLIRGenerator { +public abstract class LIRGenerator implements NodeBasedLIRGeneratorTool, LIRTypeTool, LIRGeneratorCommon, NodeBasedLIRGenerator, BaselineLIRGenerator { public static class Options { // @formatter:off
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java Tue Mar 25 15:37:02 2014 +0100 @@ -47,7 +47,7 @@ private final HotSpotVMConfig config; - public AMD64HotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, LIRGeneratorTool tool) { + public AMD64HotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, NodeBasedLIRGeneratorTool tool) { this.state = state; this.config = config; if (isPollingPageFar(config) || ImmutableCode.getValue()) {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotSafepointOp.java Tue Mar 25 15:37:02 2014 +0100 @@ -46,7 +46,7 @@ private final HotSpotVMConfig config; - public SPARCHotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, LIRGeneratorTool tool) { + public SPARCHotSpotSafepointOp(LIRFrameState state, HotSpotVMConfig config, NodeBasedLIRGeneratorTool tool) { this.state = state; this.config = config; temp = tool.newVariable(tool.target().wordKind);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotLIRGenerator.java Tue Mar 25 15:37:02 2014 +0100 @@ -32,7 +32,7 @@ /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition - * to abstract methods from {@link LIRGenerator} and {@link LIRGeneratorTool}. + * to abstract methods from {@link LIRGenerator} and {@link NodeBasedLIRGeneratorTool}. */ public interface HotSpotLIRGenerator {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/CurrentJavaThreadNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -41,7 +41,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { Register rawThread = ((HotSpotLIRGenerator) gen).getProviders().getRegisters().getThreadRegister(); gen.setResult(this, rawThread.asValue(this.getKind())); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizeCallerNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -45,7 +45,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { ((HotSpotLIRGenerator) gen).emitDeoptimizeCaller(action, reason); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/GetObjectAddressNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -45,7 +45,7 @@ public static native long get(Object array); @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { AllocatableValue obj = gen.newVariable(gen.target().wordKind); gen.emitMove(obj, gen.operand(object)); gen.setResult(this, obj);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -46,7 +46,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { ((HotSpotLIRGenerator) gen).emitJumpToExceptionHandlerInCaller(handlerInCallerPc, exception, exceptionPc); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/NewMultiArrayStubCall.java Tue Mar 25 15:37:02 2014 +0100 @@ -61,7 +61,7 @@ } @Override - protected Value[] operands(LIRGeneratorTool gen) { + protected Value[] operands(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/PatchReturnAddressNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -41,7 +41,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { ((HotSpotLIRGenerator) gen).emitPatchReturnAddress(address); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -57,7 +57,7 @@ return foreignCalls.getKilledLocations(descriptor); } - protected Value[] operands(LIRGeneratorTool gen) { + protected Value[] operands(NodeBasedLIRGeneratorTool 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(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { assert graph().start() instanceof StubStartNode; ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(descriptor); Value[] operands = operands(gen);
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArrayEqualsOp.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64ArrayEqualsOp.java Tue Mar 25 15:37:02 2014 +0100 @@ -62,7 +62,7 @@ @Temp({REG}) protected Value vectorTemp1; @Temp({REG}) protected Value vectorTemp2; - public AMD64ArrayEqualsOp(LIRGeneratorTool tool, Kind kind, Value result, Value array1, Value array2, Value length) { + public AMD64ArrayEqualsOp(NodeBasedLIRGeneratorTool tool, Kind kind, Value result, Value array1, Value array2, Value length) { this.kind = kind; Class<?> arrayClass = Array.newInstance(kind.toJavaClass(), 0).getClass();
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java Tue Mar 25 15:37:02 2014 +0100 @@ -238,7 +238,7 @@ @Def({REG}) protected Value scratch2; @State protected LIRFrameState state; - public RemOp(SPARCArithmetic opcode, Value result, Value x, Value y, LIRFrameState state, LIRGeneratorTool gen) { + public RemOp(SPARCArithmetic opcode, Value result, Value x, Value y, LIRFrameState state, NodeBasedLIRGeneratorTool gen) { this.opcode = opcode; this.result = result; this.x = x;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCBitManipulationOp.java Tue Mar 25 15:37:02 2014 +0100 @@ -47,7 +47,7 @@ @Use({REG}) protected AllocatableValue input; @Def({REG}) protected Value scratch; - public SPARCBitManipulationOp(IntrinsicOpcode opcode, AllocatableValue result, AllocatableValue input, LIRGeneratorTool gen) { + public SPARCBitManipulationOp(IntrinsicOpcode opcode, AllocatableValue result, AllocatableValue input, NodeBasedLIRGeneratorTool gen) { this.opcode = opcode; this.result = result; this.input = input;
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -128,7 +128,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { // nop }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -35,7 +35,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitEndNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/BreakpointNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -54,7 +54,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitBreakpointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/CallTargetNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -54,7 +54,7 @@ public abstract String targetName(); @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { // nop } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ConstantNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -120,7 +120,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { assert ConstantNodeRecordsUsages : "LIR generator should generate constants per-usage"; if (gen.canInlineConstant(value) || onlyUsedInVirtualState()) { gen.setResult(this, value);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizeNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -62,7 +62,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitDeoptimize(gen.getMetaAccess().encodeDeoptActionAndReason(action, reason, debugId), speculation, this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DynamicDeoptimizeNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -54,7 +54,7 @@ return getSpeculation(); } - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.emitDeoptimize(generator.operand(actionAndReason), generator.operand(speculation), this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/EntryMarkerNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -38,7 +38,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { throw new GraalInternalError("OnStackReplacementNode should not survive"); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardedValueNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -53,7 +53,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/IfNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -126,7 +126,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitIf(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InfopointNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -41,7 +41,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.visitInfopointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -113,7 +113,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitInvoke(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -133,7 +133,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitInvoke(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LogicConstantNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -68,7 +68,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { // nothing to do } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopBeginNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -98,7 +98,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/LoopEndNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -64,7 +64,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitLoopEnd(this); super.generate(gen); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -42,7 +42,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MergeNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -41,7 +41,7 @@ @Input(notDataflow = true) private final NodeInputList<AbstractEndNode> ends = new NodeInputList<>(this); @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitMerge(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/PiNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -62,7 +62,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/ReturnNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -57,7 +57,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitReturn(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SafepointNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -35,7 +35,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitSafepointNode(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/UnwindNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -49,7 +49,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitUnwind(gen.operand(exception())); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -74,7 +74,7 @@ public abstract boolean unorderedIsTrue(); @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -109,7 +109,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.emitConditional(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerDivNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -106,7 +106,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.setResult(this, gen.emitDiv(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerRemNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -61,7 +61,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.setResult(this, gen.emitRem(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IntegerTestNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -59,7 +59,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { } @Override
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/IsNullNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -50,7 +50,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { // Nothing to do. }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedDivNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -71,7 +71,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.setResult(this, gen.emitUDiv(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/UnsignedRemNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -70,7 +70,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.setResult(this, gen.emitURem(gen.operand(x()), gen.operand(y()), this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -107,7 +107,7 @@ } @Override - public Value generateAddress(LIRGeneratorTool gen, Value base) { + public Value generateAddress(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -48,7 +48,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -65,7 +65,7 @@ } @Override - public Value generateAddress(LIRGeneratorTool gen, Value base) { + public Value generateAddress(NodeBasedLIRGeneratorTool gen, Value base) { return gen.emitAddress(base, getDisplacement(), Value.ILLEGAL, 0); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FixedValueAnchorNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -49,7 +49,7 @@ public static native <T> T getObject(Object object); @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.setResult(this, generator.operand(object)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -60,7 +60,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { Value address = location().generateAddress(gen, gen.operand(object())); gen.setResult(this, gen.emitLoad(location().getValueKind(), address, this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -82,7 +82,7 @@ return foreignCalls.getKilledLocations(descriptor); } - protected Value[] operands(LIRGeneratorTool gen) { + protected Value[] operands(NodeBasedLIRGeneratorTool 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(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(descriptor); Value[] operands = operands(gen); Value result = gen.emitForeignCall(linkage, this, operands);
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -96,7 +96,7 @@ } @Override - public Value generateAddress(LIRGeneratorTool gen, Value base) { + public Value generateAddress(NodeBasedLIRGeneratorTool gen, Value base) { return gen.emitAddress(base, displacement, gen.operand(getIndex()), getIndexScaling()); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IntegerSwitchNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -101,7 +101,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitSwitch(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -56,9 +56,9 @@ public abstract LocationIdentity getLocationIdentity(); @Override - public final void generate(LIRGeneratorTool generator) { + public final void generate(NodeBasedLIRGeneratorTool generator) { // nothing to do... } - public abstract Value generateAddress(LIRGeneratorTool gen, Value base); + public abstract Value generateAddress(NodeBasedLIRGeneratorTool gen, Value base); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -56,7 +56,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.emitMembar(barriers); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/NullCheckNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -40,7 +40,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { generator.emitNullCheck(object, this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ReadNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -53,7 +53,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { Value address = location().generateAddress(gen, gen.operand(object())); gen.setResult(this, gen.emitLoad(location().getValueKind(), address, this)); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -100,7 +100,7 @@ } @Override - public Value generateAddress(LIRGeneratorTool gen, Value base) { + public Value generateAddress(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeCastNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -94,7 +94,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ValueAnchorNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -41,7 +41,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -89,7 +89,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -72,7 +72,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.visitCompareAndSwap(this, location().generateAddress(gen, gen.operand(object()))); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/MonitorIdNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -49,7 +49,7 @@ this.lockDepth = lockDepth; } - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { // nothing to do } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/RegisterFinalizerNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -51,7 +51,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(REGISTER_FINALIZER); gen.emitForeignCall(linkage, this, gen.operand(object())); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/SelfReplacingMethodCallTargetNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -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.LIRGeneratorTool; +import com.oracle.graal.nodes.spi.NodeBasedLIRGeneratorTool; import com.oracle.graal.nodes.spi.Lowerable; import com.oracle.graal.nodes.spi.LoweringTool; @@ -78,7 +78,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { throw GraalInternalError.shouldNotReachHere("should have replaced itself"); } }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/TypeSwitchNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -92,7 +92,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.emitSwitch(this); }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRGeneratorTool.java Tue Mar 25 14:57:37 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +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 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 LIRGeneratorTool extends NodeMappableArithmeticLIRGenerator { - - TargetDescription target(); - - MetaAccessProvider getMetaAccess(); - - CodeCacheProvider getCodeCache(); - - ForeignCallsProvider getForeignCalls(); - - /** - * Checks whether the supplied constant can be used without loading it into a register for most - * operations, i.e., for commonly used arithmetic, logical, and comparison operations. - * - * @param c The constant to check. - * @return True if the constant can be used directly, false if the constant needs to be in a - * register. - */ - boolean canInlineConstant(Constant c); - - boolean canStoreConstant(Constant c, boolean isCompressed); - - RegisterAttributes attributes(Register register); - - AllocatableValue newVariable(PlatformKind kind); - - AllocatableValue emitMove(Value input); - - void emitMove(AllocatableValue dst, Value src); - - Value emitAddress(Value base, long displacement, Value index, int scale); - - Value emitAddress(StackSlot slot); - - Value emitLoad(Kind kind, Value address, Access access); - - void emitStore(Kind kind, Value address, Value input, Access access); - - void emitMembar(int barriers); - - void emitDeoptimize(Value actionAndReason, Value failedSpeculation, DeoptimizingNode deopting); - - void emitNullCheck(ValueNode v, DeoptimizingNode deopting); - - Value emitForeignCall(ForeignCallLinkage linkage, DeoptimizingNode info, Value... args); - - 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 visitReturn(ReturnNode i); - - void visitSafepointNode(SafepointNode i); - - void visitBreakpointNode(BreakpointNode i); - - void emitUnwind(Value operand); - - /** - * Called just before register allocation is performed on the LIR owned by this generator. - * Overriding implementations of this method must call the overridden method. - */ - void beforeRegisterAllocation(); - - void visitInfopointNode(InfopointNode i); -}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRLowerable.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/LIRLowerable.java Tue Mar 25 15:37:02 2014 +0100 @@ -24,5 +24,5 @@ public interface LIRLowerable { - void generate(LIRGeneratorTool generator); + void generate(NodeBasedLIRGeneratorTool generator); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/NodeBasedLIRGeneratorTool.java Tue Mar 25 15:37:02 2014 +0100 @@ -0,0 +1,112 @@ +/* + * 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 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 NodeBasedLIRGeneratorTool extends NodeMappableArithmeticLIRGenerator { + + TargetDescription target(); + + MetaAccessProvider getMetaAccess(); + + CodeCacheProvider getCodeCache(); + + ForeignCallsProvider getForeignCalls(); + + /** + * Checks whether the supplied constant can be used without loading it into a register for most + * operations, i.e., for commonly used arithmetic, logical, and comparison operations. + * + * @param c The constant to check. + * @return True if the constant can be used directly, false if the constant needs to be in a + * register. + */ + boolean canInlineConstant(Constant c); + + boolean canStoreConstant(Constant c, boolean isCompressed); + + RegisterAttributes attributes(Register register); + + AllocatableValue newVariable(PlatformKind kind); + + AllocatableValue emitMove(Value input); + + void emitMove(AllocatableValue dst, Value src); + + Value emitAddress(Value base, long displacement, Value index, int scale); + + Value emitAddress(StackSlot slot); + + Value emitLoad(Kind kind, Value address, Access access); + + void emitStore(Kind kind, Value address, Value input, Access access); + + void emitMembar(int barriers); + + void emitDeoptimize(Value actionAndReason, Value failedSpeculation, DeoptimizingNode deopting); + + void emitNullCheck(ValueNode v, DeoptimizingNode deopting); + + Value emitForeignCall(ForeignCallLinkage linkage, DeoptimizingNode info, Value... args); + + 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 visitReturn(ReturnNode i); + + void visitSafepointNode(SafepointNode i); + + void visitBreakpointNode(BreakpointNode i); + + void emitUnwind(Value operand); + + /** + * Called just before register allocation is performed on the LIR owned by this generator. + * Overriding implementations of this method must call the overridden method. + */ + void beforeRegisterAllocation(); + + void visitInfopointNode(InfopointNode i); +}
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualArrayNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -56,7 +56,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { // nothing to do... }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/virtual/VirtualObjectNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -91,7 +91,7 @@ public abstract ValueNode getMaterializedRepresentation(FixedNode fixed, ValueNode[] entries, LockState locks); @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { // nothing to do... } }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectReadNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -46,7 +46,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { gen.setResult(this, gen.emitLoad(readKind, gen.operand(address), null)); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/DirectStoreNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -48,7 +48,7 @@ } @Override - public void generate(LIRGeneratorTool gen) { + public void generate(NodeBasedLIRGeneratorTool gen) { Value v = gen.operand(value); gen.emitStore(kind, gen.operand(address), v, null); }
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/WriteRegisterNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -52,7 +52,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { Value val = generator.operand(value); generator.emitMove(register.asValue(val.getKind()), val); }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerAddExactSplitNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(LIRGeneratorTool gen) { + protected Value generateArithmetic(NodeBasedLIRGeneratorTool gen) { return gen.emitAdd(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerExactArithmeticSplitNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -77,7 +77,7 @@ generator.emitOverflowCheckBranch(generator.getLIRBlock(getOverflowSuccessor()), generator.getLIRBlock(getNext()), probability(getOverflowSuccessor())); } - protected abstract Value generateArithmetic(LIRGeneratorTool generator); + protected abstract Value generateArithmetic(NodeBasedLIRGeneratorTool 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 Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerMulExactSplitNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(LIRGeneratorTool gen) { + protected Value generateArithmetic(NodeBasedLIRGeneratorTool gen) { return gen.emitMul(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/nodes/arithmetic/IntegerSubExactSplitNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -34,7 +34,7 @@ } @Override - protected Value generateArithmetic(LIRGeneratorTool gen) { + protected Value generateArithmetic(NodeBasedLIRGeneratorTool gen) { return gen.emitSub(gen.operand(getX()), gen.operand(getY())); } }
--- a/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Tue Mar 25 14:57:37 2014 +0100 +++ b/graal/com.oracle.graal.word/src/com/oracle/graal/word/nodes/WordCastNode.java Tue Mar 25 15:37:02 2014 +0100 @@ -67,7 +67,7 @@ } @Override - public void generate(LIRGeneratorTool generator) { + public void generate(NodeBasedLIRGeneratorTool generator) { assert getKind() != input.getKind(); assert generator.target().getSizeInBytes(getKind()) == generator.target().getSizeInBytes(input.getKind());