GDB 7.6.50

gdb/target-descriptions.c

 /* Target description support for GDB.
 
-   Copyright (C) 2006-2012 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
    Contributed by CodeSourcery.
 
    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.
 
@@ skipping 13 matching lines @@
 #include "target.h"
 #include "target-descriptions.h"
 #include "vec.h"
 #include "xml-support.h"
 #include "xml-tdesc.h"
 #include "osabi.h"
 
 #include "gdb_assert.h"
 #include "gdb_obstack.h"
 #include "hashtab.h"
+#include "inferior.h"
 
 /* Types.  */
 
 typedef struct property
 {
   char *key;
   char *value;
 } property_s;
 DEF_VEC_O(property_s);
 
@@ skipping 177 matching lines @@
      numbering).  */
   VEC(tdesc_arch_reg) *arch_regs;
 
   /* Functions which report the register name, type, and reggroups for
      pseudo-registers.  */
   gdbarch_register_name_ftype *pseudo_register_name;
   gdbarch_register_type_ftype *pseudo_register_type;
   gdbarch_register_reggroup_p_ftype *pseudo_register_reggroup_p;
 };
 
-/* Global state.  These variables are associated with the current
-   target; if GDB adds support for multiple simultaneous targets, then
-   these variables should become target-specific data.  */
+/* Info about an inferior's target description.  There's one of these
+   for each inferior.  */
 
-/* A flag indicating that a description has already been fetched from
-   the current target, so it should not be queried again.  */
+struct target_desc_info
+{
+  /* A flag indicating that a description has already been fetched
+     from the target, so it should not be queried again.  */
 
-static int target_desc_fetched;
+  int fetched;
 
-/* The description fetched from the current target, or NULL if the
-   current target did not supply any description.  Only valid when
-   target_desc_fetched is set.  Only the description initialization
-   code should access this; normally, the description should be
-   accessed through the gdbarch object.  */
+  /* The description fetched from the target, or NULL if the target
+     did not supply any description.  Only valid when
+     target_desc_fetched is set.  Only the description initialization
+     code should access this; normally, the description should be
+     accessed through the gdbarch object.  */
 
-static const struct target_desc *current_target_desc;
+  const struct target_desc *tdesc;
 
-/* Other global variables.  */
+  /* The filename to read a target description from, as set by "set
+     tdesc filename ..."  */
 
-/* The filename to read a target description from.  */
+  char *filename;
+};
 
-static char *target_description_filename;
+/* Get the inferior INF's target description info, allocating one on
+   the stop if necessary.  */
+
+static struct target_desc_info *
+get_tdesc_info (struct inferior *inf)
+{
+  if (inf->tdesc_info == NULL)
+    inf->tdesc_info = XCNEW (struct target_desc_info);
+  return inf->tdesc_info;
+}
 
 /* A handle for architecture-specific data associated with the
    target description (see struct tdesc_arch_data).  */
 
 static struct gdbarch_data *tdesc_data;
 
+/* See target-descriptions.h.  */
+
+int
+target_desc_info_from_user_p (struct target_desc_info *info)
+{
+  return info != NULL && info->filename != NULL;
+}
+
+/* See target-descriptions.h.  */
+
+void
+copy_inferior_target_desc_info (struct inferior *destinf, struct inferior *srcinf)
+{
+  struct target_desc_info *src = get_tdesc_info (srcinf);
+  struct target_desc_info *dest = get_tdesc_info (destinf);
+
+  dest->fetched = src->fetched;
+  dest->tdesc = src->tdesc;
+  dest->filename = src->filename != NULL ? xstrdup (src->filename) : NULL;
+}
+
+/* See target-descriptions.h.  */
+
+void
+target_desc_info_free (struct target_desc_info *tdesc_info)
+{
+  if (tdesc_info != NULL)
+    {
+      xfree (tdesc_info->filename);
+      xfree (tdesc_info);
+    }
+}
+
+/* Convenience helper macros.  */
+
+#define target_desc_fetched \
+  get_tdesc_info (current_inferior ())->fetched
+#define current_target_desc \
+  get_tdesc_info (current_inferior ())->tdesc
+#define target_description_filename \
+  get_tdesc_info (current_inferior ())->filename
+
+/* The string manipulated by the "set tdesc filename ..." command.  */
+
+static char *tdesc_filename_cmd_string;
+
 /* Fetch the current target's description, and switch the current
    architecture to one which incorporates that description.  */
 
 void
 target_find_description (void)
 {
   /* If we've already fetched a description from the target, don't do
      it again.  This allows a target to fetch the description early,
      during its to_open or to_create_inferior, if it needs extra
      information about the target to initialize.  */
   if (target_desc_fetched)
     return;
 
   /* The current architecture should not have any target description
      specified.  It should have been cleared, e.g. when we
      disconnected from the previous target.  */
-  gdb_assert (gdbarch_target_desc (target_gdbarch) == NULL);
+  gdb_assert (gdbarch_target_desc (target_gdbarch ()) == NULL);
 
   /* First try to fetch an XML description from the user-specified
      file.  */
   current_target_desc = NULL;
   if (target_description_filename != NULL
       && *target_description_filename != '\0')
     current_target_desc
       = file_read_description_xml (target_description_filename);
 
   /* Next try to read the description from the current target using
@@ skipping 12 matching lines @@
       struct gdbarch_info info;
 
       gdbarch_info_init (&info);
       info.target_desc = current_target_desc;
       if (!gdbarch_update_p (info))
         warning (_("Architecture rejected target-supplied description"));
       else
         {
           struct tdesc_arch_data *data;
 
-          data = gdbarch_data (target_gdbarch, tdesc_data);
+          data = gdbarch_data (target_gdbarch (), tdesc_data);
           if (tdesc_has_registers (current_target_desc)
               && data->arch_regs == NULL)
             warning (_("Target-supplied registers are not supported "
                        "by the current architecture"));
         }
     }
 
   /* Now that we know this description is usable, record that we
      fetched it.  */
   target_desc_fetched = 1;
@@ skipping 1178 matching lines @@
 }
 
 static void
 show_tdesc_cmd (char *args, int from_tty)
 {
   cmd_show_list (tdesc_show_cmdlist, from_tty, "");
 }
 
 static void
 unset_tdesc_cmd (char *args, int from_tty)