X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-arc.c;h=56a9f7bb4543e8b424d859d34ef3548542f255cc;hb=44e33ab45df75bea0a7f64db1b6846cdf6c99299;hp=b7e9a7cd732200f8c787cd0d909b24a7bb3a6b77;hpb=ae115e5114deb0326333c80f7af9e689b2e7d01f;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c index b7e9a7cd73..56a9f7bb45 100644 --- a/bfd/cpu-arc.c +++ b/bfd/cpu-arc.c @@ -1,77 +1,101 @@ /* BFD support for the ARC processor - Copyright 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. Contributed by Doug Evans (dje@cygnus.com). -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -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 2 of the License, or -(at your option) any later version. + 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. + 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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" -#define ARC(mach, print_name, default_p) \ -{ \ - 32, /* 32 bits in a word */ \ - 32, /* 32 bits in an address */ \ - 8, /* 8 bits in a byte */ \ +static const bfd_arch_info_type * +arc_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b); + +#define ARC(mach, print_name, default_p, next) \ + { \ + 32, /* Bits in a word. */ \ + 32, /* Bits in an address. */ \ + 8, /* Bits in a byte. */ \ bfd_arch_arc, \ mach, \ "arc", \ print_name, \ - 4, /* section alignment power */ \ + 4, /* Section alignment power. */ \ default_p, \ - bfd_default_compatible, \ + arc_compatible, \ bfd_default_scan, \ - 0, \ + bfd_arch_default_fill, \ + next, \ + 0 /* Maximum offset of a reloc from the start of an insn. */ \ } -static bfd_arch_info_type arch_info_struct[] = +static const bfd_arch_info_type arch_info_struct[] = { - ARC (bfd_mach_arc_base, "arc-base", true), - ARC (bfd_mach_arc_host, "arc-host", false), - ARC (bfd_mach_arc_graphics, "arc-graphics", false), - ARC (bfd_mach_arc_audio, "arc-audio", false), + ARC (bfd_mach_arc_arc600, "A6" , FALSE, &arch_info_struct[1]), + ARC (bfd_mach_arc_arc601, "ARC601", FALSE, &arch_info_struct[2]), + ARC (bfd_mach_arc_arc700, "ARC700", FALSE, &arch_info_struct[3]), + ARC (bfd_mach_arc_arc700, "A7", FALSE, &arch_info_struct[4]), + ARC (bfd_mach_arc_arcv2, "ARCv2", FALSE, &arch_info_struct[5]), + ARC (bfd_mach_arc_arcv2, "EM", FALSE, &arch_info_struct[6]), + ARC (bfd_mach_arc_arcv2, "HS", FALSE, NULL), }; -void -bfd_arc_arch () +const bfd_arch_info_type bfd_arc_arch = + ARC (bfd_mach_arc_arc600, "ARC600", TRUE, &arch_info_struct[0]); + +/* ARC-specific "compatible" function. The general rule is that if A and B are + compatible, then this function should return architecture that is more + "feature-rich", that is, can run both A and B. ARCv2, EM and HS all has + same mach number, so bfd_default_compatible assumes they are the same, and + returns an A. That causes issues with GDB, because GDB assumes that if + machines are compatible, then "compatible ()" always returns same machine + regardless of argument order. As a result GDB gets confused because, for + example, compatible (ARCv2, EM) returns ARCv2, but compatible (EM, ARCv2) + returns EM, hence GDB is not sure if they are compatible and prints a + warning. */ + +static const bfd_arch_info_type * +arc_compatible (const bfd_arch_info_type *a, const bfd_arch_info_type *b) { - register unsigned int i; + const bfd_arch_info_type * const em = &arch_info_struct[5]; + const bfd_arch_info_type * const hs = &arch_info_struct[6]; - for (i = 0; i < sizeof (arch_info_struct) / sizeof (arch_info_struct[0]); i++) - bfd_arch_linkin (&arch_info_struct[i]); -} - -/* Utility routines. */ + /* Trivial case where a and b is the same instance. Some callers already + check this condition but some do not and get an invalid result. */ + if (a == b) + return a; -/* Given cpu type NAME, return its bfd_mach_arc_xxx value. - NAME is one of "base, audio, etc.". - Returns -1 if not found. */ + /* If a & b are for different architecture we can do nothing. */ + if (a->arch != b->arch) + return NULL; -int -arc_get_mach (name) - char *name; -{ - register unsigned int i; - - for (i = 0; i < sizeof (arch_info_struct) / sizeof (arch_info_struct[0]); i++) - { - /* +4: skip over "arc-" */ - if (strcmp (name, arch_info_struct[i].printable_name + 4) == 0) - return arch_info_struct[i].mach; - } - return -1; + if (a->bits_per_word != b->bits_per_word) + return NULL; + + /* ARCv2|EM and EM. */ + if ((a->mach == bfd_mach_arc_arcv2 && b == em) + || (b->mach == bfd_mach_arc_arcv2 && a == em)) + return em; + + /* ARCv2|HS and HS. */ + if ((a->mach == bfd_mach_arc_arcv2 && b == hs) + || (b->mach == bfd_mach_arc_arcv2 && a == hs)) + return hs; + + return bfd_default_compatible (a, b); }