Merge GDB 7.5.1

gdb/windows-tdep.c

 /* Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "windows-tdep.h"
 #include "gdb_obstack.h"
 #include "xml-support.h"
 #include "gdbarch.h"
 #include "target.h"
 #include "value.h"
 #include "inferior.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
+#include "objfiles.h"
 
 struct cmd_list_element *info_w32_cmdlist;
 
 typedef struct thread_information_block_32
   {
     uint32_t current_seh;                       /* %fs:0x0000 */
     uint32_t current_top_of_stack;              /* %fs:0x0004 */
     uint32_t current_bottom_of_stack;           /* %fs:0x0008 */
     uint32_t sub_system_tib;                    /* %fs:0x000c */
     uint32_t fiber_data;                        /* %fs:0x0010 */
@@ skipping 222 matching lines @@
     tlb_value_read,
     tlb_value_write
   };
 
 
 /* Return a new value with the correct type for the tlb object of
    the current thread using architecture GDBARCH.  Return a void value
    if there's no object available.  */
 
 static struct value *
-tlb_make_value (struct gdbarch *gdbarch, struct internalvar *var)
+tlb_make_value (struct gdbarch *gdbarch, struct internalvar *var, void *ignore)
 {
   if (target_has_stack && !ptid_equal (inferior_ptid, null_ptid))
     {
       struct type *type = windows_get_tlb_type (gdbarch);
       return allocate_computed_value (type, &tlb_value_funcs, NULL);
     }
 
   return allocate_value (builtin_type (gdbarch)->builtin_void);
 }
 
@@ skipping 109 matching lines @@
   obstack_grow_str (obstack, p);
   xfree (p);
   obstack_grow_str (obstack, "\"><segment address=\"");
   /* The symbols in a dll are offset by 0x1000, which is the
      offset from 0 of the first byte in an image - because of the file
      header and the section alignment.  */
   obstack_grow_str (obstack, paddress (gdbarch, load_addr + 0x1000));
   obstack_grow_str (obstack, "\"/></library>");
 }
 
+/* Implement the "iterate_over_objfiles_in_search_order" gdbarch
+   method.  It searches all objfiles, starting with CURRENT_OBJFILE
+   first (if not NULL).
+
+   On Windows, the system behaves a little differently when two
+   objfiles each define a global symbol using the same name, compared
+   to other platforms such as GNU/Linux for instance.  On GNU/Linux,
+   all instances of the symbol effectively get merged into a single
+   one, but on Windows, they remain distinct.
+
+   As a result, it usually makes sense to start global symbol searches
+   with the current objfile before expanding it to all other objfiles.
+   This helps for instance when a user debugs some code in a DLL that
+   refers to a global variable defined inside that DLL.  When trying
+   to print the value of that global variable, it would be unhelpful
+   to print the value of another global variable defined with the same
+   name, but in a different DLL.  */
+
+void
+windows_iterate_over_objfiles_in_search_order
+  (struct gdbarch *gdbarch,
+   iterate_over_objfiles_in_search_order_cb_ftype *cb,
+   void *cb_data, struct objfile *current_objfile)
+{
+  int stop;
+  struct objfile *objfile;
+
+  if (current_objfile)
+    {
+      stop = cb (current_objfile, cb_data);
+      if (stop)
+        return;
+    }
+
+  ALL_OBJFILES (objfile)
+    {
+      if (objfile != current_objfile)
+        {
+          stop = cb (objfile, cb_data);
+          if (stop)
+            return;
+        }
+    }
+}
+
 static void
 show_maint_show_all_tib (struct ui_file *file, int from_tty,
                 struct cmd_list_element *c, const char *value)
 {
   fprintf_filtered (file, _("Show all non-zero elements of "
                             "Thread Information Block is %s.\n"), value);
 }
 
 static void
 info_w32_command (char *args, int from_tty)
 {
   help_list (info_w32_cmdlist, "info w32 ", class_info, gdb_stdout);
 }
 
 static int w32_prefix_command_valid = 0;
 void
 init_w32_command_list (void)
 {
   if (!w32_prefix_command_valid)
     {
       add_prefix_cmd ("w32", class_info, info_w32_command,
                       _("Print information specific to Win32 debugging."),
                       &info_w32_cmdlist, "info w32 ", 0, &infolist);
       w32_prefix_command_valid = 1;
     }
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern initialize_file_ftype _initialize_windows_tdep;
+
+/* Implementation of `tlb' variable.  */
+
+static const struct internalvar_funcs tlb_funcs =
+{
+  tlb_make_value,
+  NULL,
+  NULL
+};
+
 void
 _initialize_windows_tdep (void)
 {
   init_w32_command_list ();
   add_cmd ("thread-information-block", class_info, display_tib,
            _("Display thread information block."),
            &info_w32_cmdlist);
   add_alias_cmd ("tib", "thread-information-block", class_info, 1,
                  &info_w32_cmdlist);
 
   add_setshow_boolean_cmd ("show-all-tib", class_maintenance,
                            &maint_display_all_tib, _("\
 Set whether to display all non-zero fields of thread information block."), _("\
 Show whether to display all non-zero fields of thread information block."), _("\
 Use \"on\" to enable, \"off\" to disable.\n\
 If enabled, all non-zero fields of thread information block are displayed,\n\
 even if their meaning is unknown."),
                            NULL,
                            show_maint_show_all_tib,
                            &maintenance_set_cmdlist,
                            &maintenance_show_cmdlist);
 
   /* Explicitly create without lookup, since that tries to create a
      value with a void typed value, and when we get here, gdbarch
      isn't initialized yet.  At this point, we're quite sure there
      isn't another convenience variable of the same name.  */
-  create_internalvar_type_lazy ("_tlb", tlb_make_value);
+  create_internalvar_type_lazy ("_tlb", &tlb_funcs, NULL);
 }