/* Dynamic architecture support for GDB, the GNU debugger.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
- Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ Free Software Foundation, Inc.
This file is part of GDB.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
#include "defs.h"
#include "regcache.h"
#include "gdb_assert.h"
#include "sim-regno.h"
-
+#include "gdbcore.h"
#include "osabi.h"
+#include "target-descriptions.h"
#include "version.h"
#include "floatformat.h"
-/* Implementation of extract return value that grubs around in the
- register cache. */
-void
-legacy_extract_return_value (struct type *type, struct regcache *regcache,
- void *valbuf)
+int
+always_use_struct_convention (int gcc_p, struct type *value_type)
{
- char *registers = deprecated_grub_regcache_for_registers (regcache);
- bfd_byte *buf = valbuf;
- DEPRECATED_EXTRACT_RETURN_VALUE (type, registers, buf); /* OK */
+ return 1;
}
-/* Implementation of store return value that grubs the register cache.
- Takes a local copy of the buffer to avoid const problems. */
-void
-legacy_store_return_value (struct type *type, struct regcache *regcache,
- const void *buf)
+enum return_value_convention
+legacy_return_value (struct gdbarch *gdbarch, struct type *valtype,
+ struct regcache *regcache, gdb_byte *readbuf,
+ const gdb_byte *writebuf)
{
- bfd_byte *b = alloca (TYPE_LENGTH (type));
- gdb_assert (regcache == current_regcache);
- memcpy (b, buf, TYPE_LENGTH (type));
- DEPRECATED_STORE_RETURN_VALUE (type, b);
-}
+ /* NOTE: cagney/2004-06-13: The gcc_p parameter to
+ USE_STRUCT_CONVENTION isn't used. */
+ int struct_return = ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT
+ || TYPE_CODE (valtype) == TYPE_CODE_UNION
+ || TYPE_CODE (valtype) == TYPE_CODE_ARRAY)
+ && DEPRECATED_USE_STRUCT_CONVENTION (0, valtype));
+
+ if (writebuf != NULL)
+ {
+ gdb_assert (!struct_return);
+ /* NOTE: cagney/2004-06-13: See stack.c:return_command. Old
+ architectures don't expect STORE_RETURN_VALUE to handle small
+ structures. Should not be called with such types. */
+ gdb_assert (TYPE_CODE (valtype) != TYPE_CODE_STRUCT
+ && TYPE_CODE (valtype) != TYPE_CODE_UNION);
+ STORE_RETURN_VALUE (valtype, regcache, writebuf);
+ }
+ if (readbuf != NULL)
+ {
+ gdb_assert (!struct_return);
+ EXTRACT_RETURN_VALUE (valtype, regcache, readbuf);
+ }
-int
-always_use_struct_convention (int gcc_p, struct type *value_type)
-{
- return 1;
+ if (struct_return)
+ return RETURN_VALUE_STRUCT_CONVENTION;
+ else
+ return RETURN_VALUE_REGISTER_CONVENTION;
}
-
int
legacy_register_sim_regno (int regnum)
{
/* Only makes sense to supply raw registers. */
- gdb_assert (regnum >= 0 && regnum < NUM_REGS);
+ gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch));
/* NOTE: cagney/2002-05-13: The old code did it this way and it is
suspected that some GDB/SIM combinations may rely on this
behavour. The default should be one2one_register_sim_regno
(below). */
- if (REGISTER_NAME (regnum) != NULL
- && REGISTER_NAME (regnum)[0] != '\0')
+ if (gdbarch_register_name (current_gdbarch, regnum) != NULL
+ && gdbarch_register_name (current_gdbarch, regnum)[0] != '\0')
return regnum;
else
return LEGACY_SIM_REGNO_IGNORE;
}
-int
-generic_return_value_on_stack_not (struct type *type)
-{
- return 0;
-}
-
CORE_ADDR
-generic_skip_trampoline_code (CORE_ADDR pc)
+generic_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
{
return 0;
}
return 0;
}
-int
-generic_in_solib_call_trampoline (CORE_ADDR pc, char *name)
-{
- return 0;
-}
-
int
generic_in_solib_return_trampoline (CORE_ADDR pc, char *name)
{
return 0;
}
-#if defined (CALL_DUMMY)
-LONGEST legacy_call_dummy_words[] = CALL_DUMMY;
-#else
-LONGEST legacy_call_dummy_words[1];
-#endif
-int legacy_sizeof_call_dummy_words = sizeof (legacy_call_dummy_words);
-
-void
-generic_remote_translate_xfer_address (struct gdbarch *gdbarch,
- struct regcache *regcache,
- CORE_ADDR gdb_addr, int gdb_len,
- CORE_ADDR * rem_addr, int *rem_len)
-{
- *rem_addr = gdb_addr;
- *rem_len = gdb_len;
-}
-
-/* Helper functions for INNER_THAN */
+/* Helper functions for gdbarch_inner_than */
int
core_addr_lessthan (CORE_ADDR lhs, CORE_ADDR rhs)
return (lhs > rhs);
}
-
-/* Helper functions for TARGET_{FLOAT,DOUBLE}_FORMAT */
-
-const struct floatformat *
-default_float_format (struct gdbarch *gdbarch)
-{
- int byte_order = gdbarch_byte_order (gdbarch);
- switch (byte_order)
- {
- case BFD_ENDIAN_BIG:
- return &floatformat_ieee_single_big;
- case BFD_ENDIAN_LITTLE:
- return &floatformat_ieee_single_little;
- default:
- internal_error (__FILE__, __LINE__,
- "default_float_format: bad byte order");
- }
-}
-
-
-const struct floatformat *
-default_double_format (struct gdbarch *gdbarch)
-{
- int byte_order = gdbarch_byte_order (gdbarch);
- switch (byte_order)
- {
- case BFD_ENDIAN_BIG:
- return &floatformat_ieee_double_big;
- case BFD_ENDIAN_LITTLE:
- return &floatformat_ieee_double_little;
- default:
- internal_error (__FILE__, __LINE__,
- "default_double_format: bad byte order");
- }
-}
-
/* Misc helper functions for targets. */
CORE_ADDR
return reg;
}
-CORE_ADDR
-deprecated_init_frame_pc_default (int fromleaf, struct frame_info *prev)
-{
- if (fromleaf && DEPRECATED_SAVED_PC_AFTER_CALL_P ())
- return DEPRECATED_SAVED_PC_AFTER_CALL (get_next_frame (prev));
- else if (get_next_frame (prev) != NULL)
- return DEPRECATED_FRAME_SAVED_PC (get_next_frame (prev));
- else
- return read_pc ();
-}
-
void
default_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym)
{
register and an offset can determine this. I think it should
instead generate a byte code expression as that would work better
with things like Dwarf2's CFI. */
- if (DEPRECATED_FP_REGNUM >= 0 && DEPRECATED_FP_REGNUM < NUM_REGS)
+ if (DEPRECATED_FP_REGNUM >= 0
+ && DEPRECATED_FP_REGNUM < gdbarch_num_regs (current_gdbarch))
*frame_regnum = DEPRECATED_FP_REGNUM;
- else if (SP_REGNUM >= 0 && SP_REGNUM < NUM_REGS)
- *frame_regnum = SP_REGNUM;
+ else if (gdbarch_sp_regnum (current_gdbarch) >= 0
+ && gdbarch_sp_regnum (current_gdbarch)
+ < gdbarch_num_regs (current_gdbarch))
+ *frame_regnum = gdbarch_sp_regnum (current_gdbarch);
else
/* Should this be an internal error? I guess so, it is reflecting
an architectural limitation in the current design. */
- internal_error (__FILE__, __LINE__, "No virtual frame pointer available");
+ internal_error (__FILE__, __LINE__, _("No virtual frame pointer available"));
*frame_offset = 0;
}
-/* Assume the world is sane, every register's virtual and real size
- is identical. */
-
-int
-generic_register_size (int regnum)
-{
- gdb_assert (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS);
- if (gdbarch_register_type_p (current_gdbarch))
- return TYPE_LENGTH (gdbarch_register_type (current_gdbarch, regnum));
- else
- /* FIXME: cagney/2003-03-01: Once all architectures implement
- gdbarch_register_type(), this entire function can go away. It
- is made obsolete by register_size(). */
- return TYPE_LENGTH (DEPRECATED_REGISTER_VIRTUAL_TYPE (regnum)); /* OK */
-}
-
-/* Assume all registers are adjacent. */
-
-int
-generic_register_byte (int regnum)
-{
- int byte;
- int i;
- gdb_assert (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS);
- byte = 0;
- for (i = 0; i < regnum; i++)
- {
- byte += generic_register_size (i);
- }
- return byte;
-}
-
\f
int
-legacy_pc_in_sigtramp (CORE_ADDR pc, char *name)
+generic_convert_register_p (int regnum, struct type *type)
{
-#if defined (DEPRECATED_IN_SIGTRAMP)
- return DEPRECATED_IN_SIGTRAMP (pc, name);
-#else
- return name && strcmp ("_sigtramp", name) == 0;
-#endif
+ return 0;
}
int
-legacy_convert_register_p (int regnum, struct type *type)
-{
- return (DEPRECATED_REGISTER_CONVERTIBLE_P ()
- && DEPRECATED_REGISTER_CONVERTIBLE (regnum));
-}
-
-void
-legacy_register_to_value (struct frame_info *frame, int regnum,
- struct type *type, void *to)
+default_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type)
{
- char from[MAX_REGISTER_SIZE];
- get_frame_register (frame, regnum, from);
- DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL (regnum, type, from, to);
+ return 0;
}
-void
-legacy_value_to_register (struct frame_info *frame, int regnum,
- struct type *type, const void *tmp)
+int
+generic_instruction_nullified (struct gdbarch *gdbarch,
+ struct regcache *regcache)
{
- char to[MAX_REGISTER_SIZE];
- char *from = alloca (TYPE_LENGTH (type));
- memcpy (from, from, TYPE_LENGTH (type));
- DEPRECATED_REGISTER_CONVERT_TO_RAW (type, regnum, from, to);
- put_frame_register (frame, regnum, to);
+ return 0;
}
int
-default_stabs_argument_has_addr (struct gdbarch *gdbarch, struct type *type)
+default_remote_register_number (struct gdbarch *gdbarch,
+ int regno)
{
- if (DEPRECATED_REG_STRUCT_HAS_ADDR_P ()
- && DEPRECATED_REG_STRUCT_HAS_ADDR (processing_gcc_compilation, type))
- {
- CHECK_TYPEDEF (type);
-
- return (TYPE_CODE (type) == TYPE_CODE_STRUCT
- || TYPE_CODE (type) == TYPE_CODE_UNION
- || TYPE_CODE (type) == TYPE_CODE_SET
- || TYPE_CODE (type) == TYPE_CODE_BITSTRING);
- }
-
- return 0;
+ return regno;
}
\f
/* Functions to manipulate the endianness of the target. */
-/* ``target_byte_order'' is only used when non- multi-arch.
- Multi-arch targets obtain the current byte order using the
- TARGET_BYTE_ORDER gdbarch method.
-
- The choice of initial value is entirely arbitrary. During startup,
- the function initialize_current_architecture() updates this value
- based on default byte-order information extracted from BFD. */
-static int target_byte_order = BFD_ENDIAN_BIG;
-static int target_byte_order_auto = 1;
-
-enum bfd_endian
-selected_byte_order (void)
-{
- if (target_byte_order_auto)
- return BFD_ENDIAN_UNKNOWN;
- else
- return target_byte_order;
-}
+static int target_byte_order_user = BFD_ENDIAN_UNKNOWN;
static const char endian_big[] = "big";
static const char endian_little[] = "little";
};
static const char *set_endian_string;
+enum bfd_endian
+selected_byte_order (void)
+{
+ if (target_byte_order_user != BFD_ENDIAN_UNKNOWN)
+ return gdbarch_byte_order (current_gdbarch);
+ else
+ return BFD_ENDIAN_UNKNOWN;
+}
+
/* Called by ``show endian''. */
static void
-show_endian (char *args, int from_tty)
-{
- if (target_byte_order_auto)
- printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n",
- (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little"));
+show_endian (struct ui_file *file, int from_tty, struct cmd_list_element *c,
+ const char *value)
+{
+ if (target_byte_order_user == BFD_ENDIAN_UNKNOWN)
+ if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+ fprintf_unfiltered (file, _("The target endianness is set automatically "
+ "(currently big endian)\n"));
+ else
+ fprintf_unfiltered (file, _("The target endianness is set automatically "
+ "(currently little endian)\n"));
else
- printf_unfiltered ("The target is assumed to be %s endian\n",
- (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little"));
+ if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+ fprintf_unfiltered (file,
+ _("The target is assumed to be big endian\n"));
+ else
+ fprintf_unfiltered (file,
+ _("The target is assumed to be little endian\n"));
}
static void
set_endian (char *ignore_args, int from_tty, struct cmd_list_element *c)
{
+ struct gdbarch_info info;
+
+ gdbarch_info_init (&info);
+
if (set_endian_string == endian_auto)
{
- target_byte_order_auto = 1;
+ target_byte_order_user = BFD_ENDIAN_UNKNOWN;
+ if (! gdbarch_update_p (info))
+ internal_error (__FILE__, __LINE__,
+ _("set_endian: architecture update failed"));
}
else if (set_endian_string == endian_little)
{
- struct gdbarch_info info;
- target_byte_order_auto = 0;
- gdbarch_info_init (&info);
info.byte_order = BFD_ENDIAN_LITTLE;
if (! gdbarch_update_p (info))
- printf_unfiltered ("Little endian target not supported by GDB\n");
+ printf_unfiltered (_("Little endian target not supported by GDB\n"));
+ else
+ target_byte_order_user = BFD_ENDIAN_LITTLE;
}
else if (set_endian_string == endian_big)
{
- struct gdbarch_info info;
- target_byte_order_auto = 0;
- gdbarch_info_init (&info);
info.byte_order = BFD_ENDIAN_BIG;
if (! gdbarch_update_p (info))
- printf_unfiltered ("Big endian target not supported by GDB\n");
+ printf_unfiltered (_("Big endian target not supported by GDB\n"));
+ else
+ target_byte_order_user = BFD_ENDIAN_BIG;
}
else
internal_error (__FILE__, __LINE__,
- "set_endian: bad value");
- show_endian (NULL, from_tty);
+ _("set_endian: bad value"));
+
+ show_endian (gdb_stdout, from_tty, NULL, NULL);
+}
+
+/* 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. */
+
+static const struct bfd_arch_info *
+choose_architecture_for_target (const struct bfd_arch_info *selected,
+ const struct bfd_arch_info *from_target)
+{
+ const struct bfd_arch_info *compat1, *compat2;
+
+ if (selected == NULL)
+ return from_target;
+
+ if (from_target == NULL)
+ return selected;
+
+ /* struct bfd_arch_info objects are singletons: that is, there's
+ supposed to be exactly one instance for a given machine. So you
+ can tell whether two are equivalent by comparing pointers. */
+ if (from_target == selected)
+ return selected;
+
+ /* BFD's 'A->compatible (A, B)' functions return zero if A and B are
+ incompatible. But if they are compatible, it returns the 'more
+ featureful' of the two arches. That is, if A can run code
+ written for B, but B can't run code written for A, then it'll
+ return A.
+
+ Some targets (e.g. MIPS as of 2006-12-04) don't fully
+ implement this, instead always returning NULL or the first
+ argument. We detect that case by checking both directions. */
+
+ compat1 = selected->compatible (selected, from_target);
+ compat2 = from_target->compatible (from_target, selected);
+
+ if (compat1 == NULL && compat2 == NULL)
+ {
+ warning (_("Selected architecture %s is not compatible "
+ "with reported target architecture %s"),
+ selected->printable_name, from_target->printable_name);
+ return selected;
+ }
+
+ if (compat1 == NULL)
+ return compat2;
+ if (compat2 == NULL)
+ return compat1;
+ if (compat1 == compat2)
+ return compat1;
+
+ /* If the two didn't match, but one of them was a default architecture,
+ assume the more specific one is correct. This handles the case
+ where an executable or target description just says "mips", but
+ the other knows which MIPS variant. */
+ if (compat1->the_default)
+ return compat2;
+ if (compat2->the_default)
+ return compat1;
+
+ /* We have no idea which one is better. This is a bug, but not
+ a critical problem; warn the user. */
+ warning (_("Selected architecture %s is ambiguous with "
+ "reported target architecture %s"),
+ selected->printable_name, from_target->printable_name);
+ return selected;
}
/* Functions to manipulate the architecture of the target */
enum set_arch { set_arch_auto, set_arch_manual };
-static int target_architecture_auto = 1;
+static const struct bfd_arch_info *target_architecture_user;
static const char *set_architecture_string;
const char *
selected_architecture_name (void)
{
- if (target_architecture_auto)
+ if (target_architecture_user == NULL)
return NULL;
else
return set_architecture_string;
argument. */
static void
-show_architecture (char *args, int from_tty)
+show_architecture (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
{
const char *arch;
- arch = TARGET_ARCHITECTURE->printable_name;
- if (target_architecture_auto)
- printf_filtered ("The target architecture is set automatically (currently %s)\n", arch);
+ arch = gdbarch_bfd_arch_info (current_gdbarch)->printable_name;
+ if (target_architecture_user == NULL)
+ fprintf_filtered (file, _("\
+The target architecture is set automatically (currently %s)\n"), arch);
else
- printf_filtered ("The target architecture is assumed to be %s\n", arch);
+ fprintf_filtered (file, _("\
+The target architecture is assumed to be %s\n"), arch);
}
static void
set_architecture (char *ignore_args, int from_tty, struct cmd_list_element *c)
{
+ struct gdbarch_info info;
+
+ gdbarch_info_init (&info);
+
if (strcmp (set_architecture_string, "auto") == 0)
{
- target_architecture_auto = 1;
+ target_architecture_user = NULL;
+ if (!gdbarch_update_p (info))
+ internal_error (__FILE__, __LINE__,
+ _("could not select an architecture automatically"));
}
else
{
- struct gdbarch_info info;
- gdbarch_info_init (&info);
info.bfd_arch_info = bfd_scan_arch (set_architecture_string);
if (info.bfd_arch_info == NULL)
internal_error (__FILE__, __LINE__,
- "set_architecture: bfd_scan_arch failed");
+ _("set_architecture: bfd_scan_arch failed"));
if (gdbarch_update_p (info))
- target_architecture_auto = 0;
+ target_architecture_user = info.bfd_arch_info;
else
- printf_unfiltered ("Architecture `%s' not recognized.\n",
+ printf_unfiltered (_("Architecture `%s' not recognized.\n"),
set_architecture_string);
}
- show_architecture (NULL, from_tty);
+ show_architecture (gdb_stdout, from_tty, NULL, NULL);
}
/* Try to select a global architecture that matches "info". Return
struct gdbarch *new_gdbarch;
struct gdbarch_info info;
+ /* If we call gdbarch_find_by_info without filling in info.abfd,
+ then it will use the global exec_bfd. That's fine if we don't
+ have one of those either. And that's the only time we should
+ reach here with a NULL ABFD argument - when we are discarding
+ the executable. */
+ gdb_assert (abfd != NULL || exec_bfd == NULL);
+
gdbarch_info_init (&info);
info.abfd = abfd;
return gdbarch_find_by_info (info);
gdbarch = gdbarch_from_bfd (abfd);
if (gdbarch == NULL)
- error ("Architecture of file not recognized.\n");
+ error (_("Architecture of file not recognized."));
deprecated_current_gdbarch_select_hack (gdbarch);
}
static const bfd_target *default_bfd_vec;
#endif
+static int default_byte_order = BFD_ENDIAN_UNKNOWN;
+
void
initialize_current_architecture (void)
{
gdbarch_info_init (&info);
/* Find a default architecture. */
- if (info.bfd_arch_info == NULL
- && default_bfd_arch != NULL)
- info.bfd_arch_info = default_bfd_arch;
- if (info.bfd_arch_info == NULL)
+ if (default_bfd_arch == NULL)
{
/* Choose the architecture by taking the first one
alphabetically. */
}
if (chosen == NULL)
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: No arch");
- info.bfd_arch_info = bfd_scan_arch (chosen);
- if (info.bfd_arch_info == NULL)
+ _("initialize_current_architecture: No arch"));
+ default_bfd_arch = bfd_scan_arch (chosen);
+ if (default_bfd_arch == NULL)
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: Arch not found");
+ _("initialize_current_architecture: Arch not found"));
}
+ info.bfd_arch_info = default_bfd_arch;
+
/* Take several guesses at a byte order. */
- if (info.byte_order == BFD_ENDIAN_UNKNOWN
+ if (default_byte_order == BFD_ENDIAN_UNKNOWN
&& default_bfd_vec != NULL)
{
/* Extract BFD's default vector's byte order. */
switch (default_bfd_vec->byteorder)
{
case BFD_ENDIAN_BIG:
- info.byte_order = BFD_ENDIAN_BIG;
+ default_byte_order = BFD_ENDIAN_BIG;
break;
case BFD_ENDIAN_LITTLE:
- info.byte_order = BFD_ENDIAN_LITTLE;
+ default_byte_order = BFD_ENDIAN_LITTLE;
break;
default:
break;
}
}
- if (info.byte_order == BFD_ENDIAN_UNKNOWN)
+ if (default_byte_order == BFD_ENDIAN_UNKNOWN)
{
/* look for ``*el-*'' in the target name. */
const char *chp;
if (chp != NULL
&& chp - 2 >= target_name
&& strncmp (chp - 2, "el", 2) == 0)
- info.byte_order = BFD_ENDIAN_LITTLE;
+ default_byte_order = BFD_ENDIAN_LITTLE;
}
- if (info.byte_order == BFD_ENDIAN_UNKNOWN)
+ if (default_byte_order == BFD_ENDIAN_UNKNOWN)
{
/* Wire it to big-endian!!! */
- info.byte_order = BFD_ENDIAN_BIG;
+ default_byte_order = BFD_ENDIAN_BIG;
}
+ info.byte_order = default_byte_order;
+
if (! gdbarch_update_p (info))
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: Selection of initial architecture failed");
+ _("initialize_current_architecture: Selection of "
+ "initial architecture failed"));
/* Create the ``set architecture'' command appending ``auto'' to the
list of architectures. */
arches = xrealloc (arches, sizeof (char*) * (nr + 2));
arches[nr + 0] = "auto";
arches[nr + 1] = NULL;
- /* FIXME: add_set_enum_cmd() uses an array of ``char *'' instead
- of ``const char *''. We just happen to know that the casts are
- safe. */
- c = add_set_enum_cmd ("architecture", class_support,
- arches, &set_architecture_string,
- "Set architecture of target.",
- &setlist);
- set_cmd_sfunc (c, set_architecture);
+ add_setshow_enum_cmd ("architecture", class_support,
+ arches, &set_architecture_string, _("\
+Set architecture of target."), _("\
+Show architecture of target."), NULL,
+ set_architecture, show_architecture,
+ &setlist, &showlist);
add_alias_cmd ("processor", "architecture", class_support, 1, &setlist);
- /* Don't use set_from_show - need to print both auto/manual and
- current setting. */
- add_cmd ("architecture", class_support, show_architecture,
- "Show the current target architecture", &showlist);
}
}
}
/* Similar to init, but this time fill in the blanks. Information is
- obtained from the specified architecture, global "set ..." options,
- and explicitly initialized INFO fields. */
+ obtained from the global "set ..." options and explicitly
+ initialized INFO fields. */
void
-gdbarch_info_fill (struct gdbarch *gdbarch, struct gdbarch_info *info)
+gdbarch_info_fill (struct gdbarch_info *info)
{
+ /* Check for the current file. */
+ if (info->abfd == NULL)
+ info->abfd = exec_bfd;
+
+ /* Check for the current target description. */
+ if (info->target_desc == NULL)
+ info->target_desc = target_current_description ();
+
/* "(gdb) set architecture ...". */
if (info->bfd_arch_info == NULL
- && !target_architecture_auto
- && gdbarch != NULL)
- info->bfd_arch_info = gdbarch_bfd_arch_info (gdbarch);
+ && target_architecture_user)
+ info->bfd_arch_info = target_architecture_user;
+ /* From the file. */
if (info->bfd_arch_info == NULL
&& info->abfd != NULL
&& bfd_get_arch (info->abfd) != bfd_arch_unknown
&& bfd_get_arch (info->abfd) != bfd_arch_obscure)
info->bfd_arch_info = bfd_get_arch_info (info->abfd);
- if (info->bfd_arch_info == NULL
- && gdbarch != NULL)
- info->bfd_arch_info = gdbarch_bfd_arch_info (gdbarch);
+ /* 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));
+ /* From the default. */
+ if (info->bfd_arch_info == NULL)
+ info->bfd_arch_info = default_bfd_arch;
/* "(gdb) set byte-order ...". */
if (info->byte_order == BFD_ENDIAN_UNKNOWN
- && !target_byte_order_auto
- && gdbarch != NULL)
- info->byte_order = gdbarch_byte_order (gdbarch);
+ && target_byte_order_user != BFD_ENDIAN_UNKNOWN)
+ info->byte_order = target_byte_order_user;
/* From the INFO struct. */
if (info->byte_order == BFD_ENDIAN_UNKNOWN
&& info->abfd != NULL)
info->byte_order = (bfd_big_endian (info->abfd) ? BFD_ENDIAN_BIG
- : bfd_little_endian (info->abfd) ? BFD_ENDIAN_LITTLE
- : BFD_ENDIAN_UNKNOWN);
- /* From the current target. */
- if (info->byte_order == BFD_ENDIAN_UNKNOWN
- && gdbarch != NULL)
- info->byte_order = gdbarch_byte_order (gdbarch);
+ : bfd_little_endian (info->abfd) ? BFD_ENDIAN_LITTLE
+ : BFD_ENDIAN_UNKNOWN);
+ /* From the default. */
+ if (info->byte_order == BFD_ENDIAN_UNKNOWN)
+ info->byte_order = default_byte_order;
/* "(gdb) set osabi ...". Handled by gdbarch_lookup_osabi. */
if (info->osabi == GDB_OSABI_UNINITIALIZED)
info->osabi = gdbarch_lookup_osabi (info->abfd);
- if (info->osabi == GDB_OSABI_UNINITIALIZED
- && gdbarch != NULL)
- info->osabi = gdbarch_osabi (gdbarch);
/* Must have at least filled in the architecture. */
gdb_assert (info->bfd_arch_info != NULL);
_initialize_gdbarch_utils (void)
{
struct cmd_list_element *c;
- c = add_set_enum_cmd ("endian", class_support,
- endian_enum, &set_endian_string,
- "Set endianness of target.",
- &setlist);
- set_cmd_sfunc (c, set_endian);
- /* Don't use set_from_show - need to print both auto/manual and
- current setting. */
- add_cmd ("endian", class_support, show_endian,
- "Show the current byte-order", &showlist);
+ add_setshow_enum_cmd ("endian", class_support,
+ endian_enum, &set_endian_string, _("\
+Set endianness of target."), _("\
+Show endianness of target."), NULL,
+ set_endian, show_endian,
+ &setlist, &showlist);
}
projects / deliverable / binutils-gdb.git / blobdiff