[multiple changes]

2003-03-10  2003-02-27  Mohan Embar  <gnustuff@thisiscool.com>

        * include/jvm.h: removed declaration of _Jv_ThisExecutable()
        setter; made return value of getter const char* instead of char*
        * prims.cc: removed all references to _Jv_ThisExecutable().
        These are in the platform-specific sections now.
        * posix.cc: define platform-specific _Jv_ThisExecutable().
        Handle DISABLE_MAIN_ARGS and HAVE_PROC_SELF_EXE cases
        * win32.cc: define platform-specific _Jv_ThisExecutable()
        using GetModuleFilename()
        * java/lang/natRuntime.cc: set gnu.gcj.progname property
        to argv[0] instead of _Jv_ThisExecutable()

2003-03-10  Ranjit Mathew  <rmathew@hotmail.com>

        * gnu/gcj/runtime/NameFinder.java (usingAddr2name): New flag
        that is set if we are using addr2name.awk instead of addr2line.
        (NameFinder): Set usingAddr2name if using addr2name.awk.
        (getExternalLabel): New native method to convert a method
        name to an external label.
        (lookup): Convert name given by addr2line to an external label
        before demangling.

        * gnu/gcj/runtime/natNameFinder.cc (LABEL_PREFIX): New string
        constant representing the prefix attached to method names to
        convert them to an external label.
        (gnu::gcj::runtime::NameFinder::getExternalLabel): Define
        using LABEL_PREFIX.

From-SVN: r64111

8 files changed, 127 insertions, 36 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9c02954..7fd8e12 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,32 @@
+2003-03-10  2003-02-27  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* include/jvm.h: removed declaration of _Jv_ThisExecutable()
+	setter; made return value of getter const char* instead of char*
+	* prims.cc: removed all references to _Jv_ThisExecutable().
+	These are in the platform-specific sections now.
+	* posix.cc: define platform-specific _Jv_ThisExecutable().
+	Handle DISABLE_MAIN_ARGS and HAVE_PROC_SELF_EXE cases
+	* win32.cc: define platform-specific _Jv_ThisExecutable()
+	using GetModuleFilename()
+	* java/lang/natRuntime.cc: set gnu.gcj.progname property
+	to argv[0] instead of _Jv_ThisExecutable()
+
+2003-03-10  Ranjit Mathew  <rmathew@hotmail.com>
+
+	* gnu/gcj/runtime/NameFinder.java (usingAddr2name): New flag
+	that is set if we are using addr2name.awk instead of addr2line.
+	(NameFinder): Set usingAddr2name if using addr2name.awk.
+	(getExternalLabel): New native method to convert a method 
+	name to an external label.
+	(lookup): Convert name given by addr2line to an external label
+	before demangling.
+
+	* gnu/gcj/runtime/natNameFinder.cc (LABEL_PREFIX): New string
+	constant representing the prefix attached to method names to
+	convert them to an external label.
+	(gnu::gcj::runtime::NameFinder::getExternalLabel): Define 
+	using LABEL_PREFIX.
+
 2003-03-10  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/gnu/gcj/runtime/NameFinder.java b/libjava/gnu/gcj/runtime/NameFinder.java
index 4089411..19820c1 100644
--- a/libjava/gnu/gcj/runtime/NameFinder.java
+++ b/libjava/gnu/gcj/runtime/NameFinder.java
@@ -103,6 +103,11 @@ public class NameFinder
   private BufferedReader addr2lineIn;
 
   /**
+   * Flag set if using addr2name.awk instead of addr2line from binutils.
+   */
+  private boolean usingAddr2name = false;
+
+  /**
    * Creates a new NameFinder. Call close to get rid of any resources
    * created while using the <code>lookup</code> methods.
    */
@@ -142,6 +147,7 @@ public class NameFinder
 	      {
 		String[] exec = new String[] {"addr2name.awk", executable};
 		addr2line = runtime.exec(exec);
+		usingAddr2name = true;
 	      }
 	    catch (IOException ioe2) { addr2line = null; }
 	  }
@@ -181,6 +187,11 @@ public class NameFinder
   native private String getAddrAsString(RawData addrs, int n);
 
   /**
+   * Returns the label that is exported for the given method name.
+   */
+  native private String getExternalLabel(String name);
+
+  /**
    * If nth element of stack is an interpreted frame, return the
    * element representing the method being interpreted.
    */
