summaryrefslogtreecommitdiff
path: root/bfd/cpu-arm.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-02-14 16:24:20 +0000
committerNick Clifton <nickc@redhat.com>2002-02-14 16:24:20 +0000
commite2fd756b5dbbd435ee1cefcb105dff5001ac3e88 (patch)
tree24ecd92edc3a24885d9dc77a31e76b5f40ba07f1 /bfd/cpu-arm.c
parentdd47e6fdd903e23ca947c265611abe40c2b5f21c (diff)
downloadbinutils-gdb-e2fd756b5dbbd435ee1cefcb105dff5001ac3e88.tar.gz
Replace 'arch' field with 'mach'.
Diffstat (limited to 'bfd/cpu-arm.c')
-rw-r--r--bfd/cpu-arm.c82
1 files changed, 42 insertions, 40 deletions
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 8cd64e918db..9faf648e164 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -1,70 +1,72 @@
/* BFD support for the ARM processor
- Copyright 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1994, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h"
#include "sysdep.h"
#include "libbfd.h"
-static const bfd_arch_info_type *compatible
+static const bfd_arch_info_type * compatible
PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-static boolean scan PARAMS ((const struct bfd_arch_info *, const char *));
+static boolean scan
+ PARAMS ((const struct bfd_arch_info *, const char *));
/* This routine is provided two arch_infos and works out which ARM
machine which would be compatible with both and returns a pointer
- to its info structure */
+ to its info structure. */
static const bfd_arch_info_type *
compatible (a,b)
const bfd_arch_info_type * a;
const bfd_arch_info_type * b;
{
- /* If a & b are for different architecture we can do nothing */
+ /* If a & b are for different architecture we can do nothing. */
if (a->arch != b->arch)
return NULL;
- /* If a & b are for the same machine then all is well */
+ /* If a & b are for the same machine then all is well. */
if (a->mach == b->mach)
return a;
- /* Otherwise if either a or b is the 'default' machine then
- it can be polymorphed into the other */
+ /* Otherwise if either a or b is the 'default' machine
+ then it can be polymorphed into the other. */
if (a->the_default)
return b;
if (b->the_default)
return a;
- /* So far all newer ARM architecture cores are supersets of previous cores */
+ /* So far all newer ARM architecture cores are
+ supersets of previous cores. */
if (a->mach < b->mach)
return b;
else if (a->mach > b->mach)
return a;
- /* Never reached! */
+ /* Never reached! */
return NULL;
}
static struct
{
- enum bfd_architecture arch;
- char * name;
+ unsigned int mach;
+ char * name;
}
processors[] =
{
@@ -103,21 +105,21 @@ scan (info, string)
{
int i;
- /* First test for an exact match */
+ /* First test for an exact match. */
if (strcasecmp (string, info->printable_name) == 0)
return true;
- /* Next check for a processor name instead of an Architecture name */
+ /* Next check for a processor name instead of an Architecture name. */
for (i = sizeof (processors) / sizeof (processors[0]); i--;)
{
- if (strcasecmp (string, processors[ i ].name) == 0)
+ if (strcasecmp (string, processors [i].name) == 0)
break;
}
- if (i != -1 && info->arch == processors[ i ].arch)
+ if (i != -1 && info->mach == processors [i].mach)
return true;
- /* Finally check for the default architecture */
+ /* Finally check for the default architecture. */
if (strcasecmp (string, "arm") == 0)
return info->the_default;
@@ -129,17 +131,17 @@ scan (info, string)
static const bfd_arch_info_type arch_info_struct[] =
{
- N( bfd_mach_arm_2, "armv2", false, & arch_info_struct[1] ),
- N( bfd_mach_arm_2a, "armv2a", false, & arch_info_struct[2] ),
- N( bfd_mach_arm_3, "armv3", false, & arch_info_struct[3] ),
- N( bfd_mach_arm_3M, "armv3m", false, & arch_info_struct[4] ),
- N( bfd_mach_arm_4, "armv4", false, & arch_info_struct[5] ),
- N( bfd_mach_arm_4T, "armv4t", false, & arch_info_struct[6] ),
- N( bfd_mach_arm_5, "armv5", false, & arch_info_struct[7] ),
- N( bfd_mach_arm_5T, "armv5t", false, & arch_info_struct[8] ),
- N( bfd_mach_arm_5TE, "armv5te", false, & arch_info_struct[9] ),
- N( bfd_mach_arm_XScale, "xscale", false, NULL )
+ N (bfd_mach_arm_2, "armv2", false, & arch_info_struct[1]),
+ N (bfd_mach_arm_2a, "armv2a", false, & arch_info_struct[2]),
+ N (bfd_mach_arm_3, "armv3", false, & arch_info_struct[3]),
+ N (bfd_mach_arm_3M, "armv3m", false, & arch_info_struct[4]),
+ N (bfd_mach_arm_4, "armv4", false, & arch_info_struct[5]),
+ N (bfd_mach_arm_4T, "armv4t", false, & arch_info_struct[6]),
+ N (bfd_mach_arm_5, "armv5", false, & arch_info_struct[7]),
+ N (bfd_mach_arm_5T, "armv5t", false, & arch_info_struct[8]),
+ N (bfd_mach_arm_5TE, "armv5te", false, & arch_info_struct[9]),
+ N (bfd_mach_arm_XScale, "xscale", false, NULL)
};
const bfd_arch_info_type bfd_arm_arch =
- N( 0, "arm", true, & arch_info_struct[0] );
+ N (0, "arm", true, & arch_info_struct[0]);