Mercurial > hg > truffle

changeset 3543:344264424174

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable debugging of compiler code from Java IDEs. Moved binary to "graal" subdirectory. New flag for starting Graal is just "-graal".
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Sat, 13 Aug 2011 18:08:28 +0200
parents f3ce30df0218
children 622bbc9dafbd
files perf/benchmarktool.py runalldacapo.sh runavrora.sh runbatik.sh runbootstrap.sh rundacapo.sh runeclipse.sh runexamples.sh runexamplescompare.sh runfilter.sh runfop.sh runjython.sh runlusearch.sh runpmd.sh runscimark.sh runtests.sh runtradebeans.sh runxalan.sh src/share/tools/ProjectCreator/BuildConfig.java src/share/tools/ProjectCreator/WinGammaPlatformVC10.java src/share/vm/c1/c1_globals.hpp src/share/vm/runtime/arguments.cpp src/share/vm/runtime/thread.hpp
diffstat 23 files changed, 85 insertions(+), 76 deletions(-) [+]
line wrap: on
line diff
--- a/perf/benchmarktool.py	Thu Aug 11 11:45:33 2011 +0200
+++ b/perf/benchmarktool.py	Sat Aug 13 18:08:28 2011 +0200
@@ -61,7 +61,7 @@
     parser.add_argument('-o', type=str, help='graalVM options(quoted!)', default='')
     parser.add_argument('-runonly', type=str, help='run specified benchmark only', default='all')
     options = parser.parse_args()