@@ -212,6 +223,15 @@ public class NameFinder
 		addr2lineOut.flush();
 		name = addr2lineIn.readLine();
 		file = addr2lineIn.readLine();
+
+                // addr2line uses symbolic debugging information instead
+                // of the actually exported labels as addr2name.awk does.
+                // This name might need some modification, depending on 
+                // the system, to make it a label like that returned 
+                // by addr2name.awk or dladdr.
+                if (! usingAddr2name)
+                  if (name != null && ! "??".equals (name))
+                    name = getExternalLabel (name);
 	      }
 	    catch (IOException ioe) { addr2line = null; }
 	  }
diff --git a/libjava/gnu/gcj/runtime/natNameFinder.cc b/libjava/gnu/gcj/runtime/natNameFinder.cc
index 29687cb..6605e38 100644
--- a/libjava/gnu/gcj/runtime/natNameFinder.cc
+++ b/libjava/gnu/gcj/runtime/natNameFinder.cc
@@ -15,6 +15,8 @@ details.  */
 
 #include <config.h>
 
+#include <string.h>
+
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java/lang/String.h>
@@ -28,6 +30,37 @@ details.  */
 #include <dlfcn.h>
 #endif
 
+// On some systems, a prefix is attached to a method name before
+// it is exported as a label. The GCC preprocessor predefines 
+// this prefix as the macro __USER_LABEL_PREFIX__ which expands to
+// a string (not string constant) representing the prefix, if any.
+#undef LABEL_PREFIX
+#ifdef __USER_LABEL_PREFIX__
+
+#define USER_LABEL_PREFIX_STRING_0(s) #s
+#define USER_LABEL_PREFIX_STRING(s) USER_LABEL_PREFIX_STRING_0(s)
+
+#define LABEL_PREFIX USER_LABEL_PREFIX_STRING(__USER_LABEL_PREFIX__)
+
+#else /* __USER_LABEL_PREFIX__ */
+
+#define LABEL_PREFIX ""
+
+#endif /* ! __USER_LABEL_PREFIX__ */
+
+java::lang::String*
+gnu::gcj::runtime::NameFinder::getExternalLabel (java::lang::String* name)
+{
+  jsize nameLen = JvGetStringUTFLength (name);
+  jsize pfxLen = strlen (LABEL_PREFIX);
+  char *newName = (char *) JvMalloc (pfxLen + nameLen + 1);
+  *(newName + 0) = '\0';
+  strcpy (newName, LABEL_PREFIX);
+  JvGetStringUTFRegion (name, 0, nameLen, newName + pfxLen);
+  *(newName + pfxLen + nameLen) = '\0';
+  return JvNewStringLatin1 (newName);
+}
+
 java::lang::String*
 gnu::gcj::runtime::NameFinder::getExecutable (void)
 {
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index 1e60498..38f675a 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -352,9 +352,8 @@ extern "C"
   jlong _Jv_remJ (jlong, jlong);
 }
 
-/* get/set the name of the running executable. */
-extern char *_Jv_ThisExecutable (void);
-extern void _Jv_ThisExecutable (const char *);
+/* Get the name of the running executable. */
+extern const char *_Jv_ThisExecutable (void);
 
 /* Return a pointer to a symbol in executable or loaded library.  */
 void *_Jv_FindSymbolInExecutable (const char *);
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index dee9511..237b0d1 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -108,6 +108,10 @@ _Jv_SetDLLSearchPath (const char *)
 
 
 
+extern int _Jv_argc;
+extern const char **_Jv_argv;
+  // our process' command line arguments
+
 void
 java::lang::Runtime::exitInternal (jint status)
 {
@@ -582,7 +586,7 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
     }
 
   // The name used to invoke this process (argv[0] in C).
-  SET ("gnu.gcj.progname", _Jv_ThisExecutable());
+  SET ("gnu.gcj.progname", _Jv_argv[0]);
 
   // Allow platform specific settings and overrides.
   _Jv_platform_initProperties (newprops);
