Mercurial > hg > truffle

changeset 3178:c7c5b06e92dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 06 Jul 2011 21:48:33 +0200
parents fe8423692c05
children b9439feeec65 80ac21188fce
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompilation.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/ControlFlowOptimizer.java
diffstat 2 files changed, 1 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompilation.java	Wed Jul 06 21:47:47 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompilation.java	Wed Jul 06 21:48:33 2011 +0200
@@ -30,12 +30,11 @@
 import com.oracle.max.graal.compiler.asm.*;
 import com.oracle.max.graal.compiler.debug.*;
 import com.oracle.max.graal.compiler.gen.*;
-import com.oracle.max.graal.compiler.gen.LIRGenerator.*;
+import com.oracle.max.graal.compiler.gen.LIRGenerator.DeoptimizationStub;
 import com.oracle.max.graal.compiler.graph.*;
 import com.oracle.max.graal.compiler.lir.*;
 import com.oracle.max.graal.compiler.observer.*;
 import com.oracle.max.graal.compiler.value.*;
-import com.oracle.max.graal.graph.*;
 import com.sun.cri.ci.*;
 import com.sun.cri.ri.*;
 
@@ -240,10 +239,8 @@
 
             lirGenerator = compiler.backend.newLIRGenerator(this);
 
-            BitMap blockVisited = new BitMap(hir.linearScanOrder().size());
             for (LIRBlock b : hir.linearScanOrder()) {
                 lirGenerator.doBlock(b);
-//                iterateBlocks(b, blockVisited);
             }
 
             if (GraalOptions.Time) {
@@ -258,24 +255,6 @@
         }
     }
 
-    private void iterateBlocks(LIRBlock b, BitMap blockVisited) {
-        if (blockVisited.get(b.blockID())) {
-            return;
-        }
-//        TTY.println("visit B" + b.blockID() + "(" + b.isLinearScanLoopHeader() + ")");
-//        TTY.println("predecessors: " + b.blockPredecessors());
-        blockVisited.set(b.blockID());
-        if (!b.isLinearScanLoopHeader()) {
-            for (LIRBlock pred : b.blockPredecessors()) {
-//                TTY.println("iterate " + pred + " " + blockVisited.get(pred.blockID()));
-                iterateBlocks(pred, blockVisited);
-            }
-        } else {
-            iterateBlocks(b.blockPredecessors().get(0), blockVisited);
-        }
-        lirGenerator.doBlock(b);
-    }
-
     private CiTargetMethod emitCode() {
         if (GraalOptions.GenLIR && GraalOptions.GenCode) {
             final LIRAssembler lirAssembler = compiler.backend.newLIRAssembler(this);
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/ControlFlowOptimizer.java	Wed Jul 06 21:47:47 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/ControlFlowOptimizer.java	Wed Jul 06 21:48:33 2011 +0200
@@ -25,7 +25,6 @@
 import java.util.*;
 
 import com.oracle.max.graal.compiler.*;
-import com.oracle.max.graal.compiler.debug.*;
 import com.oracle.max.graal.compiler.graph.*;
 import com.oracle.max.graal.compiler.ir.*;
 import com.oracle.max.graal.compiler.lir.*;