-    compilerFlags = {'graal' : '-client -graal -G:+Time -XX:-GraalBailoutIsFatal -G:QuietBailout ',
+    compilerFlags = {'graal' : '-graal -G:+Time -XX:-GraalBailoutIsFatal -G:QuietBailout ',
         'client' : '-client',
         'server' : '-server'}
 
--- a/runalldacapo.sh	Thu Aug 11 11:45:33 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/bash
-bash rundacapo.sh avrora
-bash rundacapo.sh batik
-bash rundacapo.sh eclipse
-bash rundacapo.sh fop
-bash rundacapo.sh h2
-bash rundacapo.sh jython
-bash rundacapo.sh luindex
-bash rundacapo.sh lusearch
-bash rundacapo.sh pmd
-bash rundacapo.sh sunflow
-bash rundacapo.sh tomcat
-bash rundacapo.sh tradebeans
-bash rundacapo.sh tradesoap
-bash rundacapo.sh xalan
--- a/runavrora.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runavrora.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,6 +15,6 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 avrora"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 avrora"
 echo $COMMAND
 $COMMAND
--- a/runbatik.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runbatik.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,6 +15,6 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 batik"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 batik"
 echo $COMMAND
 $COMMAND
--- a/runbootstrap.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runbootstrap.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -11,4 +11,4 @@
   echo "GRAAL is not defined. It must point to a maxine repository directory."
   exit 1;
 fi
-${JDK7}/bin/java -client -d64 -graal $* -version 
+${JDK7}/bin/java -graal $* -version 
--- a/rundacapo.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/rundacapo.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,4 +15,4 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-${JDK7}/bin/java -client -d64 -graal -XX:-GraalBailoutIsFatal -XX:MaxPermSize=512m -XX:+PrintCompilation -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness --preserve $*
+${JDK7}/bin/java -graal -XX:-GraalBailoutIsFatal -XX:MaxPermSize=512m -XX:+PrintCompilation -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar Harness --preserve $*
--- a/runeclipse.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runeclipse.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,7 +15,7 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 eclipse"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 eclipse"
 echo $COMMAND
 $COMMAND
 echo $COMMAND
--- a/runexamples.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runexamples.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -16,6 +16,6 @@
   exit 1;
 fi
 ant -f create_examples.xml
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -G:Extend -Xcomp -XX:CompileOnly=examples $* -jar examples.jar"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -G:Extend -Xcomp -XX:CompileOnly=examples $* -jar examples.jar"
 echo $COMMAND
 $COMMAND
--- a/runexamplescompare.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runexamplescompare.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -16,7 +16,7 @@
   exit 1;
 fi
 ant -f create_examples.xml
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -G:Extend -Xcomp -XX:CompileOnly=examples $* -jar examples.jar"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -G:Extend -Xcomp -XX:CompileOnly=examples $* -jar examples.jar"
 echo $COMMAND
 $COMMAND
 COMMAND="${JDK7}/bin/java -client -d64 -Xms1g -Xmx2g -esa -Xcomp -XX:CompileOnly=examples $* -jar examples.jar"
--- a/runfilter.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runfilter.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -18,4 +18,4 @@
 FILTER=$1
 shift 1
 TESTDIR=${MAXINE}/com.oracle.max.vm/test
-${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -filter=${FILTER} -verbose=1 -gen-run-scheme=false -run-scheme-package=all $@ ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/hotspot
+${JDK7}/bin/java -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -filter=${FILTER} -verbose=1 -gen-run-scheme=false -run-scheme-package=all $@ ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/hotspot
--- a/runfop.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runfop.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,4 +15,4 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal $* Harness --preserve -n 100 fop 
+${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal $* Harness --preserve -n 100 fop 
--- a/runjython.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runjython.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,6 +15,6 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 10 jython"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 10 jython"
 echo $COMMAND
 $COMMAND
--- a/runlusearch.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runlusearch.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,7 +15,7 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 lusearch"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 lusearch"
 echo $COMMAND
 $COMMAND
 echo $COMMAND
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/runpmd.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -0,0 +1,21 @@
+#!/bin/bash
+if [ -z "${JDK7}" ]; then
+  echo "JDK7 is not defined."
+  exit 1;
+fi
+if [ -z "${MAXINE}" ]; then
+  echo "MAXINE is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${GRAAL}" ]; then
+  echo "GRAAL is not defined. It must point to a maxine repository directory."
+  exit 1;
+fi
+if [ -z "${DACAPO}" ]; then
+  echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
+  exit 1;
+fi
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 pmd"
+echo $COMMAND
+$COMMAND
+echo $COMMAND
--- a/runscimark.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runscimark.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,4 +15,4 @@
   echo "SCIMARK is not defined. It must point to a directory with the SciMark benchmark jar."
   exit 1;
 fi
-${JDK7}/jre/bin/java -client -d64 -graal -Xms256m -Xmx512m -Xbootclasspath/a:${SCIMARK}/scimark2lib.jar $@ jnt.scimark2.commandline
+${JDK7}/jre/bin/java -graal -Xms256m -Xmx512m -Xbootclasspath/a:${SCIMARK}/scimark2lib.jar $@ jnt.scimark2.commandline
--- a/runtests.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runtests.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -12,4 +12,4 @@
   exit 1;
 fi
 TESTDIR=${MAXINE}/com.oracle.max.vm/test
-${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/hotspot
+${JDK7}/bin/java -graal -ea -esa -Xcomp -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads ${TESTDIR}/jtt/hotspot
--- a/runtradebeans.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runtradebeans.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,6 +15,6 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 tradebeans"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 tradebeans"
 echo $COMMAND
 $COMMAND
--- a/runxalan.sh	Thu Aug 11 11:45:33 2011 +0200
+++ b/runxalan.sh	Sat Aug 13 18:08:28 2011 +0200
@@ -15,6 +15,6 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -client -d64 -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 xalan"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 20 xalan"
 echo $COMMAND
 $COMMAND
--- a/src/share/tools/ProjectCreator/BuildConfig.java	Thu Aug 11 11:45:33 2011 +0200
+++ b/src/share/tools/ProjectCreator/BuildConfig.java	Sat Aug 13 18:08:28 2011 +0200
@@ -72,7 +72,7 @@
 	}
 	outDir += Util.sep + "jre" + Util.sep + "bin";
 	if (flavour.equals("compiler1")) {
-		outDir += Util.sep + "client";
+		outDir += Util.sep + "graal";
 	} else {
 		outDir += Util.sep + "server";
 	}
--- a/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	Thu Aug 11 11:45:33 2011 +0200
+++ b/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java	Sat Aug 13 18:08:28 2011 +0200
@@ -482,7 +482,7 @@
                 "/export:JVM_GetThreadStateNames "+
                 "/export:JVM_GetThreadStateValues "+
                 "/export:JVM_InitAgentProperties");
-        addAttr(rv, "AdditionalDependencies", "kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;Wsock32.lib;winmm.lib");
+        addAttr(rv, "AdditionalDependencies", "kernel32.lib;psapi.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;Wsock32.lib;winmm.lib");
         addAttr(rv, "OutputFile", outDll);
         addAttr(rv, "SuppressStartupBanner", "true");
         addAttr(rv, "ModuleDefinitionFile", outDir+Util.sep+"vm.def");
--- a/src/share/vm/c1/c1_globals.hpp	Thu Aug 11 11:45:33 2011 +0200
+++ b/src/share/vm/c1/c1_globals.hpp	Sat Aug 13 18:08:28 2011 +0200
@@ -53,14 +53,16 @@
 //
 #define C1_FLAGS(develop, develop_pd, product, product_pd, notproduct)      \
                                                                             \
-  product(bool, UseGraal, false,                                              \
-          "Use graal instead of C1")                                          \
-  product(bool, GraalBailoutIsFatal, true,                                    \
-          "Abort the VM on graal bailout")                                    \
-  product(bool, BootstrapGraal, false,                                        \
-          "Bootstrap graal before running Java main method")                  \
-  product(intx, TraceGraal, 0,                                                \
-          "Trace level for graal")                                            \
+  product(bool, UseGraal, true,                                             \
+          "Use graal instead of C1")                                        \
+  product(bool, DebugGraal, true,                                           \
+          "Enable JVMTI for the compiler thread")                           \
+  product(bool, GraalBailoutIsFatal, true,                                  \
+          "Abort the VM on graal bailout")                                  \
+  product(bool, BootstrapGraal, false,                                      \
+          "Bootstrap graal before running Java main method")                \
+  product(intx, TraceGraal, 0,                                              \
+          "Trace level for graal")                                          \
   product(bool, TraceSignals, false,                                        \
           "Trace signals and implicit exception handling")                  \
   /* Printing */                                                            \
--- a/src/share/vm/runtime/arguments.cpp	Thu Aug 11 11:45:33 2011 +0200
+++ b/src/share/vm/runtime/arguments.cpp	Sat Aug 13 18:08:28 2011 +0200
@@ -2013,6 +2013,40 @@
     return result;
   }
 