diff --git a/libjava/posix.cc b/libjava/posix.cc
index ebff1c9..2f80833 100644
--- a/libjava/posix.cc
+++ b/libjava/posix.cc
@@ -25,6 +25,26 @@ details.  */
 extern "C" unsigned long long _clock (void);
 #endif
 
+// platform-specific executable name
+extern const char **_Jv_argv;
+
+#if defined(HAVE_PROC_SELF_EXE)
+static char exec_name[20];
+  // initialized in _Jv_platform_initialize()
+#endif
+
+const char *_Jv_ThisExecutable (void)
+{
+#if defined(DISABLE_MAIN_ARGS)
+  return "[Embedded App]";
+#elif defined(HAVE_PROC_SELF_EXE)
+  return exec_name;
+    // initialized in _Jv_platform_initialize()
+#else
+  return _Jv_argv[0];
+#endif
+}
+
 // gettimeofday implementation.
 jlong
 _Jv_platform_gettimeofday ()
@@ -62,6 +82,11 @@ _Jv_platform_initialize (void)
 #else
   signal (SIGPIPE, SIG_IGN);
 #endif
+
+#if defined (HAVE_PROC_SELF_EXE)
+  // Compute our executable name
+  sprintf (exec_name, "/proc/%d/exe", getpid ());
+#endif
 }
 
 // Set platform-specific System properties.
diff --git a/libjava/prims.cc b/libjava/prims.cc
index 61c6654..dc05d4b 100644
--- a/libjava/prims.cc
+++ b/libjava/prims.cc
@@ -86,9 +86,6 @@ const char *_Jv_Jar_Class_Path;
 property_pair *_Jv_Environment_Properties;
 #endif
 
-// The name of this executable.
-static char *_Jv_execName;
-
 // Stash the argv pointer to benefit native libraries that need it.
 const char **_Jv_argv;
 int _Jv_argc;
@@ -707,22 +704,6 @@ static JArray<jstring> *arg_vec;
 // The primary thread.
 static java::lang::Thread *main_thread;
 
-char *
-_Jv_ThisExecutable (void)
-{
-  return _Jv_execName;
-}
-
-void
-_Jv_ThisExecutable (const char *name)
-{
-  if (name)
-    {
-      _Jv_execName = (char *) _Jv_Malloc (strlen (name) + 1);
-      strcpy (_Jv_execName, name);
-    }
-}
-
 #ifndef DISABLE_GETENV_PROPERTIES
 
 static char *
@@ -960,19 +941,6 @@ _Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
 
   java::lang::Runtime *runtime = NULL;
 
-
-#ifdef DISABLE_MAIN_ARGS
-  _Jv_ThisExecutable ("[Embedded App]");
-#else
-#ifdef HAVE_PROC_SELF_EXE
-  char exec_name[20];
-  sprintf (exec_name, "/proc/%d/exe", getpid ());
-  _Jv_ThisExecutable (exec_name);
-#else
-  _Jv_ThisExecutable (argv[0]);
-#endif /* HAVE_PROC_SELF_EXE */
-#endif /* DISABLE_MAIN_ARGS */
-
   try
     {
       // Set this very early so that it is seen when java.lang.System
diff --git a/libjava/win32.cc b/libjava/win32.cc
index 59c3be2..6fc2de0 100644
--- a/libjava/win32.cc
+++ b/libjava/win32.cc
@@ -28,6 +28,15 @@ win32_exception_handler (LPEXCEPTION_POINTERS e)
     return EXCEPTION_CONTINUE_SEARCH;
 }
 
+// Platform-specific executable name
+static char exec_name[MAX_PATH];
+  // initialized in _Jv_platform_initialize()
+
+const char *_Jv_ThisExecutable (void)
+{
+  return exec_name;
+}
+
 // Platform-specific VM initialization.
 void
 _Jv_platform_initialize (void)
@@ -37,8 +46,12 @@ _Jv_platform_initialize (void)
   if (WSAStartup (MAKEWORD (1, 1), &data))
     MessageBox (NULL, "Error initialising winsock library.", "Error",
 		MB_OK | MB_ICONEXCLAMATION);
+  
   // Install exception handler
   SetUnhandledExceptionFilter (win32_exception_handler);
+  
+  // Initialize our executable name
+  GetModuleFileName(NULL, exec_name, sizeof(exec_name));
 }
 
 // gettimeofday implementation.