# HG changeset patch # User Josef Eisl # Date 1411633625 -7200 # Node ID 730aa0eb20e538da5d04238c1011013a527335b3 # Parent ffb974bef674761753dffa5d2c96ef0627cb23e5 LIRIntrospection: rename forEach*(ValuePositionProcedure) to forEach*Pos. diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest3.java Thu Sep 25 10:27:05 2014 +0200 @@ -127,7 +127,7 @@ LIRInstruction op1 = new TestOp(compValue1); LIRInstruction op2 = new TestOp(compValue1); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -137,7 +137,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -146,7 +146,7 @@ } }); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -154,7 +154,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -172,7 +172,7 @@ LIRInstruction op1 = new TestOp(compValue1); LIRInstruction op2 = new TestOp(compValue1); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -182,7 +182,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -191,7 +191,7 @@ } }); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -199,7 +199,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/CompositeValueReplacementTest4.java Thu Sep 25 10:27:05 2014 +0200 @@ -127,7 +127,7 @@ LIRInstruction op1 = new TestOp(compValue1); LIRInstruction op2 = new TestOp(compValue1); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -137,7 +137,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -146,7 +146,7 @@ } }); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -154,7 +154,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -172,7 +172,7 @@ LIRInstruction op1 = new TestOp(compValue1); LIRInstruction op2 = new TestOp(compValue1); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -182,7 +182,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -191,7 +191,7 @@ } }); - op1.forEachInput(new ValuePositionProcedure() { + op1.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); @@ -199,7 +199,7 @@ } }); - op2.forEachInput(new ValuePositionProcedure() { + op2.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { Value value = position.get(instruction); diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest1.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest1.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest1.java Thu Sep 25 10:27:05 2014 +0200 @@ -117,7 +117,7 @@ List positions = new ArrayList<>(); - op.forEachInput(new ValuePositionProcedure() { + op.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -136,7 +136,7 @@ List positions = new ArrayList<>(); - op.forEachInput(new ValuePositionProcedure() { + op.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { @@ -155,7 +155,7 @@ List positions = new ArrayList<>(); - op.forEachInput(new ValuePositionProcedure() { + op.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest2.java --- a/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest2.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir.test/src/com/oracle/graal/lir/test/ValuePositionTest2.java Thu Sep 25 10:27:05 2014 +0200 @@ -117,7 +117,7 @@ LIRInstruction op = new TestOp(compValue2); List positions = new ArrayList<>(); - op.forEachInput(new ValuePositionProcedure() { + op.forEachInputPos(new ValuePositionProcedure() { @Override public void doValue(LIRInstruction instruction, ValuePosition position) { diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstruction.java Thu Sep 25 10:27:05 2014 +0200 @@ -218,20 +218,20 @@ } // ValuePositionProcedures - public final void forEachInput(ValuePositionProcedure proc) { - instructionClass.forEachUse(this, proc); + public final void forEachInputPos(ValuePositionProcedure proc) { + instructionClass.forEachUsePos(this, proc); } - public final void forEachAlive(ValuePositionProcedure proc) { - instructionClass.forEachAlive(this, proc); + public final void forEachAlivePos(ValuePositionProcedure proc) { + instructionClass.forEachAlivePos(this, proc); } public final void forEachTemp(ValuePositionProcedure proc) { - instructionClass.forEachTemp(this, proc); + instructionClass.forEachTempPos(this, proc); } public final void forEachOutput(ValuePositionProcedure proc) { - instructionClass.forEachDef(this, proc); + instructionClass.forEachDefPos(this, proc); } // InstructionValueProcedures diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRInstructionClass.java Thu Sep 25 10:27:05 2014 +0200 @@ -218,19 +218,19 @@ return false; } - final void forEachUse(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachUsePos(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, uses, OperandMode.USE, proc, ValuePosition.ROOT_VALUE_POSITION); } - final void forEachAlive(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachAlivePos(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, alives, OperandMode.ALIVE, proc, ValuePosition.ROOT_VALUE_POSITION); } - final void forEachTemp(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachTempPos(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, temps, OperandMode.TEMP, proc, ValuePosition.ROOT_VALUE_POSITION); } - final void forEachDef(LIRInstruction obj, ValuePositionProcedure proc) { + final void forEachDefPos(LIRInstruction obj, ValuePositionProcedure proc) { forEach(obj, obj, defs, OperandMode.DEF, proc, ValuePosition.ROOT_VALUE_POSITION); } diff -r ffb974bef674 -r 730aa0eb20e5 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Wed Oct 01 07:39:47 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Thu Sep 25 10:27:05 2014 +0200 @@ -217,8 +217,8 @@ // set instruction id to the index in the lir instruction list inst.setId(opId++); inst.visitEachOutput(loadConsumer); - inst.forEachInput(useProcedure); - inst.forEachAlive(useProcedure); + inst.forEachInputPos(useProcedure); + inst.forEachAlivePos(useProcedure); } }