Mercurial > hg > graal-jvmci-8
changeset 22359:2fc1b037a48b
LinearScan: minor cleanups.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Fri, 24 Jul 2015 09:35:18 +0200 |
parents | d6f1915f5a63 |
children | 6d15fbb86bd7 |
files | graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java |
diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Fri Jul 24 09:29:36 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java Fri Jul 24 09:35:18 2015 +0200 @@ -74,7 +74,7 @@ /** * Bit set for each variable that is contained in each loop. */ - BitMap2D intervalInLoop; + private BitMap2D intervalInLoop; boolean isIntervalInLoop(int interval, int loop) { return intervalInLoop.at(interval, loop); @@ -313,7 +313,7 @@ /* * liveIn(block) is the union of liveGen(block) with (liveOut(block) & * !liveKill(block)). - * + * * Note: liveIn has to be computed only in first iteration or if liveOut * has changed! */
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Fri Jul 24 09:29:36 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/MoveResolver.java Fri Jul 24 09:35:18 2015 +0200 @@ -43,7 +43,7 @@ private int insertIdx; private LIRInsertionBuffer insertionBuffer; // buffer where moves are inserted - protected final List<Interval> mappingFrom; + private final List<Interval> mappingFrom; private final List<Value> mappingFromOpr; private final List<Interval> mappingTo; private boolean multipleReadsAllowed; @@ -58,6 +58,14 @@ } } + protected Interval getMappingFrom(int i) { + return mappingFrom.get(i); + } + + protected int mappingFromSize() { + return mappingFrom.size(); + } + protected int valueBlocked(Value location) { if (isRegister(location)) { return registerBlocked[asRegister(location).number];
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Fri Jul 24 09:29:36 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java Fri Jul 24 09:35:18 2015 +0200 @@ -158,10 +158,10 @@ super.breakCycle(spillCandidate); return; } - assert mappingFrom.size() > 1; + assert mappingFromSize() > 1; // Arbitrarily select the first entry for spilling. int stackSpillCandidate = 0; - Interval fromInterval = mappingFrom.get(stackSpillCandidate); + Interval fromInterval = getMappingFrom(stackSpillCandidate); assert isStackSlotValue(fromInterval.location()); // allocate new stack slot StackSlotValue spillSlot = getAllocator().getFrameMapBuilder().allocateSpillSlot(fromInterval.kind());