# HG changeset patch # User Roland Schatz # Date 1366705794 -7200 # Node ID 8e7dc0023b04a540fd6e19340285e049caa2e9e3 # Parent 3370b7abcc6e699cb0167293cf2407fece433fa3 Rename generateLea to generateAddress. diff -r 3370b7abcc6e -r 8e7dc0023b04 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Apr 23 09:41:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AddLocationNode.java Tue Apr 23 10:29:54 2013 +0200 @@ -86,20 +86,20 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { - Value xAddr = getX().generateLea(gen, base); - return getY().generateLea(gen, xAddr); + public Value generateAddress(LIRGeneratorTool gen, Value base) { + Value xAddr = getX().generateAddress(gen, base); + return getY().generateAddress(gen, xAddr); } @Override public Value generateLoad(LIRGeneratorTool gen, Value base, DeoptimizingNode deopting) { - Value xAddr = getX().generateLea(gen, base); + Value xAddr = getX().generateAddress(gen, base); return getY().generateLoad(gen, xAddr, deopting); } @Override public void generateStore(LIRGeneratorTool gen, Value base, Value value, DeoptimizingNode deopting) { - Value xAddr = getX().generateLea(gen, base); + Value xAddr = getX().generateAddress(gen, base); getY().generateStore(gen, xAddr, value, deopting); } diff -r 3370b7abcc6e -r 8e7dc0023b04 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Tue Apr 23 09:41:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ComputeAddressNode.java Tue Apr 23 10:29:54 2013 +0200 @@ -49,7 +49,7 @@ @Override public void generate(LIRGeneratorTool gen) { - Value addr = getLocation().generateLea(gen, gen.operand(getObject())); + Value addr = getLocation().generateAddress(gen, gen.operand(getObject())); gen.setResult(this, addr); } } diff -r 3370b7abcc6e -r 8e7dc0023b04 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Tue Apr 23 09:41:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ConstantLocationNode.java Tue Apr 23 10:29:54 2013 +0200 @@ -55,7 +55,7 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { + public Value generateAddress(LIRGeneratorTool gen, Value base) { return gen.emitLea(base, displacement(), Value.ILLEGAL, 0); } diff -r 3370b7abcc6e -r 8e7dc0023b04 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Apr 23 09:41:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/IndexedLocationNode.java Tue Apr 23 10:29:54 2013 +0200 @@ -90,7 +90,7 @@ } @Override - public Value generateLea(LIRGeneratorTool gen, Value base) { + public Value generateAddress(LIRGeneratorTool gen, Value base) { return gen.emitLea(base, displacement, gen.operand(index()), indexScaling()); } diff -r 3370b7abcc6e -r 8e7dc0023b04 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Apr 23 09:41:10 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/LocationNode.java Tue Apr 23 10:29:54 2013 +0200 @@ -99,7 +99,7 @@ // nothing to do... } - public abstract Value generateLea(LIRGeneratorTool gen, Value base); + public abstract Value generateAddress(LIRGeneratorTool gen, Value base); public abstract Value generateLoad(LIRGeneratorTool gen, Value base, DeoptimizingNode deopting);