OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* cpu-pj.c (scan_mach, compatible, arch_info_struct): Remove. 

(bfd_pj_arch): Use bfd_default_scan.
	* cpu-v850.c (scan): Remove.
	(N): Use bfd_default_scan.
	* cpu-z8k.c (scan_mach): Remove.
	(arch_info_struct, bfd_z8k_arch): Reorganize so that the default is
	first.  Use bfd_default_scan.
This commit is contained in:
Alan Modra 2002-09-02 11:52:01 +00:00
parent 250d94fd4b
commit 638524b534
4 changed files with 15 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,5 +1,13 @@
2002-09-02 Alan Modra <amodra@bigpond.net.au>
* cpu-pj.c (scan_mach, compatible, arch_info_struct): Remove.
(bfd_pj_arch): Use bfd_default_scan.
* cpu-v850.c (scan): Remove.
(N): Use bfd_default_scan.
* cpu-z8k.c (scan_mach): Remove.
(arch_info_struct, bfd_z8k_arch): Reorganize so that the default is
first. Use bfd_default_scan.
* ecoff.c (_bfd_ecoff_set_arch_mach_hook): Don't use hard-coded
bfd_mach constants.
(ecoff_get_magic): Likewise.

50
bfd/cpu-pj.c
View File

@ -22,52 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "sysdep.h"
#include "libbfd.h"
static boolean scan_mach
PARAMS ((const struct bfd_arch_info *, const char *));
static boolean
scan_mach (info, string)
const struct bfd_arch_info *info;
const char *string;
{
if (strcasecmp (info->printable_name, string) == 0)
return true;
return false;
}
#if 0
/* This routine is provided two arch_infos and returns whether
they'd be compatible */
static const bfd_arch_info_type *
compatible (a,b)
const bfd_arch_info_type *a;
const bfd_arch_info_type *b;
{
if (a->arch != b->arch || a->mach != b->mach)
return NULL;
return a;
}
#endif
static const bfd_arch_info_type arch_info_struct[] =
{
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_pj,
0,
"pj", /* arch_name */
"pj", /* printable name */
1,
false, /* not the default */
bfd_default_compatible,
scan_mach,
0,
},
};
const bfd_arch_info_type bfd_pj_arch =
{
32, /* 32 bits in a word */
@ -80,6 +34,6 @@ const bfd_arch_info_type bfd_pj_arch =
1,
true, /* the default machine */
bfd_default_compatible,
scan_mach,
&arch_info_struct [0]
bfd_default_scan,
0
};

60
bfd/cpu-v850.c
View File

@ -22,67 +22,9 @@
#include "libbfd.h"
#include "safe-ctype.h"
static boolean scan PARAMS ((const struct bfd_arch_info *, const char *));
static boolean
scan (info, string)
const struct bfd_arch_info * info;
const char * string;
{
const char *ptr_src;
const char *ptr_tst;
unsigned long number;
enum bfd_architecture arch;
/* First test for an exact match. */
if (strcasecmp (string, info->printable_name) == 0)
return true;
/* See how much of the supplied string matches with the
architecture, eg the string m68k:68020 would match the m68k entry
up to the :, then we get left with the machine number. */
for (ptr_src = string, ptr_tst = info->arch_name;
*ptr_src && *ptr_tst;
ptr_src++, ptr_tst++)
if (*ptr_src != *ptr_tst)
break;
/* Chewed up as much of the architecture as will match;
if there is a colon present skip it. */
if (*ptr_src == ':')
ptr_src ++;
if (*ptr_src == 0)
/* Nothing more, then only keep this one if it is
the default machine for this architecture. */
return info->the_default;
number = 0;
while (ISDIGIT (*ptr_src))
{
number = number * 10 + * ptr_src - '0';
ptr_src ++;
}
switch (number)
{
case bfd_mach_v850e: arch = bfd_arch_v850; break;
default:
return false;
}
if (arch != info->arch)
return false;
if (number != info->mach)
return false;
return true;
}
#define N(number, print, default, next) \
{ 32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
bfd_default_compatible, scan, next }
bfd_default_compatible, bfd_default_scan, next }
#define NEXT NULL

24
bfd/cpu-z8k.c
View File

@ -22,8 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "sysdep.h"
#include "libbfd.h"
static boolean scan_mach
PARAMS ((const struct bfd_arch_info *, const char *));
static const bfd_arch_info_type *compatible
PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
@ -153,22 +151,6 @@ local_bfd_reloc_type_lookup (arch, code)
}
#endif
static boolean
scan_mach (info, string)
const struct bfd_arch_info *info;
const char *string;
{
if (strcmp (string, "z8001") == 0 || strcmp (string, "z8k") == 0)
{
return bfd_mach_z8001 == info->mach;
}
if (strcmp (string, "z8002") == 0)
{
return bfd_mach_z8002 == info->mach;
}
return false;
}
/* This routine is provided two arch_infos and returns whether
they'd be compatible */
@ -184,10 +166,12 @@ compatible (a, b)
static const bfd_arch_info_type arch_info_struct[] =
{
{32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, false, compatible, scan_mach, 0,},
{ 32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, false,
compatible, bfd_default_scan, 0 }
};
const bfd_arch_info_type bfd_z8k_arch =
{
32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, true, compatible, scan_mach, &arch_info_struct[0],
32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, true,
compatible, bfd_default_scan, &arch_info_struct[0]
};