# HG changeset patch # User Thomas Wuerthinger # Date 1327783457 -3600 # Node ID a04feadb1d473bf8a27ab2b1db6b5b01afe14558 # Parent 2b2ac41e70dd7554eacefb4301d4cf0ccad189f2 Removed debug output. diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java Sat Jan 28 21:44:17 2012 +0100 @@ -43,7 +43,6 @@ import com.oracle.max.graal.compiler.util.*; import com.oracle.max.graal.debug.*; import com.oracle.max.graal.graph.*; -import com.oracle.max.graal.nodes.*; import com.oracle.max.graal.compiler.lir.StandardOp.*; /** diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64LIRGenerator.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64LIRGenerator.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64LIRGenerator.java Sat Jan 28 21:44:17 2012 +0100 @@ -37,7 +37,6 @@ import com.oracle.max.cri.ri.*; import com.oracle.max.cri.xir.CiXirAssembler.XirMark; import com.oracle.max.cri.xir.*; -import com.oracle.max.graal.compiler.*; import com.oracle.max.graal.compiler.gen.*; import com.oracle.max.graal.compiler.lir.*; import com.oracle.max.graal.compiler.target.amd64.AMD64Arithmetic.DivOp; diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java --- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java Sat Jan 28 21:44:17 2012 +0100 @@ -35,7 +35,6 @@ private static ThreadLocal configTL = new ThreadLocal<>(); private static ThreadLocal lastExceptionThrownTL = new ThreadLocal<>(); - private final String name; private final DebugScope parent; private Object[] context; @@ -54,7 +53,7 @@ public static DebugScope getInstance() { DebugScope result = instanceTL.get(); if (result == null) { - instanceTL.set(new DebugScope("", "", null)); + instanceTL.set(new DebugScope("", null)); return instanceTL.get(); } else { return result; @@ -65,8 +64,7 @@ return configTL.get(); } - private DebugScope(String name, String qualifiedName, DebugScope parent, Object... context) { - this.name = name; + private DebugScope(String qualifiedName, DebugScope parent, Object... context) { this.parent = parent; this.context = context; this.qualifiedName = qualifiedName; @@ -106,14 +104,12 @@ } } - private static Object lock = new Object(); - public T scope(String newName, Runnable runnable, Callable callable, boolean sandbox, Object[] newContext) { DebugScope oldContext = getInstance(); DebugConfig oldConfig = getConfig(); DebugScope newChild = null; if (sandbox) { - newChild = new DebugScope(newName, newName, null, newContext); + newChild = new DebugScope(newName, null, newContext); setConfig(null); } else { newChild = oldContext.createChild(newName, newContext); @@ -121,13 +117,7 @@ instanceTL.set(newChild); newChild.updateFlags(); try { - if (logEnabled || dumpEnabled) { - synchronized (lock) { - return executeScope(runnable, callable); - } - } else { - return executeScope(runnable, callable); - } + return executeScope(runnable, callable); } finally { newChild.deactivate(); instanceTL.set(oldContext); @@ -211,7 +201,7 @@ if (this.qualifiedName.length() > 0) { newQualifiedName = this.qualifiedName + SCOPE_SEP + newName; } - DebugScope result = new DebugScope(newName, newQualifiedName, this, newContext); + DebugScope result = new DebugScope(newQualifiedName, this, newContext); if (children == null) { children = new ArrayList<>(4); } diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/IfNode.java --- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/IfNode.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/IfNode.java Sat Jan 28 21:44:17 2012 +0100 @@ -25,7 +25,6 @@ import java.util.*; import com.oracle.max.cri.ci.*; -import com.oracle.max.graal.graph.*; import com.oracle.max.graal.nodes.spi.*; import com.oracle.max.graal.nodes.type.*; diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/BasicIdealGraphPrinter.java --- a/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/BasicIdealGraphPrinter.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/BasicIdealGraphPrinter.java Sat Jan 28 21:44:17 2012 +0100 @@ -84,7 +84,11 @@ * Creates a new {@link IdealGraphPrinter} that writes to the specified output stream. */ protected BasicIdealGraphPrinter(OutputStream stream) { - this.stream = new PrintStream(stream); + try { + this.stream = new PrintStream(stream, false, "US-ASCII"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } } /** diff -r 2b2ac41e70dd -r a04feadb1d47 graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java --- a/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java Sat Jan 28 17:18:29 2012 +0100 +++ b/graal/com.oracle.max.graal.printer/src/com/oracle/max/graal/printer/IdealGraphPrinterDumpHandler.java Sat Jan 28 21:44:17 2012 +0100 @@ -25,8 +25,7 @@ import java.io.*; import java.net.*; import java.util.*; -import java.util.regex.*; - +import com.oracle.max.cri.ci.*; import com.oracle.max.cri.ri.*; import com.oracle.max.criutils.*; import com.oracle.max.graal.debug.*; @@ -113,7 +112,7 @@ for (int i = 0; i < previousInlineContext.size(); ++i) { if (i >= inlineContext.size() || inlineContext.get(i) != previousInlineContext.get(i)) { for (int j = previousInlineContext.size() - 1; j >= i; --j) { - closeMethodScope(previousInlineContext.get(j)); + closeMethodScope(); } } } @@ -140,28 +139,18 @@ } }); } else { - TTY.println("Printer invalid!"); + TTY.println("Fatal error: Printer invalid!"); System.exit(-1); } } } private void openMethodScope(RiResolvedMethod method) { - System.out.println("OPEN " + method); - printer.beginGroup(getName(method), getShortName(method), method, -1); + printer.beginGroup(CiUtil.format("%H::%n", method), CiUtil.format("%h::%n", method), method, -1); } - private static String getShortName(RiResolvedMethod method) { - return method.toString(); - } - - private static String getName(RiResolvedMethod method) { - return method.toString(); - } - - private void closeMethodScope(RiResolvedMethod method) { - System.out.println("CLOSE " + method); + private void closeMethodScope() { printer.endGroup(); }