Mercurial > hg > truffle
changeset 2722:23d0bcfa3c84
Removed two BlockBegin flags.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Thu, 19 May 2011 16:39:54 +0200 |
parents | 3fbe58ac818d |
children | 173067211acb |
files | graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java |
diffstat | 2 files changed, 0 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 16:37:32 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java Thu May 19 16:39:54 2011 +0200 @@ -80,8 +80,6 @@ * An enumeration of flags for block entries indicating various things. */ public enum BlockFlag { - StandardEntry, - BackwardBranchTarget, ParserLoopHeader, LinearScanLoopHeader, LinearScanLoopEnd;
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java Thu May 19 16:37:32 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java Thu May 19 16:39:54 2011 +0200 @@ -144,7 +144,6 @@ assert parent != null : "must have parent"; cur.setBlockFlag(BlockBegin.BlockFlag.LinearScanLoopHeader); - cur.setBlockFlag(BlockBegin.BlockFlag.BackwardBranchTarget); parent.setBlockFlag(BlockBegin.BlockFlag.LinearScanLoopEnd); @@ -380,9 +379,6 @@ if (!cur.checkBlockFlag(BlockBegin.BlockFlag.LinearScanLoopEnd)) { assert cur.linearScanNumber() < sux.linearScanNumber() : "invalid order"; } - //if (cur.loopDepth() == sux.loopDepth()) { - // assert cur.loopIndex() == sux.loopIndex() || sux.checkBlockFlag(BlockBegin.BlockFlag.LinearScanLoopHeader) : "successing blocks with same loop depth must have same loop index"; - //} } for (Instruction pred : cur.blockPredecessors()) { @@ -391,32 +387,9 @@ if (!cur.checkBlockFlag(BlockBegin.BlockFlag.LinearScanLoopHeader)) { assert cur.linearScanNumber() > begin.linearScanNumber() : "invalid order"; } - //if (cur.loopDepth() == begin.loopDepth()) { - // assert cur.loopIndex() == begin.loopIndex() || cur.checkBlockFlag(BlockBegin.BlockFlag.LinearScanLoopHeader) : "successing blocks with same loop depth must have same loop index"; - //} } } - // check that all loops are continuous -// for (int loopIdx = 0; loopIdx < numLoops; loopIdx++) { -// int blockIdx = 0; -// assert !isBlockInLoop(loopIdx, linearScanOrder.get(blockIdx)) : "the first block must not be present in any loop"; -// -// // skip blocks before the loop -// while (blockIdx < numBlocks && !isBlockInLoop(loopIdx, linearScanOrder.get(blockIdx))) { -// blockIdx++; -// } -// // skip blocks of loop -// while (blockIdx < numBlocks && isBlockInLoop(loopIdx, linearScanOrder.get(blockIdx))) { -// blockIdx++; -// } -// // after the first non-loop block : there must not be another loop-block -// while (blockIdx < numBlocks) { -// assert !isBlockInLoop(loopIdx, linearScanOrder.get(blockIdx)) : "loop not continuous in linear-scan order"; -// blockIdx++; -// } -// } - return true; } }