Mercurial > hg > truffle
changeset 2994:7ed943d4d730
Fix checkstyle issues.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Thu, 16 Jun 2011 13:44:57 +0200 |
| parents | a8e8035916a3 |
| children | 00e0c0928e7c |
| files | graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/EdgeMoveOptimizer.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Graph.java graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java |
| diffstat | 6 files changed, 23 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/EdgeMoveOptimizer.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/EdgeMoveOptimizer.java Thu Jun 16 13:44:57 2011 +0200 @@ -25,10 +25,8 @@ import java.util.*; import com.oracle.max.graal.compiler.*; -import com.oracle.max.graal.compiler.debug.*; import com.oracle.max.graal.compiler.ir.*; import com.oracle.max.graal.compiler.lir.*; -import com.oracle.max.graal.graph.*; /** * This class optimizes moves, particularly those that result from eliminating SSA form. @@ -193,11 +191,6 @@ assert numSux == 2 : "method should not be called otherwise"; - if ( instructions.get(instructions.size() - 1).code != LIROpcode.Branch) { - for (Node n : block.getInstructions()) { - TTY.println("instr: " + n); - } - } assert instructions.get(instructions.size() - 1).code == LIROpcode.Branch : "block with successor must end with branch block=B" + block.blockID(); assert instructions.get(instructions.size() - 1) instanceof LIRBranch : "branch must be LIROpBranch"; assert ((LIRBranch) instructions.get(instructions.size() - 1)).cond() == Condition.TRUE : "block must end with unconditional branch";
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java Thu Jun 16 13:44:57 2011 +0200 @@ -244,7 +244,7 @@ clipNode.setNode(new IsNonNull(parameters[0], compilation.graph)); pred = clipNode; } else { - pred = new Placeholder(compilation.graph);//(Instruction) invoke.predecessors().get(0);//new Merge(compilation.graph); + pred = new Placeholder(compilation.graph); } invoke.predecessors().get(0).successors().replace(invoke, pred); replacements.put(startNode, pred); @@ -263,7 +263,7 @@ } if (pred instanceof Placeholder) { - pred.replace(((Placeholder)pred).next()); + pred.replace(((Placeholder) pred).next()); } if (returnNode != null) {
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java Thu Jun 16 13:44:57 2011 +0200 @@ -133,18 +133,19 @@ if (n != null) { if (n instanceof EndNode || n instanceof Return || n instanceof Unwind || n instanceof LoopEnd || n instanceof Deoptimize) { Block block = null; - while (nodeToBlock.get(n) == null) { - if (block != null && IdentifyBlocksPhase.trueSuccessorCount(n) > 1) { + Node currentNode = n; + while (nodeToBlock.get(currentNode) == null) { + if (block != null && IdentifyBlocksPhase.trueSuccessorCount(currentNode) > 1) { // We are at a split node => start a new block. block = null; } - block = assignBlockNew(n, block); - if (n.predecessors().size() == 0) { + block = assignBlockNew(currentNode, block); + if (currentNode.predecessors().size() == 0) { // Either dead code or at a merge node => stop iteration. break; } - assert n.predecessors().size() == 1 : "preds: " + n; - n = n.predecessors().get(0); + assert currentNode.predecessors().size() == 1 : "preds: " + currentNode; + currentNode = currentNode.predecessors().get(0); } } }
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Graph.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Graph.java Thu Jun 16 13:44:57 2011 +0200 @@ -184,7 +184,7 @@ } } } - + // re-wire successors for (Entry<Node, Node> entry : newNodes.entrySet()) { Node oldNode = entry.getKey();
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java Thu Jun 16 13:44:57 2011 +0200 @@ -90,7 +90,7 @@ } int z = 0; for (Node predecessor : predecessors) { - for (int i=0; i<predecessor.successors.size(); i++) { + for (int i = 0; i < predecessor.successors.size(); i++) { if (predecessor.successors.get(i) == this) { predecessor.successors.silentSet(i, other); }
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Wed Jun 15 21:20:44 2011 +0200 +++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/NodeArray.java Thu Jun 16 13:44:57 2011 +0200 @@ -53,7 +53,7 @@ nodes[index] = node; return result; } - + public AbstractList<Node> variablePart() { return new AbstractList<Node>() { @@ -77,24 +77,24 @@ variableLength++; checkIndex(index); NodeArray.this.ensureSize(); - for (int i=size() - 1; i > index; i--) { - NodeArray.this.nodes[fixedLength + i] = NodeArray.this.nodes[fixedLength + i-1]; + for (int i = size() - 1; i > index; i--) { + NodeArray.this.nodes[fixedLength + i] = NodeArray.this.nodes[fixedLength + i - 1]; } set(index, element); } - + private void checkIndex(int index) { if (index < 0 || index >= size()) { throw new IndexOutOfBoundsException(); } } - + @Override public Node remove(int index) { checkIndex(index); Node n = get(index); set(index, Node.Null); - for (int i=index; i < size() - 1; i++) { + for (int i = index; i < size() - 1; i++) { NodeArray.this.nodes[fixedLength + i] = NodeArray.this.nodes[fixedLength + i + 1]; } NodeArray.this.nodes[fixedLength + size() - 1] = Node.Null; @@ -107,19 +107,19 @@ private void ensureSize() { if (size() > nodes.length) { - nodes = Arrays.copyOf(nodes, (nodes.length + 1)*2); + nodes = Arrays.copyOf(nodes, (nodes.length + 1) * 2); } } - + public void setOrExpand(int index, Node node) { if (index < 0) { throw new IndexOutOfBoundsException(); } - + while (index >= size()) { variablePart().add(Node.Null); } - + set(index, node); } @@ -129,7 +129,7 @@ assert node == Node.Null || node.graph == self().graph : "node is from different graph: (this=" + self() + ") and (node=" + node + ")"; assert node == Node.Null || node.id() != Node.DeletedID : "inserted node must not be deleted"; assert node != self() || node.getClass().toString().contains("Phi") : "No direct circles allowed in the graph! " + node; - + Node old = get(index); if (old != node) { silentSet(index, node); @@ -166,7 +166,7 @@ set(i, other.get(i)); } } - + private void checkIndex(int index) { if (index < 0 || index >= size()) { throw new IndexOutOfBoundsException();