Replace "exec" with "executable" in messages.

[deliverable/binutils-gdb.git] / gdb / gdbtk-cmds.c

diff --git a/gdb/gdbtk-cmds.c b/gdb/gdbtk-cmds.c
index 26b9721bc977dbafc0099d8b425a96c5e9ec6c40..9a22d3e4a12c4b97f8913fa93339ce33c188be67 100644 (file)
--- a/gdb/gdbtk-cmds.c
+++ b/gdb/gdbtk-cmds.c
@@ -2106,7 +2106,7 @@ gdb_disassemble (clientData, interp, objc, objv)
 
       symtab = find_pc_symtab (low); /* Assume symtab is valid for whole PC range */
 
-      if (!symtab)
+      if (!symtab || !symtab->linetable)
         goto assembly_only;
 
       /* First, convert the linetable to a bunch of my_line_entry's.  */
@@ -3118,7 +3118,14 @@ get_frame_name (interp, list, fi)
   
   if (sal.symtab)
     {
-      objv[0] = Tcl_NewStringObj (funname, -1);
+      char *name = NULL;
+
+      if (funlang == language_cplus)
+        name = cplus_demangle (funname, 0);
+      if (name == NULL)
+        name = funname;
+
+      objv[0] = Tcl_NewStringObj (name, -1);
       Tcl_ListObjAppendElement (interp, list, objv[0]);
     }
   else