darling-gdb/bfd/cpu-sh.c
Joern Rennecke f6f9408fbf 2004-05-28 Andrew Stubbs <andrew.stubbs@superh.com>
bfd:
	* Makefile.am: Regenerate dependencies.
	* Makefile.in: Regenerate.
	* archures.c: Add bfd_mach_sh3_nommu .
	* bfd-in2.h: Regenerate.
	* cpu-sh.c: Add sh3-nommu architecture.
	(bfd_to_arch_table): Create new table.
	(sh_get_arch_from_bfd_mach): Create new function.
	(sh_get_arch_up_from_bfd_mach): Create new function.
	(sh_merge_bfd_arch): Create new function.
	* elf32-sh.c (sh_ef_bfd_table): Add table.
	(sh_elf_check_relocs): Replace switch statement with
	use of sh_ef_bfd_table .
	(sh_elf_get_flags_from_mach): Add new function.
	(sh_find_elf_flags): Likewise.
	(sh_elf_copy_private_data): Replace most of non-elf contents
	with a call to sh_merge_bfd_arch() .

gas:
	* Makefile.am: Regenerate dependecies.
	* Makefile.in: Regenerate.
	* config/tc-sh.c (valid_arch): Make unsigned.
	(preset_target_arch): Likewise.
	(md_begin): Use new architecture flags system.
	(get_specific): Likewise.
	(assemble_ppi): Likewise.
	(md_assemble): Likewise. Also fix error check for bad opcodes.
	(md_parse_option): Likewise. Also generate -isa values according
	to the table in bfd/cpu-sh.c instead of just constants. Also
	allow <arch>-up ISA variants.
	(sh_elf_final_processing): Replace if-else chain with a call to
	sh_find_elf_flags().
	* testsuite/gas/sh/arch: New directory.
	* testsuite/gas/sh/arch/arch.exp: New test script.
	* testsuite/gas/sh/arch/arch_expected.txt: New file.
	* testsuite/gas/sh/arch/sh.s: New file.
	* testsuite/gas/sh/arch/sh2.s: New file.
	* testsuite/gas/sh/arch/sh-dsp.s: New file.
	* testsuite/gas/sh/arch/sh2e.s: New file.
	* testsuite/gas/sh/arch/sh3-nommu.s: New file.
	* testsuite/gas/sh/arch/sh3.s: New file.
	* testsuite/gas/sh/arch/sh3-dsp.s: New file.
	* testsuite/gas/sh/arch/sh3e.s: New file.
	* testsuite/gas/sh/arch/sh4-nommu-nofpu.s: New file.
	* testsuite/gas/sh/arch/sh4-nofpu.s: New file.
	* testsuite/gas/sh/arch/sh4.s: New file.
	* testsuite/gas/sh/arch/sh4a-nofpu.s: New file.
	* testsuite/gas/sh/arch/sh4al-dsp.s: New file.
	* testsuite/gas/sh/arch/sh4a.s: New file.

include/elf:
	* sh.h (EF_SH_HAS_DSP): Remove.
	(EF_SH_HAS_FP): Remove.
	(EF_SH_MERGE_MACH): Remove.
	(EF_SH4_NOFPU): Convert to decimal.
	(EF_SH4A_NOFPU): Likewise.
	(EF_SH4_NOMMU_NOFPU): Likewise.
	(EF_SH3_NOMMU): Add new macro.
	(EF_SH_BFD_TABLE): Likewise.
	(sh_find_elf_flags): Add prototype.
	(sh_elf_get_flags_from_mach): Likewise.

opcodes:
	* sh-dis.c (target_arch): Make unsigned.
	(print_insn_sh): Replace (most of) switch with a call to
	sh_get_arch_from_bfd_mach(). Also use new architecture flags system.
	* sh-opc.h: Redefine architecture flags values.
	Add sh3-nommu architecture.
	Reorganise <arch>_up macros so they make more visual sense.
	(SH_MERGE_ARCH_SET): Define new macro.
	(SH_VALID_BASE_ARCH_SET): Likewise.
	(SH_VALID_MMU_ARCH_SET): Likewise.
	(SH_VALID_CO_ARCH_SET): Likewise.
	(SH_VALID_ARCH_SET): Likewise.
	(SH_MERGE_ARCH_SET_VALID): Likewise.
	(SH_ARCH_SET_HAS_FPU): Likewise.
	(SH_ARCH_SET_HAS_DSP): Likewise.
	(SH_ARCH_UNKNOWN_ARCH): Likewise.
	(sh_get_arch_from_bfd_mach): Add prototype.
	(sh_get_arch_up_from_bfd_mach): Likewise.
	(sh_get_bfd_mach_from_arch_set): Likewise.
	(sh_merge_bfd_arc): Likewise.

