Mercurial > hg > truffle
changeset 19022:859ee5dad32c
Pass StackSlotAllocator to FrameMapBuilder.buildFrameMap().
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Wed, 03 Dec 2014 22:55:03 +0100 |
parents | 252067cb86ad |
children | 0be248fb42b2 |
files | graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java |
diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Dec 03 22:55:03 2014 +0100 @@ -157,7 +157,7 @@ } try (Scope s1 = Debug.scope("BuildFrameMap")) { // build frame map - lirGenRes.buildFrameMap(); + lirGenRes.buildFrameMap(new SimpleStackSlotAllocator()); Debug.dump(lir, "After FrameMap building"); } try (Scope s1 = Debug.scope("MarkLocations")) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Dec 03 22:55:03 2014 +0100 @@ -357,7 +357,7 @@ try (Scope s1 = Debug.scope("BuildFrameMap")) { // build frame map - lirGenRes.buildFrameMap(); + lirGenRes.buildFrameMap(new SimpleStackSlotAllocator()); Debug.dump(lir, "After FrameMap building"); } try (Scope s1 = Debug.scope("MarkLocations")) {
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java Wed Dec 03 22:55:03 2014 +0100 @@ -75,5 +75,5 @@ * Creates a {@linkplain FrameMap} based on the information collected by this * {@linkplain FrameMapBuilder}. */ - FrameMap buildFrameMap(LIRGenerationResult result); + FrameMap buildFrameMap(LIRGenerationResult result, StackSlotAllocator allocator); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Dec 03 22:55:03 2014 +0100 @@ -89,8 +89,8 @@ calls.add(cc); } - public FrameMap buildFrameMap(LIRGenerationResult res) { - new SimpleStackSlotAllocator().allocateStackSlots(this, res); + public FrameMap buildFrameMap(LIRGenerationResult res, StackSlotAllocator allocator) { + allocator.allocateStackSlots(this, res); for (CallingConvention cc : calls) { frameMap.callsMethod(cc); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java Wed Dec 03 22:55:03 2014 +0100 @@ -31,7 +31,7 @@ * Returns the {@link FrameMapBuilder} for collecting the information to build a * {@link FrameMap}. * - * This method can only be used prior calling {@link #buildFrameMap()}. + * This method can only be used prior calling {@link #buildFrameMap}. */ FrameMapBuilder getFrameMapBuilder(); @@ -41,12 +41,12 @@ * * @see FrameMapBuilder#buildFrameMap */ - void buildFrameMap(); + void buildFrameMap(StackSlotAllocator allocator); /** * Returns the {@link FrameMap} associated with this {@link LIRGenerationResult}. * - * This method can only be called after {@link #buildFrameMap()}. + * This method can only be called after {@link #buildFrameMap}. */ FrameMap getFrameMap();
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java Wed Dec 03 20:34:57 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java Wed Dec 03 22:55:03 2014 +0100 @@ -59,9 +59,9 @@ return frameMapBuilder; } - public void buildFrameMap() { + public void buildFrameMap(StackSlotAllocator allocator) { assert frameMap == null : "buildFrameMap() can only be called once!"; - frameMap = frameMapBuilder.buildFrameMap(this); + frameMap = frameMapBuilder.buildFrameMap(this, allocator); } public FrameMap getFrameMap() {