changeset 4394:cf609017d3d4

Fixed warnings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 28 Jan 2012 22:10:31 +0100
parents 86b40f74c8af
children a8a54134ede2
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/alloc/util/IntervalPrinter.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugConfig.java graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java
diffstat 6 files changed, 31 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/alloc/util/IntervalPrinter.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/alloc/util/IntervalPrinter.java	Sat Jan 28 22:10:31 2012 +0100
@@ -38,14 +38,18 @@
 
 public final class IntervalPrinter {
 
+    @SuppressWarnings("unused")
     public static void printBeforeAllocation(String label, LIR lir, RiRegisterConfig registerConfig, DataFlowAnalysis dataFlow) {
+        // TODO(tw): Fix printing.
 //        if (context.isObserved()) {
 //            IntervalPrinter printer = new IntervalPrinter(lir, registerConfig, dataFlow, null);
 //            context.observable.fireCompilationEvent(label, lir, printer.execute());
 //        }
     }
 
+    @SuppressWarnings("unused")
     public static void printAfterAllocation(String label, LIR lir, RiRegisterConfig registerConfig, DataFlowAnalysis dataFlow, LocationMap[] blockEndLocations) {
+        // TODO(tw): Fix printing.
 //        if (context.isObserved()) {
 //            IntervalPrinter printer = new IntervalPrinter(lir, registerConfig, dataFlow, blockEndLocations);
 //            context.observable.fireCompilationEvent(label, lir, printer.execute());
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/alloc/LinearScan.java	Sat Jan 28 22:10:31 2012 +0100
@@ -1866,7 +1866,8 @@
         Debug.dump(Arrays.copyOf(intervals, intervalsSize), label);
     }
 
-    void printLir(String label, boolean hirValid) {
+    void printLir(String label, @SuppressWarnings("unused") boolean hirValid) {
+        // TODO(tw): Fix printing.
         if (GraalOptions.TraceLinearScanLevel >= 1 && !TTY.isSuppressed()) {
             TTY.println();
             TTY.println(label);
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/Debug.java	Sat Jan 28 22:10:31 2012 +0100
@@ -41,6 +41,22 @@
         return ENABLED;
     }
 
+    public static boolean isDumpEnabled() {
+        return ENABLED && DebugScope.getInstance().isDumpEnabled();
+    }
+
+    public static boolean isMeterEnabled() {
+        return ENABLED && DebugScope.getInstance().isMeterEnabled();
+    }
+
+    public static boolean isTimeEnabled() {
+        return ENABLED && DebugScope.getInstance().isTimeEnabled();
+    }
+
+    public static boolean isLogEnabled() {
+        return ENABLED && DebugScope.getInstance().isLogEnabled();
+    }
+
     public static void sandbox(String name, Runnable runnable) {
         if (ENABLED) {
             DebugScope.getInstance().scope(name, runnable, null, true, new Object[0]);
@@ -149,7 +165,7 @@
             }
 
             @Override
-            public boolean isTimerEnabled() {
+            public boolean isTimeEnabled() {
                 return isTimerEnabled;
             }
 
@@ -171,7 +187,7 @@
     };
 
     public static DebugTimer timer(String name) {
-        if (ENABLED && DebugScope.getInstance().isTimerEnabled()) {
+        if (ENABLED && DebugScope.getInstance().isTimeEnabled()) {
             return new TimerImpl(name);
         } else {
             return VOID_TIMER;
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugConfig.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/DebugConfig.java	Sat Jan 28 22:10:31 2012 +0100
@@ -29,7 +29,7 @@
     boolean isLogEnabled();
     boolean isMeterEnabled();
     boolean isDumpEnabled();
-    boolean isTimerEnabled();
+    boolean isTimeEnabled();
     RuntimeException interceptException(RuntimeException e);
     Collection<? extends DebugDumpHandler> dumpHandlers();
 }
--- a/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.debug/src/com/oracle/max/graal/debug/internal/DebugScope.java	Sat Jan 28 22:10:31 2012 +0100
@@ -47,7 +47,7 @@
 
     private boolean logEnabled;
     private boolean meterEnabled;
-    private boolean timerEnabled;
+    private boolean timeEnabled;
     private boolean dumpEnabled;
 
     public static DebugScope getInstance() {
@@ -82,8 +82,8 @@
         return meterEnabled;
     }
 
-    public boolean isTimerEnabled() {
-        return timerEnabled;
+    public boolean isTimeEnabled() {
+        return timeEnabled;
     }
 
     public void log(String msg, Object... args) {
@@ -151,12 +151,12 @@
         if (config == null) {
             logEnabled = false;
             meterEnabled = false;
-            timerEnabled = false;
+            timeEnabled = false;
             dumpEnabled = false;
         } else {
             logEnabled = config.isLogEnabled();
             meterEnabled = config.isMeterEnabled();
-            timerEnabled = config.isTimerEnabled();
+            timeEnabled = config.isTimeEnabled();
             dumpEnabled = config.isDumpEnabled();
         }
     }
--- a/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java	Sat Jan 28 21:53:02 2012 +0100
+++ b/graal/com.oracle.max.graal.hotspot/src/com/oracle/max/graal/hotspot/HotSpotDebugConfig.java	Sat Jan 28 22:10:31 2012 +0100
@@ -62,7 +62,7 @@
         return isEnabled(dumpFilter);
     }
 
-    public boolean isTimerEnabled() {
+    public boolean isTimeEnabled() {
         return isEnabled(timerFilter);
     }