Mercurial > hg > truffle
changeset 19023:0be248fb42b2
Encapsulate FrameMapBuilderImpl.frameMap.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Thu, 04 Dec 2014 11:15:04 +0100 |
parents | 859ee5dad32c |
children | caa39e9bf2b0 |
files | graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleStackSlotAllocator.java |
diffstat | 4 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Wed Dec 03 22:55:03 2014 +0100 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java Thu Dec 04 11:15:04 2014 +0100 @@ -36,14 +36,14 @@ * runtime for walking/inspecting frames of such methods. */ public StackSlot allocateRBPSpillSlot() { - return ((AMD64FrameMap) frameMap).allocateRBPSpillSlot(); + return ((AMD64FrameMap) getFrameMap()).allocateRBPSpillSlot(); } public void freeRBPSpillSlot() { - ((AMD64FrameMap) frameMap).freeRBPSpillSlot(); + ((AMD64FrameMap) getFrameMap()).freeRBPSpillSlot(); } public StackSlot allocateDeoptimizationRescueSlot() { - return ((AMD64FrameMap) frameMap).allocateDeoptimizationRescueSlot(); + return ((AMD64FrameMap) getFrameMap()).allocateDeoptimizationRescueSlot(); } }
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Wed Dec 03 22:55:03 2014 +0100 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCFrameMapBuilder.java Thu Dec 04 11:15:04 2014 +0100 @@ -32,6 +32,6 @@ } public StackSlot allocateDeoptimizationRescueSlot() { - return ((SPARCFrameMap) frameMap).allocateDeoptimizationRescueSlot(); + return ((SPARCFrameMap) getFrameMap()).allocateDeoptimizationRescueSlot(); } }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Wed Dec 03 22:55:03 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java Thu Dec 04 11:15:04 2014 +0100 @@ -36,7 +36,7 @@ private final RegisterConfig registerConfig; private final CodeCacheProvider codeCache; - protected final FrameMap frameMap; + private final FrameMap frameMap; private final List<VirtualStackSlot> stackSlots; private final List<CallingConvention> calls; private int numStackSlots; @@ -77,6 +77,10 @@ return codeCache; } + public FrameMap getFrameMap() { + return frameMap; + } + /** * Returns the number of {@link VirtualStackSlot}s created by this {@link FrameMapBuilder}. Can * be used as an upper bound for an array indexed by {@link VirtualStackSlot#getId()}.
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleStackSlotAllocator.java Wed Dec 03 22:55:03 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/SimpleStackSlotAllocator.java Thu Dec 04 11:15:04 2014 +0100 @@ -77,10 +77,10 @@ } protected StackSlot mapSimpleVirtualStackSlot(FrameMapBuilderImpl builder, SimpleVirtualStackSlot virtualStackSlot) { - return builder.frameMap.allocateSpillSlot(virtualStackSlot.getLIRKind()); + return builder.getFrameMap().allocateSpillSlot(virtualStackSlot.getLIRKind()); } protected StackSlot mapVirtualStackSlotRange(FrameMapBuilderImpl builder, VirtualStackSlotRange virtualStackSlot) { - return builder.frameMap.allocateStackSlots(virtualStackSlot.getSlots(), virtualStackSlot.getObjects()); + return builder.getFrameMap().allocateStackSlots(virtualStackSlot.getSlots(), virtualStackSlot.getObjects()); } }