Mercurial > hg > truffle
changeset 18449:cdff1577017c
FrameMapBuilder: use FrameMap.allocateSpillSlot();
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Mon, 17 Nov 2014 19:06:27 +0100 |
parents | 645aa30b23a7 |
children | 626c267521fe |
files | graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java |
diffstat | 2 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Mon Nov 17 18:56:46 2014 +0100 +++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMap.java Mon Nov 17 19:06:27 2014 +0100 @@ -112,9 +112,7 @@ */ StackSlot allocateRBPSpillSlot() { assert spillSize == initialSpillSize : "RBP spill slot can only be allocated before getting other stack slots"; - int size = spillSlotSize(LIRKind.value(Kind.Long)); - spillSize = NumUtil.roundUp(spillSize + size, size); - rbpSpillSlot = allocateNewSpillSlot(LIRKind.value(Kind.Long), 0); + rbpSpillSlot = allocateSpillSlot(LIRKind.value(Kind.Long)); assert asStackSlot(rbpSpillSlot).getRawOffset() == -16 : asStackSlot(rbpSpillSlot).getRawOffset(); return rbpSpillSlot; } @@ -126,8 +124,6 @@ } public StackSlot allocateDeoptimizationRescueSlot() { - int size = spillSlotSize(LIRKind.value(Kind.Long)); - spillSize = NumUtil.roundUp(spillSize + size, size); - return allocateNewSpillSlot(LIRKind.value(Kind.Long), 0); + return allocateSpillSlot(LIRKind.value(Kind.Long)); } }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java Mon Nov 17 18:56:46 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java Mon Nov 17 19:06:27 2014 +0100 @@ -26,7 +26,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.asm.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.lir.gen.*; @@ -86,9 +85,7 @@ @Override public StackSlot transform() { - int size = frameMap.spillSlotSize(getLIRKind()); - frameMap.spillSize = NumUtil.roundUp(frameMap.spillSize + size, size); - return frameMap.allocateNewSpillSlot(getLIRKind(), 0); + return frameMap.allocateSpillSlot(getLIRKind()); } }