ld:
	* testsuite/ld-sh/arch/arch.exp: New test script.
	* testsuite/ld-sh/arch/arch_expected.txt: New file.
	* testsuite/ld-sh/arch/sh.s: New file.
	* testsuite/ld-sh/arch/sh2.s: New file.
	* testsuite/ld-sh/arch/sh-dsp.s: New file.
	* testsuite/ld-sh/arch/sh2e.s: New file.
	* testsuite/ld-sh/arch/sh3-nommu.s: New file.
	* testsuite/ld-sh/arch/sh3.s: New file.
	* testsuite/ld-sh/arch/sh3-dsp.s: New file.
	* testsuite/ld-sh/arch/sh3e.s: New file.
	* testsuite/ld-sh/arch/sh4-nommu-nofpu.s: New file.
	* testsuite/ld-sh/arch/sh4-nofpu.s: New file.
	* testsuite/ld-sh/arch/sh4.s: New file.
	* testsuite/ld-sh/arch/sh4a-nofpu.s: New file.
	* testsuite/ld-sh/arch/sh4al-dsp.s: New file.
	* testsuite/ld-sh/arch/sh4a.s: New file.
2004-05-28 12:32:10 +00:00

427 lines
12 KiB
C

/* BFD library support routines for the Renesas / SuperH SH architecture.
Copyright 1993, 1994, 1997, 1998, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
Hacked by Steve Chamberlain of Cygnus Support.
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 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. */
#include "bfd.h"
#include "sysdep.h"
#include "libbfd.h"
#include "../opcodes/sh-opc.h"
#define SH_NEXT &arch_info_struct[0]
#define SH2_NEXT &arch_info_struct[1]
#define SH2E_NEXT &arch_info_struct[2]
#define SH_DSP_NEXT &arch_info_struct[3]
#define SH3_NEXT &arch_info_struct[4]
#define SH3_NOMMU_NEXT &arch_info_struct[5]
#define SH3_DSP_NEXT &arch_info_struct[6]
#define SH3E_NEXT &arch_info_struct[7]
#define SH4_NEXT &arch_info_struct[8]
#define SH4A_NEXT &arch_info_struct[9]
#define SH4AL_DSP_NEXT &arch_info_struct[10]
#define SH4_NOFPU_NEXT &arch_info_struct[11]
#define SH4_NOMMU_NOFPU_NEXT &arch_info_struct[12]
#define SH4A_NOFPU_NEXT &arch_info_struct[13]
#define SH64_NEXT NULL
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_sh,
bfd_mach_sh2,
"sh", /* arch_name */
"sh2", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH2_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh2e,
"sh", /* arch_name */
"sh2e", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH2E_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh_dsp,
"sh", /* arch_name */
"sh-dsp", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH_DSP_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh3,
"sh", /* arch_name */
"sh3", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH3_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh3_nommu,
"sh", /* arch_name */
"sh3-nommu", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH3_NOMMU_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh3_dsp,
"sh", /* arch_name */
"sh3-dsp", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH3_DSP_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh3e,
"sh", /* arch_name */
"sh3e", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH3E_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4,
"sh", /* arch_name */
"sh4", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4a,
"sh", /* arch_name */
"sh4a", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4A_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4al_dsp,
"sh", /* arch_name */
"sh4al-dsp", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4AL_DSP_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4_nofpu,
"sh", /* arch_name */
"sh4-nofpu", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4_NOFPU_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4_nommu_nofpu,
"sh", /* arch_name */
"sh4-nommu-nofpu", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4_NOMMU_NOFPU_NEXT
},
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh4a_nofpu,
"sh", /* arch_name */
"sh4a-nofpu", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH4A_NOFPU_NEXT
},
{
64, /* 64 bits in a word */
64, /* 64 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh5,
"sh", /* arch_name */
"sh5", /* printable name */
1,
FALSE, /* not the default */
bfd_default_compatible,
bfd_default_scan,
SH64_NEXT
},
};
const bfd_arch_info_type bfd_sh_arch =
{
32, /* 32 bits in a word */
32, /* 32 bits in an address */
8, /* 8 bits in a byte */
bfd_arch_sh,
bfd_mach_sh,
"sh", /* arch_name */
"sh", /* printable name */
1,
TRUE, /* the default machine */
bfd_default_compatible,
bfd_default_scan,
SH_NEXT
};
/* This table defines the mappings from the BFD internal numbering
system to the opcodes internal flags system.
It is used by the functions defined below.
The prototypes for these SH specific functions are found in
sh-opc.h . */
static struct { unsigned long bfd_mach, arch, arch_up; } bfd_to_arch_table[] =
{
{ bfd_mach_sh, arch_sh1, arch_sh1_up },
{ bfd_mach_sh2, arch_sh2, arch_sh2_up },
{ bfd_mach_sh2e, arch_sh2e, arch_sh2e_up },
{ bfd_mach_sh_dsp, arch_sh_dsp, arch_sh_dsp_up },
{ bfd_mach_sh3, arch_sh3, arch_sh3_up },
{ bfd_mach_sh3_nommu, arch_sh3_nommu, arch_sh3_nommu_up },
{ bfd_mach_sh3_dsp, arch_sh3_dsp, arch_sh3_dsp_up },
{ bfd_mach_sh3e, arch_sh3e, arch_sh3e_up },
{ bfd_mach_sh4, arch_sh4, arch_sh4_up },
{ bfd_mach_sh4a, arch_sh4a, arch_sh4a_up },
{ bfd_mach_sh4al_dsp, arch_sh4al_dsp, arch_sh4al_dsp_up },
{ bfd_mach_sh4_nofpu, arch_sh4_nofpu, arch_sh4_nofp_up },
{ bfd_mach_sh4_nommu_nofpu, arch_sh4_nommu_nofpu, arch_sh4_nommu_nofpu_up },
{ bfd_mach_sh4a_nofpu, arch_sh4a_nofpu, arch_sh4a_nofp_up },
{ 0, 0, 0 } /* Terminator. */
};
/* Convert a BFD mach number into the right opcodes arch flags
using the table above. */
unsigned int
sh_get_arch_from_bfd_mach (unsigned long mach)
{
int i = 0;
while (bfd_to_arch_table[i].bfd_mach != 0)
if (bfd_to_arch_table[i].bfd_mach == mach)
return bfd_to_arch_table[i].arch;
else
i++;
/* mach not found. */
BFD_FAIL();
return SH_ARCH_UNKNOWN_ARCH;
}
/* Convert a BFD mach number into a set of opcodes arch flags
describing all the compatible architectures (i.e. arch_up)
using the table above. */
unsigned int
sh_get_arch_up_from_bfd_mach (unsigned long mach)
{
int i = 0;
while (bfd_to_arch_table[i].bfd_mach != 0)
if (bfd_to_arch_table[i].bfd_mach == mach)
return bfd_to_arch_table[i].arch_up;
else
i++;
/* mach not found. */
BFD_FAIL();
return SH_ARCH_UNKNOWN_ARCH;
}
/* Convert an arbitary arch_set - not necessarily corresponding
directly to anything in the table above - to the most generic
architecture which supports all the required features, and
return the corresponding BFD mach. */
unsigned long
sh_get_bfd_mach_from_arch_set (unsigned int arch_set)
{
unsigned long result = 0;
unsigned int best = ~arch_set;
unsigned int co_mask = ~0;
int i = 0;
/* If arch_set permits variants with no coprocessor then do not allow
the other irrelevant co-processor bits to influence the choice:
e.g. if dsp is disallowed by arch_set, then the algorithm would
prefer fpu variants over nofpu variants because they also disallow
dsp - even though the nofpu would be the most correct choice.
This assumes that EVERY fpu/dsp variant has a no-coprocessor
counter-part, or their non-fpu/dsp instructions do not have the
no co-processor bit set. */
if (arch_set & arch_sh_no_co)
co_mask = ~(arch_sh_sp_fpu | arch_sh_dp_fpu | arch_sh_has_dsp);
while (bfd_to_arch_table[i].bfd_mach != 0)
{
unsigned int try = bfd_to_arch_table[i].arch_up & co_mask;
/* Conceptually: Find the architecture with the least number
of extra features or, if they have the same number, then
the greatest number of required features. Disregard
architectures where the required features alone do
not describe a valid architecture. */
if (((try & ~arch_set) < (best & ~arch_set)
|| ((try & ~arch_set) == (best & ~arch_set)
&& (~try & arch_set) < (~best & arch_set)))
&& SH_MERGE_ARCH_SET_VALID (try, arch_set))
{
result = bfd_to_arch_table[i].bfd_mach;
best = try;
}
i++;
}
/* This might happen if a new variant is added to sh-opc.h
but no corresponding entry is added to the table above. */
BFD_ASSERT (result != 0);
return result;
}
/* Merge the architecture type of two BFD files, such that the
resultant architecture supports all the features required
by the two input BFDs.
If the input BFDs are multually incompatible - i.e. one uses
DSP while the other uses FPU - or there is no known architecture
that fits the requirements then an error is emitted. */
bfd_boolean
sh_merge_bfd_arch (bfd *ibfd, bfd *obfd)
{
unsigned int old_arch, new_arch, merged_arch;
if (! _bfd_generic_verify_endian_match (ibfd, obfd))
return FALSE;
old_arch = sh_get_arch_up_from_bfd_mach (bfd_get_mach (obfd));
new_arch = sh_get_arch_up_from_bfd_mach (bfd_get_mach (ibfd));
merged_arch = SH_MERGE_ARCH_SET (old_arch, new_arch);
if (!SH_VALID_CO_ARCH_SET (merged_arch))
{
(*_bfd_error_handler)
("%s: uses %s instructions while previous modules use %s instructions",
bfd_archive_filename (ibfd),
SH_ARCH_SET_HAS_DSP (new_arch) ? "dsp" : "floating point",
SH_ARCH_SET_HAS_DSP (new_arch) ? "floating point" : "dsp");
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
else if (!SH_VALID_ARCH_SET (merged_arch))
{
(*_bfd_error_handler)
("internal error: merge of architecture '%s' with architecture '%s' produced unknown architecture\n",
bfd_printable_name (obfd),
bfd_printable_name (ibfd));
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
bfd_default_set_arch_mach (obfd, bfd_arch_sh,
sh_get_bfd_mach_from_arch_set (merged_arch));
return TRUE;
}