2009-07-31 Ulrich Weigand <uweigand@de.ibm.com>
+ * features/gdb-target.dtd (target): Accept optional
+ <compatible> elements.
+ (compatible): Define element.
+
+ * target-descriptions.h (tdesc_compatible_p): New.
+ (tdesc_add_compatible): New.
+ * target-descriptions.c (arch_p): New VEC_P type.
+ (struct target_desc): New member compatible.
+ (free_target_description): Handle it.
+ (maint_print_c_tdesc_cmd): Likewise.
+ (tdesc_compatible_p): New function.
+ (tdesc_add_compatible): New function.
+
+ * xml-tdesc.c (tdesc_end_compatible): New function.
+ (target_children): Handle <compatible> element.
+
+ * arch-utils.c (choose_architecture_for_target): Accept target
+ description instead of BFD architecture as input. Query target
+ description for compatible architectures.
+ (gdbarch_info_fill): Update call.
+
+ * NEWS: Mention <compatible> element of target descriptions.
+
+2009-07-31 Ulrich Weigand <uweigand@de.ibm.com>
+
* breakpoint.c (remove_breakpoints): If removing one breakpoint
location fails, still continue to remove other locations.
(remove_hw_watchpoints): Likewise.
"Target Description Format" section in the user manual for more
information.
+* Target descriptions can now describe "compatible" architectures
+to indicate that the target can execute applications for a different
+architecture in addition to those for the main target architecture.
+See the "Target Description Format" section in the user manual for
+more information.
+
* New commands (for set/show, see "New options" below)
find [/size-char] [/max-count] start-address, end-address|+search-space-size,
}
/* Given SELECTED, a currently selected BFD architecture, and
- FROM_TARGET, a BFD architecture reported by the target description,
- return what architecture to use. Either may be NULL; if both are
- specified, we use the more specific. If the two are obviously
- incompatible, warn the user. */
+ TARGET_DESC, the current target description, return what
+ architecture to use.
+
+ SELECTED may be NULL, in which case we return the architecture
+ associated with TARGET_DESC. If SELECTED specifies a variant
+ of the architecture associtated with TARGET_DESC, return the
+ more specific of the two.
+
+ If SELECTED is a different architecture, but it is accepted as
+ compatible by the target, we can use the target architecture.
+
+ If SELECTED is obviously incompatible, warn the user. */
static const struct bfd_arch_info *
-choose_architecture_for_target (const struct bfd_arch_info *selected,
- const struct bfd_arch_info *from_target)
+choose_architecture_for_target (const struct target_desc *target_desc,
+ const struct bfd_arch_info *selected)
{
+ const struct bfd_arch_info *from_target = tdesc_architecture (target_desc);
const struct bfd_arch_info *compat1, *compat2;
if (selected == NULL)
if (compat1 == NULL && compat2 == NULL)
{
+ /* BFD considers the architectures incompatible. Check our target
+ description whether it accepts SELECTED as compatible anyway. */
+ if (tdesc_compatible_p (target_desc, selected))
+ return from_target;
+
warning (_("Selected architecture %s is not compatible "
"with reported target architecture %s"),
selected->printable_name, from_target->printable_name);
/* From the target. */
if (info->target_desc != NULL)
info->bfd_arch_info = choose_architecture_for_target
- (info->bfd_arch_info, tdesc_architecture (info->target_desc));
+ (info->target_desc, info->bfd_arch_info);
/* From the default. */
if (info->bfd_arch_info == NULL)
info->bfd_arch_info = default_bfd_arch;
+2009-07-31 Ulrich Weigand <uweigand@de.ibm.com>
+
+ * gdb.texinfo (Target Descriptions): Document <compatible> element.
+
2009-07-28 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.texinfo (ARM Features): Document org.gnu.gdb.arm.vfp and
<target version="1.0">
@r{[}@var{architecture}@r{]}
@r{[}@var{osabi}@r{]}
+ @r{[}@var{compatible}@r{]}
@r{[}@var{feature}@dots{}@r{]}
</target>
@end smallexample
<architecture>@var{arch}</architecture>
@end smallexample
-@var{arch} is an architecture name from the same selection
-accepted by @code{set architecture} (@pxref{Targets, ,Specifying a
-Debugging Target}).
+@var{arch} is one of the architectures from the set accepted by
+@code{set architecture} (@pxref{Targets, ,Specifying a Debugging Target}).
@subsection OS ABI
@cindex @code{<osabi>}
@var{abi-name} is an OS ABI name from the same selection accepted by
@w{@code{set osabi}} (@pxref{ABI, ,Configuring the Current ABI}).
+@subsection Compatible Architecture
+@cindex @code{<compatible>}
+
+This optional field was introduced in @value{GDBN} version 7.0.
+Previous versions of @value{GDBN} ignore it.
+
+A @samp{<compatible>} element has this form:
+
+@smallexample
+ <compatible>@var{arch}</compatible>
+@end smallexample
+
+@var{arch} is one of the architectures from the set accepted by
+@code{set architecture} (@pxref{Targets, ,Specifying a Debugging Target}).
+
+A @samp{<compatible>} element is used to specify that the target
+is able to run binaries in some other than the main target architecture
+given by the @samp{<architecture>} element. For example, on the
+Cell Broadband Engine, the main architecture is @code{powerpc:common}
+or @code{powerpc:common64}, but the system is able to run binaries
+in the @code{spu} architecture as well. The way to describe this
+capability with @samp{<compatible>} is as follows:
+
+@smallexample
+ <architecture>powerpc:common</architecture>
+ <compatible>spu</compatible>
+@end smallexample
+
@subsection Features
@cindex <feature>
<!-- The root element of a GDB target description is <target>. -->
-<!-- The osabi element was added post GDB 6.8. The version wasn't
- bumped, since older GDBs silently ignore unknown elements. -->
+<!-- The osabi and compatible elements were added post GDB 6.8. The version
+ wasn't bumped, since older GDBs silently ignore unknown elements. -->
-<!ELEMENT target (architecture?, osabi?, feature*)>
+<!ELEMENT target (architecture?, osabi?, compatible*, feature*)>
<!ATTLIST target
version CDATA #FIXED "1.0">
<!ELEMENT osabi (#PCDATA)>
+<!ELEMENT compatible (#PCDATA)>
+
<!ELEMENT feature ((vector | union)*, reg*)>
<!ATTLIST feature
name ID #REQUIRED>
} *tdesc_feature_p;
DEF_VEC_P(tdesc_feature_p);
+/* A compatible architecture from a target description. */
+typedef const struct bfd_arch_info *arch_p;
+DEF_VEC_P(arch_p);
+
/* A target description. */
struct target_desc
otherwise. */
enum gdb_osabi osabi;
+ /* The list of compatible architectures reported by the target. */
+ VEC(arch_p) *compatible;
+
/* Any architecture-specific properties specified by the target. */
VEC(property_s) *properties;
return NULL;
}
+
+/* Return non-zero if this target description is compatible
+ with the given BFD architecture. */
+
+int
+tdesc_compatible_p (const struct target_desc *target_desc,
+ const struct bfd_arch_info *arch)
+{
+ const struct bfd_arch_info *compat;
+ int ix;
+
+ for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat);
+ ix++)
+ {
+ if (compat == arch
+ || arch->compatible (arch, compat)
+ || compat->compatible (compat, arch))
+ return 1;
+ }
+
+ return 0;
+}
\f
/* Direct accessors for target descriptions. */
}
VEC_free (property_s, target_desc->properties);
+ VEC_free (arch_p, target_desc->compatible);
+
xfree (target_desc);
}
}
void
+tdesc_add_compatible (struct target_desc *target_desc,
+ const struct bfd_arch_info *compatible)
+{
+ const struct bfd_arch_info *compat;
+ int ix;
+
+ /* If this instance of GDB is compiled without BFD support for the
+ compatible architecture, simply ignore it -- we would not be able
+ to handle it anyway. */
+ if (compatible == NULL)
+ return;
+
+ for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat);
+ ix++)
+ if (compat == compatible)
+ internal_error (__FILE__, __LINE__,
+ _("Attempted to add duplicate "
+ "compatible architecture \"%s\""),
+ compatible->printable_name);
+
+ VEC_safe_push (arch_p, target_desc->compatible, compatible);
+}
+
+void
set_tdesc_property (struct target_desc *target_desc,
const char *key, const char *value)
{
maint_print_c_tdesc_cmd (char *args, int from_tty)
{
const struct target_desc *tdesc;
+ const struct bfd_arch_info *compatible;
const char *filename, *inp;
char *function, *outp;
struct property *prop;
printf_unfiltered ("\n");
}
+ for (ix = 0; VEC_iterate (arch_p, tdesc->compatible, ix, compatible);
+ ix++)
+ {
+ printf_unfiltered
+ (" tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
+ compatible->printable_name);
+ }
+ if (ix)
+ printf_unfiltered ("\n");
+
for (ix = 0; VEC_iterate (property_s, tdesc->properties, ix, prop);
ix++)
{
enum gdb_osabi tdesc_osabi (const struct target_desc *);
+/* Return non-zero if this target description is compatible
+ with the given BFD architecture. */
+
+int tdesc_compatible_p (const struct target_desc *,
+ const struct bfd_arch_info *);
+
/* Return the string value of a property named KEY, or NULL if the
property was not specified. */
void set_tdesc_osabi (struct target_desc *, enum gdb_osabi osabi);
void set_tdesc_property (struct target_desc *,
const char *key, const char *value);
+void tdesc_add_compatible (struct target_desc *,
+ const struct bfd_arch_info *);
struct tdesc_feature *tdesc_create_feature (struct target_desc *tdesc,
const char *name);
set_tdesc_osabi (data->tdesc, osabi);
}
+/* Handle the end of a <compatible> element and its value. */
+
+static void
+tdesc_end_compatible (struct gdb_xml_parser *parser,
+ const struct gdb_xml_element *element,
+ void *user_data, const char *body_text)
+{
+ struct tdesc_parsing_data *data = user_data;
+ const struct bfd_arch_info *arch;
+
+ arch = bfd_scan_arch (body_text);
+ tdesc_add_compatible (data->tdesc, arch);
+}
+
/* Handle the start of a <target> element. */
static void
NULL, tdesc_end_arch },
{ "osabi", NULL, NULL, GDB_XML_EF_OPTIONAL,
NULL, tdesc_end_osabi },
+ { "compatible", NULL, NULL, GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE,
+ NULL, tdesc_end_compatible },
{ "feature", feature_attributes, feature_children,
GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE,
tdesc_start_feature, NULL },
OSDN Git Service