+  if (UseGraal) {
+    if (PrintVMOptions) {
+    tty->print("Running Graal VM... ");
+    }
+    const int BUFFER_SIZE = 1024;
+    char maxine_dir[BUFFER_SIZE];
+    char temp[BUFFER_SIZE];
+    if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) {
+    fatal("Must set MAXINE environment variable to a Maxine project directory.");
+    }
+    if (PrintVMOptions) tty->print("MAXINE=%s", maxine_dir);
+    sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.extensions/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.runtime/bin", maxine_dir);
+    scp.add_prefix(temp);
+    sprintf(temp, "%s/com.oracle.max.graal.graphviz/bin", maxine_dir);
+    scp.add_prefix(temp);
+    scp_assembly_required = true;
+  }
+
   if (AggressiveOpts) {
     // Insert alt-rt.jar between user-specified bootclasspath
     // prefix and the default bootclasspath.  os::set_boot_path()
@@ -2673,40 +2707,6 @@
           return JNI_EINVAL;
         }
       }
-    } else if (match_option(option, "-graal", &tail)) {
-      if (PrintVMOptions) {
-        tty->print("Running Graal VM... ");
-      }
-      UseGraal = true;
-      BootstrapGraal = true;
-      const int BUFFER_SIZE = 1024;
-      char maxine_dir[BUFFER_SIZE];
-      char temp[BUFFER_SIZE];
-      if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) {
-        fatal("Must set MAXINE environment variable to a Maxine project directory.");
-      }
-      if (PrintVMOptions) tty->print("MAXINE=%s", maxine_dir);
-      sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.extensions/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.runtime/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      sprintf(temp, "%s/com.oracle.max.graal.graphviz/bin", maxine_dir);
-      scp_p->add_prefix(temp);
-      *scp_assembly_required_p = true;
     } else if (match_option(option, "-G:", &tail)) { // -G:XXX
       // Option for the graal compiler.
       if (PrintVMOptions) {
--- a/src/share/vm/runtime/thread.hpp	Thu Aug 11 11:45:33 2011 +0200
+++ b/src/share/vm/runtime/thread.hpp	Sat Aug 13 18:08:28 2011 +0200
@@ -1715,7 +1715,8 @@
   void set_compiling(bool b)                     { _is_compiling = b; }
   bool is_Compiler_thread() const                { return true; }
   // Hide this compiler thread from external view.
-  bool is_hidden_from_external_view() const      { return true; }
+  // (tw) For Graal, the compiler thread should be visible.
+  bool is_hidden_from_external_view() const      { return !UseGraal || !DebugGraal; }
 
   CompileQueue* queue()                          { return _queue; }
   CompilerCounters* counters()                   { return _counters; }