# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1329825818 -3600
# Node ID d4e039a3e083937f7a5ae1c031469c6b0b86a466
# Parent  c1160de36474413db2f2195b567e4ef21fac2b19
Print java.exe when execuing "mx vm"

diff -r c1160de36474 -r d4e039a3e083 mx/commands.py
--- a/mx/commands.py	Mon Feb 20 18:01:22 2012 +0100
+++ b/mx/commands.py	Tue Feb 21 13:03:38 2012 +0100
@@ -476,6 +476,7 @@
     if mx.java().debug:
         args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args
     exe = join(_jdk(build), 'bin', mx.exe_suffix('java'))
+    print('Executing VM ' + exe)
     return mx.run([exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
 
 
diff -r c1160de36474 -r d4e039a3e083 src/share/vm/runtime/arguments.hpp
--- a/src/share/vm/runtime/arguments.hpp	Mon Feb 20 18:01:22 2012 +0100
+++ b/src/share/vm/runtime/arguments.hpp	Tue Feb 21 13:03:38 2012 +0100
@@ -228,9 +228,11 @@
   // an array containing all jvm arguments specified in the command line
   static char** _jvm_args_array;
   static int    _num_jvm_args;
+#ifdef GRAAL
   // an array containing all graal arguments specified in the command line
   static char** _graal_args_array;
   static int    _num_graal_args;
+#endif
   // string containing all java command (class/jarfile name and app args)
   static char* _java_command;
 
@@ -432,9 +434,9 @@
   static char** jvm_args_array()           { return _jvm_args_array; }
 #ifdef GRAAL
   static char** graal_args_array()           { return _graal_args_array; }
+  static int num_graal_args()               { return _num_graal_args; }
 #endif
   static int num_jvm_flags()               { return _num_jvm_flags; }
-  static int num_graal_args()               { return _num_graal_args; }
   static int num_jvm_args()                { return _num_jvm_args; }
   // return the arguments passed to the Java application
   static const char* java_command()        { return _java_command; }