* symfile.c (symbol_file_add): Always call the

	pre/post_add_symbol_hooks.

	* gdbtk.c (gdb_get_vars_command): Return static variables and
	variables stored in registers.

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index aa70a6368f261a5c7748c788773a8c4638fe8012..62b80a47ea8b4d85c37d704f071d9eb78449c15a 100644 (file)
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,11 @@
+Tue Jun  9 14:10:46 1998  Keith Seitz  <keiths@cygnus.com>
+
+       * symfile.c (symbol_file_add): Always call the
+       pre/post_add_symbol_hooks.
+
+       * gdbtk.c (gdb_get_vars_command): Return static variables and
+       variables stored in registers.
+
 Fri Jun  5 00:16:22 1998  Martin M. Hunt  <hunt@cygnus.com>
 
        * gdbtk.c (gdbtk_init): Change all references to

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index c8451dcc8c017b24d3a8c3f377613c761eead45b..4718e155427cba7c92ef1ecf89d575768e4491e6 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -2674,8 +2674,6 @@ gdb_get_vars_command (clientData, interp, objc, objv)
           default:
           case LOC_UNDEF:                /* catches errors        */
           case LOC_CONST:            /* constant              */
-          case LOC_STATIC:           /* static                */
-          case LOC_REGISTER:      /* register              */
           case LOC_TYPEDEF:          /* local typedef         */
           case LOC_LABEL:            /* local label           */
           case LOC_BLOCK:            /* local function        */
@@ -2694,6 +2692,8 @@ gdb_get_vars_command (clientData, interp, objc, objv)
                                         Tcl_NewStringObj (SYMBOL_NAME (sym), -1));
             break;
           case LOC_LOCAL:            /* stack local           */
+          case LOC_STATIC:           /* static                */
+          case LOC_REGISTER:      /* register              */
           case LOC_BASEREG:          /* basereg local         */
             if (!arguments)
               Tcl_ListObjAppendElement (interp, result,

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 88cf3eed5ad2f50a8378b927bf1a9cb17269e313..5d4c85856d9c549fbaa7df27d27643c2ea2d3699 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -656,16 +656,13 @@ symbol_file_add (name, from_tty, addr, mainline, mapped, readnow)
       /* We either created a new mapped symbol table, mapped an existing
         symbol table file which has not had initial symbol reading
         performed, or need to read an unmapped symbol table. */
-      if (from_tty || info_verbose)
-       {
       if (pre_add_symbol_hook)
         pre_add_symbol_hook (name);
-      else
-        {
-          printf_filtered ("Reading symbols from %s...", name);
-          wrap_here ("");
-          gdb_flush (gdb_stdout);
-        }
+      if (from_tty || info_verbose)
+       {
+      printf_filtered ("Reading symbols from %s...", name);
+      wrap_here ("");
+      gdb_flush (gdb_stdout);
        }
       syms_from_objfile (objfile, addr, mainline, from_tty);
     }      
@@ -692,15 +689,12 @@ symbol_file_add (name, from_tty, addr, mainline, mapped, readnow)
        }
     }
 
+  if (post_add_symbol_hook)
+    post_add_symbol_hook ();
   if (from_tty || info_verbose)
     {
-      if (post_add_symbol_hook)
-        post_add_symbol_hook ();
-      else
-        {
-          printf_filtered ("done.\n");
-          gdb_flush (gdb_stdout);
-        }
+      printf_filtered ("done.\n");
+      gdb_flush (gdb_stdout);
     }
 
   new_symfile_objfile (objfile, mainline, from_tty);
@@ -1437,8 +1431,10 @@ deduce_language_from_filename (filename)
   else if (STREQ (c, ".cc") || STREQ (c, ".C") || STREQ (c, ".cxx")
           || STREQ (c, ".cpp") || STREQ (c, ".cp") || STREQ (c, ".c++"))
     return language_cplus;
+  /* start-sanitize-java */
   else if (STREQ (c, ".java") || STREQ (c, ".class"))
     return language_java;
+  /* end-sanitize-java */
   else if (STREQ (c, ".ch") || STREQ (c, ".c186") || STREQ (c, ".c286"))
     return language_chill;
   else if (STREQ (c, ".f") || STREQ (c, ".F"))
@@ -2330,6 +2326,8 @@ unmap_overlay_command (args, from_tty)
 
 static void
 overlay_auto_command (args, from_tty)
+     char *args;
+     int   from_tty;
 {
   overlay_debugging = -1;
   if (info_verbose)
@@ -2342,6 +2340,8 @@ overlay_auto_command (args, from_tty)
 
 static void
 overlay_manual_command (args, from_tty)
+     char *args;
+     int   from_tty;
 {
   overlay_debugging = 1;
   if (info_verbose)
@@ -2354,6 +2354,8 @@ overlay_manual_command (args, from_tty)
 
 static void
 overlay_off_command (args, from_tty)
+     char *args;
+     int   from_tty;
 {
   overlay_debugging = 0;
   if (info_verbose)
@@ -2362,6 +2364,8 @@ overlay_off_command (args, from_tty)
 
 static void
 overlay_load_command (args, from_tty)
+     char *args;
+     int   from_tty;
 {
   if (target_overlay_update)
     (*target_overlay_update) (NULL);