1999-05-03 15:29:11 +08:00
|
|
|
|
/* tc-m68k.c -- Assemble for the m68k family
|
2001-03-09 07:24:26 +08:00
|
|
|
|
Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
2008-08-13 07:39:31 +08:00
|
|
|
|
Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
|
|
|
|
|
|
|
|
|
GAS is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-03 19:01:12 +08:00
|
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GAS 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 GAS; see the file COPYING. If not, write to the Free
|
2005-05-05 17:13:19 +08:00
|
|
|
|
Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
|
02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#include "as.h"
|
2001-09-19 13:33:36 +08:00
|
|
|
|
#include "safe-ctype.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "obstack.h"
|
|
|
|
|
#include "subsegs.h"
|
2001-07-18 18:25:58 +08:00
|
|
|
|
#include "dwarf2dbg.h"
|
2003-08-08 22:46:41 +08:00
|
|
|
|
#include "dw2gencfi.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#include "opcode/m68k.h"
|
|
|
|
|
#include "m68k-parse.h"
|
|
|
|
|
|
1999-05-05 18:58:59 +08:00
|
|
|
|
#if defined (OBJ_ELF)
|
|
|
|
|
#include "elf/m68k.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
#ifdef M68KCOFF
|
|
|
|
|
#include "obj-coff.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
static void m68k_elf_cons (int);
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* This string holds the chars that always start a comment. If the
|
|
|
|
|
pre-processor is disabled, these aren't very useful. The macro
|
|
|
|
|
tc_comment_chars points to this. We use this, rather than the
|
|
|
|
|
usual comment_chars, so that the --bitwise-or option will work. */
|
|
|
|
|
#if defined (TE_SVR4) || defined (TE_DELTA)
|
|
|
|
|
const char *m68k_comment_chars = "|#";
|
|
|
|
|
#else
|
|
|
|
|
const char *m68k_comment_chars = "|";
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* This array holds the chars that only start a comment at the beginning of
|
|
|
|
|
a line. If the line seems to have the form '# 123 filename'
|
|
|
|
|
.line and .file directives will appear in the pre-processed output */
|
|
|
|
|
/* Note that input_file.c hand checks for '#' at the beginning of the
|
|
|
|
|
first line of the input file. This is because the compiler outputs
|
2000-09-12 03:49:46 +08:00
|
|
|
|
#NO_APP at the beginning of its output. */
|
|
|
|
|
/* Also note that comments like this one will always work. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
const char line_comment_chars[] = "#*";
|
|
|
|
|
|
2000-06-09 08:00:04 +08:00
|
|
|
|
const char line_separator_chars[] = ";";
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Chars that can be used to separate mant from exp in floating point nums. */
|
2002-06-08 15:37:16 +08:00
|
|
|
|
const char EXP_CHARS[] = "eE";
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Chars that mean this number is a floating point constant, as
|
|
|
|
|
in "0f12.456" or "0d1.2345e12". */
|
|
|
|
|
|
2002-06-08 15:37:16 +08:00
|
|
|
|
const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be
|
|
|
|
|
changed in read.c . Ideally it shouldn't have to know about it at all,
|
|
|
|
|
but nothing is ideal around here. */
|
|
|
|
|
|
|
|
|
|
/* Are we trying to generate PIC code? If so, absolute references
|
|
|
|
|
ought to be made into linkage table references or pc-relative
|
2000-09-12 03:49:46 +08:00
|
|
|
|
references. Not implemented. For ELF there are other means
|
1999-05-03 15:29:11 +08:00
|
|
|
|
to denote pic relocations. */
|
|
|
|
|
int flag_want_pic;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
static int flag_short_refs; /* -l option. */
|
|
|
|
|
static int flag_long_jumps; /* -S option. */
|
2000-08-01 06:08:14 +08:00
|
|
|
|
static int flag_keep_pcrel; /* --pcrel option. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#ifdef REGISTER_PREFIX_OPTIONAL
|
|
|
|
|
int flag_reg_prefix_optional = REGISTER_PREFIX_OPTIONAL;
|
|
|
|
|
#else
|
|
|
|
|
int flag_reg_prefix_optional;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Whether --register-prefix-optional was used on the command line. */
|
|
|
|
|
static int reg_prefix_optional_seen;
|
|
|
|
|
|
|
|
|
|
/* The floating point coprocessor to use by default. */
|
|
|
|
|
static enum m68k_register m68k_float_copnum = COP1;
|
|
|
|
|
|
|
|
|
|
/* If this is non-zero, then references to number(%pc) will be taken
|
|
|
|
|
to refer to number, rather than to %pc + number. */
|
|
|
|
|
static int m68k_abspcadd;
|
|
|
|
|
|
|
|
|
|
/* If this is non-zero, then the quick forms of the move, add, and sub
|
|
|
|
|
instructions are used when possible. */
|
|
|
|
|
static int m68k_quick = 1;
|
|
|
|
|
|
|
|
|
|
/* If this is non-zero, then if the size is not specified for a base
|
|
|
|
|
or outer displacement, the assembler assumes that the size should
|
|
|
|
|
be 32 bits. */
|
|
|
|
|
static int m68k_rel32 = 1;
|
|
|
|
|
|
|
|
|
|
/* This is non-zero if m68k_rel32 was set from the command line. */
|
|
|
|
|
static int m68k_rel32_from_cmdline;
|
|
|
|
|
|
|
|
|
|
/* The default width to use for an index register when using a base
|
|
|
|
|
displacement. */
|
|
|
|
|
static enum m68k_size m68k_index_width_default = SIZE_LONG;
|
|
|
|
|
|
|
|
|
|
/* We want to warn if any text labels are misaligned. In order to get
|
|
|
|
|
the right line number, we need to record the line number for each
|
|
|
|
|
label. */
|
|
|
|
|
struct label_line
|
|
|
|
|
{
|
|
|
|
|
struct label_line *next;
|
|
|
|
|
symbolS *label;
|
|
|
|
|
char *file;
|
|
|
|
|
unsigned int line;
|
|
|
|
|
int text;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The list of labels. */
|
|
|
|
|
|
|
|
|
|
static struct label_line *labels;
|
|
|
|
|
|
|
|
|
|
/* The current label. */
|
|
|
|
|
|
|
|
|
|
static struct label_line *current_label;
|
|
|
|
|
|
2004-05-27 15:56:27 +08:00
|
|
|
|
/* Pointer to list holding the opcodes sorted by name. */
|
|
|
|
|
static struct m68k_opcode const ** m68k_sorted_opcodes;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Its an arbitrary name: This means I don't approve of it.
|
|
|
|
|
See flames below. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static struct obstack robyn;
|
|
|
|
|
|
|
|
|
|
struct m68k_incant
|
|
|
|
|
{
|
|
|
|
|
const char *m_operands;
|
|
|
|
|
unsigned long m_opcode;
|
|
|
|
|
short m_opnum;
|
|
|
|
|
short m_codenum;
|
|
|
|
|
int m_arch;
|
|
|
|
|
struct m68k_incant *m_next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define getone(x) ((((x)->m_opcode)>>16)&0xffff)
|
|
|
|
|
#define gettwo(x) (((x)->m_opcode)&0xffff)
|
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register m68000_ctrl[] = { 0 };
|
|
|
|
|
static const enum m68k_register m68010_ctrl[] = {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
SFC, DFC, USP, VBR,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register m68020_ctrl[] = {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
SFC, DFC, USP, VBR, CACR, CAAR, MSP, ISP,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register m68040_ctrl[] = {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
SFC, DFC, CACR, TC, ITT0, ITT1, DTT0, DTT1,
|
|
|
|
|
USP, VBR, MSP, ISP, MMUSR, URP, SRP,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register m68060_ctrl[] = {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
SFC, DFC, CACR, TC, ITT0, ITT1, DTT0, DTT1, BUSCR,
|
|
|
|
|
USP, VBR, URP, SRP, PCR,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf_ctrl[] = {
|
2003-10-21 21:28:59 +08:00
|
|
|
|
CACR, TC, ACR0, ACR1, ACR2, ACR3, VBR, ROMBAR,
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
RAMBAR0, RAMBAR1, RAMBAR, MBAR,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
static const enum m68k_register mcf51_ctrl[] = {
|
|
|
|
|
VBR, CPUCR,
|
2007-08-28 21:36:35 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
static const enum m68k_register mcf5206_ctrl[] = {
|
2009-11-11 02:05:24 +08:00
|
|
|
|
CACR, ACR0, ACR1, VBR, RAMBAR0, RAMBAR_ALT, MBAR,
|
1999-05-03 15:29:11 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5208_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
CACR, ACR0, ACR1, VBR, RAMBAR, RAMBAR1,
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2007-02-20 17:25:45 +08:00
|
|
|
|
static const enum m68k_register mcf5210a_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, ROMBAR, RAMBAR, RAMBAR1, MBAR,
|
2007-02-20 17:25:45 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5213_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, RAMBAR, RAMBAR1, FLASHBAR,
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5216_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, FLASHBAR, RAMBAR, RAMBAR1,
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2009-07-28 04:07:00 +08:00
|
|
|
|
static const enum m68k_register mcf5221x_ctrl[] = {
|
|
|
|
|
VBR, FLASHBAR, RAMBAR, RAMBAR1,
|
|
|
|
|
0
|
|
|
|
|
};
|
2007-04-20 22:41:38 +08:00
|
|
|
|
static const enum m68k_register mcf52223_ctrl[] = {
|
2009-11-11 02:05:24 +08:00
|
|
|
|
VBR, FLASHBAR, RAMBAR, RAMBAR1,
|
2007-04-20 22:41:38 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2007-02-20 17:25:45 +08:00
|
|
|
|
static const enum m68k_register mcf52235_ctrl[] = {
|
2009-07-28 04:05:03 +08:00
|
|
|
|
VBR, FLASHBAR, RAMBAR, RAMBAR1,
|
2007-02-20 17:25:45 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5225_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, FLASHBAR, RAMBAR, MBAR, RAMBAR1,
|
2007-02-20 17:25:45 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
static const enum m68k_register mcf52259_ctrl[] = {
|
|
|
|
|
VBR, FLASHBAR, RAMBAR, RAMBAR1,
|
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf52277_ctrl[] = {
|
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5235_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
2004-10-08 16:45:54 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5249_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR0, RAMBAR1, RAMBAR, MBAR, MBAR2,
|
2003-10-21 21:28:59 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5250_ctrl[] = {
|
|
|
|
|
VBR,
|
|
|
|
|
0
|
|
|
|
|
};
|
2007-04-20 22:41:38 +08:00
|
|
|
|
static const enum m68k_register mcf5253_ctrl[] = {
|
2007-08-28 21:43:06 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR0, RAMBAR1, RAMBAR, MBAR, MBAR2,
|
2007-04-20 22:41:38 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
static const enum m68k_register mcf5271_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5272_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, ROMBAR, RAMBAR_ALT, RAMBAR0, MBAR,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5275_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5282_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, FLASHBAR, RAMBAR, RAMBAR1,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
static const enum m68k_register mcf53017_ctrl[] = {
|
2009-07-28 04:05:03 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
static const enum m68k_register mcf5307_ctrl[] = {
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR0, RAMBAR_ALT, MBAR,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5329_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5373_ctrl[] = {
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
VBR, CACR, ACR0, ACR1, RAMBAR, RAMBAR1,
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcfv4e_ctrl[] = {
|
2007-02-16 02:37:08 +08:00
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3, MMUBAR,
|
|
|
|
|
VBR, PC, ROMBAR0, ROMBAR1, RAMBAR0, RAMBAR1,
|
|
|
|
|
MBAR, SECMBAR,
|
|
|
|
|
MPCR /* Multiprocessor Control register */,
|
|
|
|
|
EDRAMBAR /* Embedded DRAM Base Address Register */,
|
|
|
|
|
/* Permutation control registers. */
|
2003-10-21 21:28:59 +08:00
|
|
|
|
PCR1U0, PCR1L0, PCR1U1, PCR1L1, PCR2U0, PCR2L0, PCR2U1, PCR2L1,
|
|
|
|
|
PCR3U0, PCR3L0, PCR3U1, PCR3L1,
|
2007-02-16 02:37:08 +08:00
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */, BUSCR /* MMUBAR */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
|
|
|
|
MBAR1 /* MBAR */, MBAR2 /* SECMBAR */, MBAR0 /* SECMBAR */,
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
ROMBAR /* ROMBAR0 */, RAMBAR /* RAMBAR1 */,
|
2007-02-16 02:37:08 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2007-08-28 21:43:06 +08:00
|
|
|
|
static const enum m68k_register mcf5407_ctrl[] = {
|
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3,
|
|
|
|
|
VBR, PC, RAMBAR0, RAMBAR1, MBAR,
|
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
|
|
|
|
MBAR1 /* MBAR */, RAMBAR /* RAMBAR1 */,
|
|
|
|
|
0
|
|
|
|
|
};
|
2009-11-11 02:05:24 +08:00
|
|
|
|
static const enum m68k_register mcf54418_ctrl[] = {
|
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3, ACR4, ACR5, ACR6, ACR7, MMUBAR, RGPIOBAR,
|
|
|
|
|
VBR, PC, RAMBAR1,
|
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */, BUSCR /* MMUBAR */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
|
|
|
|
RAMBAR /* RAMBAR1 */,
|
|
|
|
|
0
|
|
|
|
|
};
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
static const enum m68k_register mcf54455_ctrl[] = {
|
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3, MMUBAR,
|
2009-11-11 02:05:24 +08:00
|
|
|
|
VBR, PC, RAMBAR1,
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */, BUSCR /* MMUBAR */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
2009-11-11 02:05:24 +08:00
|
|
|
|
RAMBAR /* RAMBAR1 */,
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2007-02-16 02:37:08 +08:00
|
|
|
|
static const enum m68k_register mcf5475_ctrl[] = {
|
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3, MMUBAR,
|
|
|
|
|
VBR, PC, RAMBAR0, RAMBAR1, MBAR,
|
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */, BUSCR /* MMUBAR */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
MBAR1 /* MBAR */, RAMBAR /* RAMBAR1 */,
|
2007-02-16 02:37:08 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
|
|
|
|
static const enum m68k_register mcf5485_ctrl[] = {
|
|
|
|
|
CACR, ASID, ACR0, ACR1, ACR2, ACR3, MMUBAR,
|
|
|
|
|
VBR, PC, RAMBAR0, RAMBAR1, MBAR,
|
|
|
|
|
/* Legacy names */
|
|
|
|
|
TC /* ASID */, BUSCR /* MMUBAR */,
|
|
|
|
|
ITT0 /* ACR0 */, ITT1 /* ACR1 */, DTT0 /* ACR2 */, DTT1 /* ACR3 */,
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
MBAR1 /* MBAR */, RAMBAR /* RAMBAR1 */,
|
2003-10-21 21:28:59 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
2006-12-27 15:15:02 +08:00
|
|
|
|
static const enum m68k_register fido_ctrl[] = {
|
2007-09-27 19:14:10 +08:00
|
|
|
|
SFC, DFC, USP, VBR, CAC, MBO,
|
2006-12-27 15:15:02 +08:00
|
|
|
|
0
|
|
|
|
|
};
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
#define cpu32_ctrl m68010_ctrl
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static const enum m68k_register *control_regs;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Internal form of a 68020 instruction. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct m68k_it
|
|
|
|
|
{
|
|
|
|
|
const char *error;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
const char *args; /* List of opcode info. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
int numargs;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
int numo; /* Number of shorts in opcode. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
short opcode[11];
|
|
|
|
|
|
|
|
|
|
struct m68k_op operands[6];
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
int nexp; /* Number of exprs in use. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct m68k_exp exprs[4];
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
int nfrag; /* Number of frags we have to produce. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
int fragoff; /* Where in the current opcode the frag ends. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
symbolS *fadd;
|
|
|
|
|
offsetT foff;
|
|
|
|
|
int fragty;
|
|
|
|
|
}
|
|
|
|
|
fragb[4];
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
int nrel; /* Num of reloc strucs in use. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
struct
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
expressionS exp;
|
|
|
|
|
char wid;
|
|
|
|
|
char pcrel;
|
|
|
|
|
/* In a pc relative address the difference between the address
|
|
|
|
|
of the offset and the address that the offset is relative
|
|
|
|
|
to. This depends on the addressing mode. Basically this
|
|
|
|
|
is the value to put in the offset field to address the
|
|
|
|
|
first byte of the offset, without regarding the special
|
|
|
|
|
significance of some values (in the branch instruction, for
|
|
|
|
|
example). */
|
|
|
|
|
int pcrel_fix;
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
/* Whether this expression needs special pic relocation, and if
|
|
|
|
|
so, which. */
|
|
|
|
|
enum pic_relocation pic_reloc;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2003-10-17 18:50:27 +08:00
|
|
|
|
reloc[5]; /* Five is enough??? */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
bfd/
* archures.c (bfd_mach_cpu32_fido): New.
(bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_a,
bfd_mach_mcf_isa_a_mac, bfd_mach_mcf_isa_a_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_b_nousp,
bfd_mach_mcf_isa_b_nousp_mac, bfd_mach_mcf_isa_b_nousp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac,
bfd_mach_mcf_isa_b_emac, bfd_mach_mcf_isa_b_float,
bfd_mach_mcf_isa_b_float_mac, bfd_mach_mcf_isa_b_float_emac):
Increment the defined values.
* bfd-in2.h: Regenerate.
* cpu-m68k.c (arch_info_struct): Add en entry for
bfd_mach_cpu32_fido.
* elf32-m68k.c (elf32_m68k_object_p): Handle
EF_M68K_CPU32_FIDO_A.
(elf32_m68k_merge_private_bfd_data): Use EF_M68K_CPU32_MASK.
(elf32_m68k_print_private_bfd_data): Handle
EF_M68K_CPU32_FIDO_A.
binutils/
* readelf.c (get_machine_flags): Handle EF_M68K_CPU32_FIDO_A.
gas/
* config/tc-m68k.c (cpu_of_arch): Add fido.
(m68k_archs, m68k_cpu): Add entries for fido.
(m68k_elf_final_processing): Handle EF_M68K_CPU32_FIDO_A.
include/elf/
* m68k.h (EF_M68K_CPU32_FIDO_A, EF_M68K_CPU32_MASK): New.
include/opcode/
* m68k.h (fido_a): New.
2006-12-26 06:39:21 +08:00
|
|
|
|
#define cpu_of_arch(x) ((x) & (m68000up | mcfisa_a | fido_a))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#define float_of_arch(x) ((x) & mfloat)
|
|
|
|
|
#define mmu_of_arch(x) ((x) & mmmu)
|
2004-05-05 22:33:14 +08:00
|
|
|
|
#define arch_coldfire_p(x) ((x) & mcfisa_a)
|
|
|
|
|
#define arch_coldfire_fpu(x) ((x) & cfloat)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Macros for determining if cpu supports a specific addressing mode. */
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
#define HAVE_LONG_DISP(x) \
|
|
|
|
|
((x) & (m68020|m68030|m68040|m68060|cpu32|fido_a|mcfisa_b|mcfisa_c))
|
|
|
|
|
#define HAVE_LONG_CALL(x) \
|
|
|
|
|
((x) & (m68020|m68030|m68040|m68060|cpu32|fido_a|mcfisa_b|mcfisa_c))
|
|
|
|
|
#define HAVE_LONG_COND(x) \
|
|
|
|
|
((x) & (m68020|m68030|m68040|m68060|cpu32|fido_a|mcfisa_b|mcfisa_c))
|
|
|
|
|
#define HAVE_LONG_BRANCH(x) \
|
|
|
|
|
((x) & (m68020|m68030|m68040|m68060|cpu32|fido_a|mcfisa_b))
|
2007-09-25 23:31:05 +08:00
|
|
|
|
#define LONG_BRANCH_VIA_COND(x) (HAVE_LONG_COND(x) && !HAVE_LONG_BRANCH(x))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
static struct m68k_it the_ins; /* The instruction being assembled. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#define op(ex) ((ex)->exp.X_op)
|
|
|
|
|
#define adds(ex) ((ex)->exp.X_add_symbol)
|
|
|
|
|
#define subs(ex) ((ex)->exp.X_op_symbol)
|
|
|
|
|
#define offs(ex) ((ex)->exp.X_add_number)
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Macros for adding things to the m68k_it struct. */
|
2004-07-11 23:20:30 +08:00
|
|
|
|
#define addword(w) (the_ins.opcode[the_ins.numo++] = (w))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Like addword, but goes BEFORE general operands. */
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
insop (int w, const struct m68k_incant *opcode)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int z;
|
2001-07-23 22:02:13 +08:00
|
|
|
|
for (z = the_ins.numo; z > opcode->m_codenum; --z)
|
2002-05-08 09:54:04 +08:00
|
|
|
|
the_ins.opcode[z] = the_ins.opcode[z - 1];
|
|
|
|
|
for (z = 0; z < the_ins.nrel; z++)
|
|
|
|
|
the_ins.reloc[z].n += 2;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (z = 0; z < the_ins.nfrag; z++)
|
|
|
|
|
the_ins.fragb[z].fragoff++;
|
2002-05-08 09:54:04 +08:00
|
|
|
|
the_ins.opcode[opcode->m_codenum] = w;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
the_ins.numo++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The numo+1 kludge is so we can hit the low order byte of the prev word.
|
|
|
|
|
Blecch. */
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
add_fix (int width, struct m68k_exp *exp, int pc_rel, int pc_fix)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2004-07-11 23:20:30 +08:00
|
|
|
|
the_ins.reloc[the_ins.nrel].n = (width == 'B' || width == '3'
|
|
|
|
|
? the_ins.numo * 2 - 1
|
|
|
|
|
: (width == 'b'
|
|
|
|
|
? the_ins.numo * 2 + 1
|
|
|
|
|
: the_ins.numo * 2));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
the_ins.reloc[the_ins.nrel].exp = exp->exp;
|
|
|
|
|
the_ins.reloc[the_ins.nrel].wid = width;
|
|
|
|
|
the_ins.reloc[the_ins.nrel].pcrel_fix = pc_fix;
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
the_ins.reloc[the_ins.nrel].pic_reloc = exp->pic_reloc;
|
|
|
|
|
#endif
|
|
|
|
|
the_ins.reloc[the_ins.nrel++].pcrel = pc_rel;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Cause an extra frag to be generated here, inserting up to 10 bytes
|
|
|
|
|
(that value is chosen in the frag_var call in md_assemble). TYPE
|
|
|
|
|
is the subtype of the frag to be generated; its primary type is
|
|
|
|
|
rs_machine_dependent.
|
|
|
|
|
|
|
|
|
|
The TYPE parameter is also used by md_convert_frag_1 and
|
|
|
|
|
md_estimate_size_before_relax. The appropriate type of fixup will
|
|
|
|
|
be emitted by md_convert_frag_1.
|
|
|
|
|
|
|
|
|
|
ADD becomes the FR_SYMBOL field of the frag, and OFF the FR_OFFSET. */
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
add_frag (symbolS *add, offsetT off, int type)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-05-08 09:54:04 +08:00
|
|
|
|
the_ins.fragb[the_ins.nfrag].fragoff = the_ins.numo;
|
|
|
|
|
the_ins.fragb[the_ins.nfrag].fadd = add;
|
|
|
|
|
the_ins.fragb[the_ins.nfrag].foff = off;
|
|
|
|
|
the_ins.fragb[the_ins.nfrag++].fragty = type;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define isvar(ex) \
|
|
|
|
|
(op (ex) != O_constant && op (ex) != O_big)
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
static char *crack_operand (char *str, struct m68k_op *opP);
|
|
|
|
|
static int get_num (struct m68k_exp *exp, int ok);
|
|
|
|
|
static int reverse_16_bits (int in);
|
|
|
|
|
static int reverse_8_bits (int in);
|
|
|
|
|
static void install_gen_operand (int mode, int val);
|
|
|
|
|
static void install_operand (int mode, int val);
|
|
|
|
|
static void s_bss (int);
|
|
|
|
|
static void s_data1 (int);
|
|
|
|
|
static void s_data2 (int);
|
|
|
|
|
static void s_even (int);
|
|
|
|
|
static void s_proc (int);
|
|
|
|
|
static void s_chip (int);
|
|
|
|
|
static void s_fopt (int);
|
|
|
|
|
static void s_opt (int);
|
|
|
|
|
static void s_reg (int);
|
|
|
|
|
static void s_restore (int);
|
|
|
|
|
static void s_save (int);
|
|
|
|
|
static void s_mri_if (int);
|
|
|
|
|
static void s_mri_else (int);
|
|
|
|
|
static void s_mri_endi (int);
|
|
|
|
|
static void s_mri_break (int);
|
|
|
|
|
static void s_mri_next (int);
|
|
|
|
|
static void s_mri_for (int);
|
|
|
|
|
static void s_mri_endf (int);
|
|
|
|
|
static void s_mri_repeat (int);
|
|
|
|
|
static void s_mri_until (int);
|
|
|
|
|
static void s_mri_while (int);
|
|
|
|
|
static void s_mri_endw (int);
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
static void s_m68k_cpu (int);
|
|
|
|
|
static void s_m68k_arch (int);
|
|
|
|
|
|
|
|
|
|
struct m68k_cpu
|
|
|
|
|
{
|
|
|
|
|
unsigned long arch; /* Architecture features. */
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
const enum m68k_register *control_regs; /* Control regs on chip */
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
const char *name; /* Name */
|
2006-03-06 21:42:05 +08:00
|
|
|
|
int alias; /* Alias for a cannonical name. If 1, then
|
|
|
|
|
succeeds canonical name, if -1 then
|
|
|
|
|
succeeds canonical name, if <-1 ||>1 this is a
|
|
|
|
|
deprecated name, and the next/previous name
|
|
|
|
|
should be used. */
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
};
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
/* We hold flags for features explicitly enabled and explicitly
|
|
|
|
|
disabled. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static int current_architecture;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
static int not_current_architecture;
|
|
|
|
|
static const struct m68k_cpu *selected_arch;
|
|
|
|
|
static const struct m68k_cpu *selected_cpu;
|
|
|
|
|
static int initialized;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
/* Architecture models. */
|
|
|
|
|
static const struct m68k_cpu m68k_archs[] =
|
|
|
|
|
{
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{m68000, m68000_ctrl, "68000", 0},
|
|
|
|
|
{m68010, m68010_ctrl, "68010", 0},
|
|
|
|
|
{m68020|m68881|m68851, m68020_ctrl, "68020", 0},
|
|
|
|
|
{m68030|m68881|m68851, m68020_ctrl, "68030", 0},
|
|
|
|
|
{m68040, m68040_ctrl, "68040", 0},
|
|
|
|
|
{m68060, m68060_ctrl, "68060", 0},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "cpu32", 0},
|
2007-01-09 02:42:37 +08:00
|
|
|
|
{fido_a, fido_ctrl, "fidoa", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv, NULL, "isaa", 0},
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfisa_aa|mcfusp, NULL, "isaaplus", 0},
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp, NULL, "isab", 0},
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp, NULL, "isac", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfisa_b|mcfmac|mcfusp, mcf_ctrl, "cfv4", 0},
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfisa_b|mcfemac|mcfusp|cfloat, mcfv4e_ctrl, "cfv4e", 0},
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
{0,0,NULL, 0}
|
|
|
|
|
};
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
/* For -mno-mac we want to turn off all types of mac. */
|
|
|
|
|
static const unsigned no_mac = mcfmac | mcfemac;
|
|
|
|
|
|
2006-03-06 21:42:05 +08:00
|
|
|
|
/* Architecture extensions, here 'alias' -1 for m68k, +1 for cf and 0
|
|
|
|
|
for either. */
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
static const struct m68k_cpu m68k_extensions[] =
|
|
|
|
|
{
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{m68851, NULL, "68851", -1},
|
|
|
|
|
{m68881, NULL, "68881", -1},
|
|
|
|
|
{m68881, NULL, "68882", -1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{cfloat|m68881, NULL, "float", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfhwdiv, NULL, "div", 1},
|
|
|
|
|
{mcfusp, NULL, "usp", 1},
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
{mcfmac, (void *)&no_mac, "mac", 1},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfemac, NULL, "emac", 1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{0,NULL,NULL, 0}
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Processor list */
|
|
|
|
|
static const struct m68k_cpu m68k_cpus[] =
|
|
|
|
|
{
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{m68000, m68000_ctrl, "68000", 0},
|
|
|
|
|
{m68000, m68000_ctrl, "68ec000", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68hc000", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68hc001", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68008", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68302", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68306", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68307", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68322", 1},
|
|
|
|
|
{m68000, m68000_ctrl, "68356", 1},
|
|
|
|
|
{m68010, m68010_ctrl, "68010", 0},
|
|
|
|
|
{m68020|m68881|m68851, m68020_ctrl, "68020", 0},
|
|
|
|
|
{m68020|m68881|m68851, m68020_ctrl, "68k", 1},
|
|
|
|
|
{m68020|m68881|m68851, m68020_ctrl, "68ec020", 1},
|
|
|
|
|
{m68030|m68881|m68851, m68020_ctrl, "68030", 0},
|
|
|
|
|
{m68030|m68881|m68851, m68020_ctrl, "68ec030", 1},
|
|
|
|
|
{m68040, m68040_ctrl, "68040", 0},
|
|
|
|
|
{m68040, m68040_ctrl, "68ec040", 1},
|
|
|
|
|
{m68060, m68060_ctrl, "68060", 0},
|
|
|
|
|
{m68060, m68060_ctrl, "68ec060", 1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "cpu32", 0},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68330", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68331", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68332", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68333", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68334", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68336", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68340", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68341", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68349", 1},
|
|
|
|
|
{cpu32|m68881, cpu32_ctrl, "68360", 1},
|
2007-08-28 21:36:35 +08:00
|
|
|
|
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp, mcf51_ctrl, "51", 0},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp, mcf51_ctrl, "51ac", 1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp, mcf51_ctrl, "51cn", 1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp|mcfmac, mcf51_ctrl, "51em", 1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp, mcf51_ctrl, "51jm", 1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfusp, mcf51_ctrl, "51qe", 1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a, mcf_ctrl, "5200", 0},
|
|
|
|
|
{mcfisa_a, mcf_ctrl, "5202", 1},
|
|
|
|
|
{mcfisa_a, mcf_ctrl, "5204", 1},
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
{mcfisa_a, mcf5206_ctrl, "5206", 1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfmac, mcf5206_ctrl, "5206e", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5208_ctrl, "5207", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5208_ctrl, "5208", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
2007-02-20 17:25:45 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5210a_ctrl, "5210a", 0},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5210a_ctrl, "5211a", 1},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5213_ctrl, "5211", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5213_ctrl, "5212", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5213_ctrl, "5213", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5216_ctrl, "5214", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5216_ctrl, "5216", 0},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5216_ctrl, "521x", 2},
|
|
|
|
|
|
2009-07-28 04:07:00 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5221x_ctrl, "5221x", 0},
|
|
|
|
|
|
2007-04-20 22:41:38 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf52223_ctrl, "52221", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf52223_ctrl, "52223", 0},
|
|
|
|
|
|
2007-02-20 17:25:45 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52235_ctrl, "52230", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52235_ctrl, "52233", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52235_ctrl, "52234", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52235_ctrl, "52235", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
2007-02-20 17:25:45 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5225_ctrl, "5224", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac|mcfusp, mcf5225_ctrl, "5225", 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52277_ctrl, "52274", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52277_ctrl, "52277", 0},
|
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5235_ctrl, "5232", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5235_ctrl, "5233", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5235_ctrl, "5234", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5235_ctrl, "5235", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5235_ctrl, "523x", 0},
|
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfemac, mcf5249_ctrl, "5249", 0},
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfemac, mcf5250_ctrl, "5250", 0},
|
2007-04-20 22:41:38 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfemac, mcf5253_ctrl, "5253", 0},
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52252", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52254", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52255", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52256", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52258", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf52259_ctrl, "52259", 0},
|
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5271_ctrl, "5270", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5271_ctrl, "5271", 0},
|
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfmac, mcf5272_ctrl, "5272", 0},
|
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5275_ctrl, "5274", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5275_ctrl, "5275", 0},
|
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5282_ctrl, "5280", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5282_ctrl, "5281", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5282_ctrl, "5282", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5282_ctrl, "528x", 0},
|
|
|
|
|
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53011", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53012", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53013", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53014", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53015", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53016", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf53017_ctrl, "53017", 0},
|
|
|
|
|
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
{mcfisa_a|mcfhwdiv|mcfmac, mcf5307_ctrl, "5307", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5329_ctrl, "5327", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5329_ctrl, "5328", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5329_ctrl, "5329", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5329_ctrl, "532x", 0},
|
|
|
|
|
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5373_ctrl, "5372", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5373_ctrl, "5373", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac|mcfusp, mcf5373_ctrl, "537x", 0},
|
|
|
|
|
|
2007-08-28 21:43:06 +08:00
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfmac, mcf5407_ctrl, "5407",0},
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
|
2009-11-11 02:05:24 +08:00
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54418_ctrl, "54410", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54418_ctrl, "54415", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54418_ctrl, "54416", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54418_ctrl, "54417", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54418_ctrl, "54418", 0},
|
|
|
|
|
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54450", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54451", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54452", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54453", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54454", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_c|mcfhwdiv|mcfemac|mcfusp, mcf54455_ctrl, "54455", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
|
2007-02-16 02:37:08 +08:00
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5470", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5471", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5472", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5473", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5474", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "5475", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5475_ctrl, "547x", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
|
2007-02-16 02:37:08 +08:00
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5480", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5481", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5482", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5483", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5484", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "5485", -1},
|
|
|
|
|
{mcfisa_a|mcfisa_b|mcfhwdiv|mcfemac|mcfusp|cfloat, mcf5485_ctrl, "548x", 0},
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
|
2007-03-17 02:08:58 +08:00
|
|
|
|
{fido_a, fido_ctrl, "fidoa", 0},
|
2007-01-09 02:42:37 +08:00
|
|
|
|
{fido_a, fido_ctrl, "fido", 1},
|
bfd/
* archures.c (bfd_mach_cpu32_fido): New.
(bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_a,
bfd_mach_mcf_isa_a_mac, bfd_mach_mcf_isa_a_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_b_nousp,
bfd_mach_mcf_isa_b_nousp_mac, bfd_mach_mcf_isa_b_nousp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac,
bfd_mach_mcf_isa_b_emac, bfd_mach_mcf_isa_b_float,
bfd_mach_mcf_isa_b_float_mac, bfd_mach_mcf_isa_b_float_emac):
Increment the defined values.
* bfd-in2.h: Regenerate.
* cpu-m68k.c (arch_info_struct): Add en entry for
bfd_mach_cpu32_fido.
* elf32-m68k.c (elf32_m68k_object_p): Handle
EF_M68K_CPU32_FIDO_A.
(elf32_m68k_merge_private_bfd_data): Use EF_M68K_CPU32_MASK.
(elf32_m68k_print_private_bfd_data): Handle
EF_M68K_CPU32_FIDO_A.
binutils/
* readelf.c (get_machine_flags): Handle EF_M68K_CPU32_FIDO_A.
gas/
* config/tc-m68k.c (cpu_of_arch): Add fido.
(m68k_archs, m68k_cpu): Add entries for fido.
(m68k_elf_final_processing): Handle EF_M68K_CPU32_FIDO_A.
include/elf/
* m68k.h (EF_M68K_CPU32_FIDO_A, EF_M68K_CPU32_MASK): New.
include/opcode/
* m68k.h (fido_a): New.
2006-12-26 06:39:21 +08:00
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{0,NULL,NULL, 0}
|
2001-03-07 04:12:21 +08:00
|
|
|
|
};
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
static const struct m68k_cpu *m68k_lookup_cpu
|
|
|
|
|
(const char *, const struct m68k_cpu *, int, int *);
|
|
|
|
|
static int m68k_set_arch (const char *, int, int);
|
|
|
|
|
static int m68k_set_cpu (const char *, int, int);
|
|
|
|
|
static int m68k_set_extension (const char *, int, int);
|
|
|
|
|
static void m68k_init_arch (void);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* This is the assembler relaxation table for m68k. m68k is a rich CISC
|
|
|
|
|
architecture and we have a lot of relaxation modes. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Macros used in the relaxation code. */
|
|
|
|
|
#define TAB(x,y) (((x) << 2) + (y))
|
|
|
|
|
#define TABTYPE(x) ((x) >> 2)
|
|
|
|
|
|
|
|
|
|
/* Relaxation states. */
|
|
|
|
|
#define BYTE 0
|
|
|
|
|
#define SHORT 1
|
|
|
|
|
#define LONG 2
|
|
|
|
|
#define SZ_UNDEF 3
|
|
|
|
|
|
|
|
|
|
/* Here are all the relaxation modes we support. First we can relax ordinary
|
|
|
|
|
branches. On 68020 and higher and on CPU32 all branch instructions take
|
|
|
|
|
three forms, so on these CPUs all branches always remain as such. When we
|
|
|
|
|
have to expand to the LONG form on a 68000, though, we substitute an
|
|
|
|
|
absolute jump instead. This is a direct replacement for unconditional
|
|
|
|
|
branches and a branch over a jump for conditional branches. However, if the
|
|
|
|
|
user requires PIC and disables this with --pcrel, we can only relax between
|
|
|
|
|
BYTE and SHORT forms, punting if that isn't enough. This gives us four
|
|
|
|
|
different relaxation modes for branches: */
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
#define BRANCHBWL 0 /* Branch byte, word, or long. */
|
|
|
|
|
#define BRABSJUNC 1 /* Absolute jump for LONG, unconditional. */
|
|
|
|
|
#define BRABSJCOND 2 /* Absolute jump for LONG, conditional. */
|
|
|
|
|
#define BRANCHBW 3 /* Branch byte or word. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
|
|
|
|
|
/* We also relax coprocessor branches and DBcc's. All CPUs that support
|
|
|
|
|
coprocessor branches support them in word and long forms, so we have only
|
|
|
|
|
one relaxation mode for them. DBcc's are word only on all CPUs. We can
|
|
|
|
|
relax them to the LONG form with a branch-around sequence. This sequence
|
|
|
|
|
can use a long branch (if available) or an absolute jump (if acceptable).
|
|
|
|
|
This gives us two relaxation modes. If long branches are not available and
|
|
|
|
|
absolute jumps are not acceptable, we don't relax DBcc's. */
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
#define FBRANCH 4 /* Coprocessor branch. */
|
|
|
|
|
#define DBCCLBR 5 /* DBcc relaxable with a long branch. */
|
|
|
|
|
#define DBCCABSJ 6 /* DBcc relaxable with an absolute jump. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
|
|
|
|
|
/* That's all for instruction relaxation. However, we also relax PC-relative
|
|
|
|
|
operands. Specifically, we have three operand relaxation modes. On the
|
|
|
|
|
68000 PC-relative operands can only be 16-bit, but on 68020 and higher and
|
|
|
|
|
on CPU32 they may be 16-bit or 32-bit. For the latter we relax between the
|
|
|
|
|
two. Also PC+displacement+index operands in their simple form (with a non-
|
|
|
|
|
suppressed index without memory indirection) are supported on all CPUs, but
|
|
|
|
|
on the 68000 the displacement can be 8-bit only, whereas on 68020 and higher
|
|
|
|
|
and on CPU32 we relax it to SHORT and LONG forms as well using the extended
|
|
|
|
|
form of the PC+displacement+index operand. Finally, some absolute operands
|
|
|
|
|
can be relaxed down to 16-bit PC-relative. */
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
#define PCREL1632 7 /* 16-bit or 32-bit PC-relative. */
|
|
|
|
|
#define PCINDEX 8 /* PC + displacement + index. */
|
|
|
|
|
#define ABSTOPCREL 9 /* Absolute relax down to 16-bit PC-relative. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-09-25 23:31:05 +08:00
|
|
|
|
/* This relaxation is required for branches where there is no long
|
|
|
|
|
branch and we are in pcrel mode. We generate a bne/beq pair. */
|
|
|
|
|
#define BRANCHBWPL 10 /* Branch byte, word or pair of longs
|
|
|
|
|
*/
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Note that calls to frag_var need to specify the maximum expansion
|
2007-09-25 23:31:05 +08:00
|
|
|
|
needed; this is currently 12 bytes for bne/beq pair. */
|
|
|
|
|
#define FRAG_VAR_SIZE 12
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The fields are:
|
|
|
|
|
How far Forward this mode will reach:
|
|
|
|
|
How far Backward this mode will reach:
|
|
|
|
|
How many bytes this mode will add to the size of the frag
|
|
|
|
|
Which mode to go to if the offset won't fit in this one
|
2002-01-06 20:15:45 +08:00
|
|
|
|
|
|
|
|
|
Please check tc-m68k.h:md_prepare_relax_scan if changing this table. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
relax_typeS md_relax_table[] =
|
|
|
|
|
{
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 127, -128, 0, TAB (BRANCHBWL, SHORT) },
|
|
|
|
|
{ 32767, -32768, 2, TAB (BRANCHBWL, LONG) },
|
|
|
|
|
{ 0, 0, 4, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
|
|
|
|
{ 127, -128, 0, TAB (BRABSJUNC, SHORT) },
|
|
|
|
|
{ 32767, -32768, 2, TAB (BRABSJUNC, LONG) },
|
|
|
|
|
{ 0, 0, 4, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
|
|
|
|
{ 127, -128, 0, TAB (BRABSJCOND, SHORT) },
|
|
|
|
|
{ 32767, -32768, 2, TAB (BRABSJCOND, LONG) },
|
|
|
|
|
{ 0, 0, 6, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
|
|
|
|
{ 127, -128, 0, TAB (BRANCHBW, SHORT) },
|
|
|
|
|
{ 0, 0, 2, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ 1, 1, 0, 0 }, /* FBRANCH doesn't come BYTE. */
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 32767, -32768, 2, TAB (FBRANCH, LONG) },
|
|
|
|
|
{ 0, 0, 4, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ 1, 1, 0, 0 }, /* DBCC doesn't come BYTE. */
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 32767, -32768, 2, TAB (DBCCLBR, LONG) },
|
|
|
|
|
{ 0, 0, 10, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ 1, 1, 0, 0 }, /* DBCC doesn't come BYTE. */
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 32767, -32768, 2, TAB (DBCCABSJ, LONG) },
|
|
|
|
|
{ 0, 0, 10, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ 1, 1, 0, 0 }, /* PCREL1632 doesn't come BYTE. */
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 32767, -32768, 2, TAB (PCREL1632, LONG) },
|
|
|
|
|
{ 0, 0, 6, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
|
|
|
|
{ 125, -130, 0, TAB (PCINDEX, SHORT) },
|
|
|
|
|
{ 32765, -32770, 2, TAB (PCINDEX, LONG) },
|
|
|
|
|
{ 0, 0, 4, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ 1, 1, 0, 0 }, /* ABSTOPCREL doesn't come BYTE. */
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
{ 32767, -32768, 2, TAB (ABSTOPCREL, LONG) },
|
|
|
|
|
{ 0, 0, 4, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
2007-09-25 23:31:05 +08:00
|
|
|
|
|
|
|
|
|
{ 127, -128, 0, TAB (BRANCHBWPL, SHORT) },
|
|
|
|
|
{ 32767, -32768, 2, TAB (BRANCHBWPL, LONG) },
|
|
|
|
|
{ 0, 0, 10, 0 },
|
|
|
|
|
{ 1, 1, 0, 0 },
|
1999-05-03 15:29:11 +08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* These are the machine dependent pseudo-ops. These are included so
|
|
|
|
|
the assembler can work on the output from the SUN C compiler, which
|
2003-10-17 18:50:27 +08:00
|
|
|
|
generates these. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* This table describes all the machine specific pseudo-ops the assembler
|
|
|
|
|
has to support. The fields are:
|
|
|
|
|
pseudo-op name without dot
|
|
|
|
|
function to call to execute this pseudo-op
|
2003-10-17 18:50:27 +08:00
|
|
|
|
Integer arg to pass to the function. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
const pseudo_typeS md_pseudo_table[] =
|
|
|
|
|
{
|
|
|
|
|
{"data1", s_data1, 0},
|
|
|
|
|
{"data2", s_data2, 0},
|
|
|
|
|
{"bss", s_bss, 0},
|
|
|
|
|
{"even", s_even, 0},
|
|
|
|
|
{"skip", s_space, 0},
|
|
|
|
|
{"proc", s_proc, 0},
|
|
|
|
|
#if defined (TE_SUN3) || defined (OBJ_ELF)
|
|
|
|
|
{"align", s_align_bytes, 0},
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
{"swbeg", s_ignore, 0},
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
{"long", m68k_elf_cons, 4},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif
|
|
|
|
|
{"extend", float_cons, 'x'},
|
|
|
|
|
{"ldouble", float_cons, 'x'},
|
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
{"arch", s_m68k_arch, 0},
|
|
|
|
|
{"cpu", s_m68k_cpu, 0},
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* The following pseudo-ops are supported for MRI compatibility. */
|
|
|
|
|
{"chip", s_chip, 0},
|
|
|
|
|
{"comline", s_space, 1},
|
|
|
|
|
{"fopt", s_fopt, 0},
|
|
|
|
|
{"mask2", s_ignore, 0},
|
|
|
|
|
{"opt", s_opt, 0},
|
|
|
|
|
{"reg", s_reg, 0},
|
|
|
|
|
{"restore", s_restore, 0},
|
|
|
|
|
{"save", s_save, 0},
|
|
|
|
|
|
|
|
|
|
{"if", s_mri_if, 0},
|
|
|
|
|
{"if.b", s_mri_if, 'b'},
|
|
|
|
|
{"if.w", s_mri_if, 'w'},
|
|
|
|
|
{"if.l", s_mri_if, 'l'},
|
|
|
|
|
{"else", s_mri_else, 0},
|
|
|
|
|
{"else.s", s_mri_else, 's'},
|
|
|
|
|
{"else.l", s_mri_else, 'l'},
|
|
|
|
|
{"endi", s_mri_endi, 0},
|
|
|
|
|
{"break", s_mri_break, 0},
|
|
|
|
|
{"break.s", s_mri_break, 's'},
|
|
|
|
|
{"break.l", s_mri_break, 'l'},
|
|
|
|
|
{"next", s_mri_next, 0},
|
|
|
|
|
{"next.s", s_mri_next, 's'},
|
|
|
|
|
{"next.l", s_mri_next, 'l'},
|
|
|
|
|
{"for", s_mri_for, 0},
|
|
|
|
|
{"for.b", s_mri_for, 'b'},
|
|
|
|
|
{"for.w", s_mri_for, 'w'},
|
|
|
|
|
{"for.l", s_mri_for, 'l'},
|
|
|
|
|
{"endf", s_mri_endf, 0},
|
|
|
|
|
{"repeat", s_mri_repeat, 0},
|
|
|
|
|
{"until", s_mri_until, 0},
|
|
|
|
|
{"until.b", s_mri_until, 'b'},
|
|
|
|
|
{"until.w", s_mri_until, 'w'},
|
|
|
|
|
{"until.l", s_mri_until, 'l'},
|
|
|
|
|
{"while", s_mri_while, 0},
|
|
|
|
|
{"while.b", s_mri_while, 'b'},
|
|
|
|
|
{"while.w", s_mri_while, 'w'},
|
|
|
|
|
{"while.l", s_mri_while, 'l'},
|
|
|
|
|
{"endw", s_mri_endw, 0},
|
|
|
|
|
|
|
|
|
|
{0, 0, 0}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The mote pseudo ops are put into the opcode table, since they
|
2004-07-11 23:20:30 +08:00
|
|
|
|
don't start with a . they look like opcodes to gas. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2002-06-08 15:37:16 +08:00
|
|
|
|
const pseudo_typeS mote_pseudo_table[] =
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
{"dcl", cons, 4},
|
|
|
|
|
{"dc", cons, 2},
|
|
|
|
|
{"dcw", cons, 2},
|
|
|
|
|
{"dcb", cons, 1},
|
|
|
|
|
|
|
|
|
|
{"dsl", s_space, 4},
|
|
|
|
|
{"ds", s_space, 2},
|
|
|
|
|
{"dsw", s_space, 2},
|
|
|
|
|
{"dsb", s_space, 1},
|
|
|
|
|
|
|
|
|
|
{"xdef", s_globl, 0},
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
{"align", s_align_bytes, 0},
|
|
|
|
|
#else
|
|
|
|
|
{"align", s_align_ptwo, 0},
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef M68KCOFF
|
|
|
|
|
{"sect", obj_coff_section, 0},
|
|
|
|
|
{"section", obj_coff_section, 0},
|
|
|
|
|
#endif
|
|
|
|
|
{0, 0, 0}
|
|
|
|
|
};
|
|
|
|
|
|
2005-03-21 10:25:23 +08:00
|
|
|
|
/* Truncate and sign-extend at 32 bits, so that building on a 64-bit host
|
|
|
|
|
gives identical results to a 32-bit host. */
|
|
|
|
|
#define TRUNC(X) ((valueT) (X) & 0xffffffff)
|
|
|
|
|
#define SEXT(X) ((TRUNC (X) ^ 0x80000000) - 0x80000000)
|
|
|
|
|
|
|
|
|
|
#define issbyte(x) ((valueT) SEXT (x) + 0x80 < 0x100)
|
|
|
|
|
#define isubyte(x) ((valueT) TRUNC (x) < 0x100)
|
|
|
|
|
#define issword(x) ((valueT) SEXT (x) + 0x8000 < 0x10000)
|
|
|
|
|
#define isuword(x) ((valueT) TRUNC (x) < 0x10000)
|
|
|
|
|
|
|
|
|
|
#define isbyte(x) ((valueT) SEXT (x) + 0xff < 0x1ff)
|
|
|
|
|
#define isword(x) ((valueT) SEXT (x) + 0xffff < 0x1ffff)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#define islong(x) (1)
|
|
|
|
|
|
|
|
|
|
static char notend_table[256];
|
|
|
|
|
static char alt_notend_table[256];
|
|
|
|
|
#define notend(s) \
|
|
|
|
|
(! (notend_table[(unsigned char) *s] \
|
|
|
|
|
|| (*s == ':' \
|
|
|
|
|
&& alt_notend_table[(unsigned char) s[1]])))
|
|
|
|
|
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
|
2001-05-22 17:01:55 +08:00
|
|
|
|
/* Return zero if the reference to SYMBOL from within the same segment may
|
|
|
|
|
be relaxed. */
|
|
|
|
|
|
|
|
|
|
/* On an ELF system, we can't relax an externally visible symbol,
|
|
|
|
|
because it may be overridden by a shared library. However, if
|
|
|
|
|
TARGET_OS is "elf", then we presume that we are assembling for an
|
|
|
|
|
embedded system, in which case we don't have to worry about shared
|
|
|
|
|
libraries, and we can relax any external sym. */
|
|
|
|
|
|
|
|
|
|
#define relaxable_symbol(symbol) \
|
2004-01-27 02:09:30 +08:00
|
|
|
|
(!((S_IS_EXTERNAL (symbol) && EXTERN_FORCE_RELOC) \
|
2001-05-22 17:01:55 +08:00
|
|
|
|
|| S_IS_WEAK (symbol)))
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Compute the relocation code for a fixup of SIZE bytes, using pc
|
|
|
|
|
relative relocation if PCREL is non-zero. PIC says whether a special
|
|
|
|
|
pic relocation was requested. */
|
|
|
|
|
|
|
|
|
|
static bfd_reloc_code_real_type
|
2004-07-11 23:20:30 +08:00
|
|
|
|
get_reloc_code (int size, int pcrel, enum pic_relocation pic)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (pic)
|
|
|
|
|
{
|
|
|
|
|
case pic_got_pcrel:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8_GOT_PCREL;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16_GOT_PCREL;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32_GOT_PCREL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_got_off:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8_GOTOFF;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16_GOTOFF;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32_GOTOFF;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_plt_pcrel:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8_PLT_PCREL;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16_PLT_PCREL;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32_PLT_PCREL;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_plt_off:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8_PLTOFF;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16_PLTOFF;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32_PLTOFF;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
case pic_tls_gd:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_68K_TLS_GD8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_68K_TLS_GD16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_68K_TLS_GD32;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_tls_ldm:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDM8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDM16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDM32;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_tls_ldo:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDO8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDO16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDO32;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_tls_ie:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_68K_TLS_IE8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_68K_TLS_IE16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_68K_TLS_IE32;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case pic_tls_le:
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LE8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LE16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_68K_TLS_LE32;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case pic_none:
|
|
|
|
|
if (pcrel)
|
|
|
|
|
{
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8_PCREL;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16_PCREL;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32_PCREL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (size)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
return BFD_RELOC_8;
|
|
|
|
|
case 2:
|
|
|
|
|
return BFD_RELOC_16;
|
|
|
|
|
case 4:
|
|
|
|
|
return BFD_RELOC_32;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (pcrel)
|
|
|
|
|
{
|
|
|
|
|
if (pic == pic_none)
|
|
|
|
|
as_bad (_("Can not do %d byte pc-relative relocation"), size);
|
|
|
|
|
else
|
|
|
|
|
as_bad (_("Can not do %d byte pc-relative pic relocation"), size);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (pic == pic_none)
|
|
|
|
|
as_bad (_("Can not do %d byte relocation"), size);
|
|
|
|
|
else
|
|
|
|
|
as_bad (_("Can not do %d byte pic relocation"), size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return BFD_RELOC_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Here we decide which fixups can be adjusted to make them relative
|
|
|
|
|
to the beginning of the section instead of the symbol. Basically
|
|
|
|
|
we need to make sure that the dynamic relocations are done
|
|
|
|
|
correctly, so in some cases we force the original symbol to be
|
|
|
|
|
used. */
|
|
|
|
|
int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
tc_m68k_fix_adjustable (fixS *fixP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Adjust_reloc_syms doesn't know about the GOT. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (fixP->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case BFD_RELOC_8_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_16_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_32_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_8_GOTOFF:
|
|
|
|
|
case BFD_RELOC_16_GOTOFF:
|
|
|
|
|
case BFD_RELOC_32_GOTOFF:
|
|
|
|
|
case BFD_RELOC_8_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_16_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_32_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_8_PLTOFF:
|
|
|
|
|
case BFD_RELOC_16_PLTOFF:
|
|
|
|
|
case BFD_RELOC_32_PLTOFF:
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
case BFD_RELOC_68K_TLS_GD32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE8:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case BFD_RELOC_VTABLE_INHERIT:
|
|
|
|
|
case BFD_RELOC_VTABLE_ENTRY:
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else /* !OBJ_ELF */
|
|
|
|
|
|
|
|
|
|
#define get_reloc_code(SIZE,PCREL,OTHER) NO_RELOC
|
|
|
|
|
|
2007-05-03 23:55:38 +08:00
|
|
|
|
/* PR gas/3041 Weak symbols are not relaxable
|
|
|
|
|
because they must be treated as extern. */
|
|
|
|
|
#define relaxable_symbol(symbol) (!(S_IS_WEAK (symbol)))
|
2001-05-22 17:01:55 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif /* OBJ_ELF */
|
|
|
|
|
|
|
|
|
|
arelent *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
arelent *reloc;
|
|
|
|
|
bfd_reloc_code_real_type code;
|
|
|
|
|
|
2001-01-26 04:26:17 +08:00
|
|
|
|
/* If the tcbit is set, then this was a fixup of a negative value
|
|
|
|
|
that was never resolved. We do not have a reloc to handle this,
|
|
|
|
|
so just return. We assume that other code will have detected this
|
|
|
|
|
situation and produced a helpful error message, so we just tell the
|
|
|
|
|
user that the reloc cannot be produced. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (fixp->fx_tcbit)
|
2001-01-26 04:26:17 +08:00
|
|
|
|
{
|
|
|
|
|
if (fixp->fx_addsy)
|
2001-06-21 14:12:11 +08:00
|
|
|
|
as_bad_where (fixp->fx_file, fixp->fx_line,
|
|
|
|
|
_("Unable to produce reloc against symbol '%s'"),
|
|
|
|
|
S_GET_NAME (fixp->fx_addsy));
|
2001-01-26 04:26:17 +08:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (fixp->fx_r_type != BFD_RELOC_NONE)
|
|
|
|
|
{
|
|
|
|
|
code = fixp->fx_r_type;
|
|
|
|
|
|
|
|
|
|
/* Since DIFF_EXPR_OK is defined in tc-m68k.h, it is possible
|
|
|
|
|
that fixup_segment converted a non-PC relative reloc into a
|
|
|
|
|
PC relative reloc. In such a case, we need to convert the
|
|
|
|
|
reloc code. */
|
|
|
|
|
if (fixp->fx_pcrel)
|
|
|
|
|
{
|
|
|
|
|
switch (code)
|
|
|
|
|
{
|
|
|
|
|
case BFD_RELOC_8:
|
|
|
|
|
code = BFD_RELOC_8_PCREL;
|
|
|
|
|
break;
|
|
|
|
|
case BFD_RELOC_16:
|
|
|
|
|
code = BFD_RELOC_16_PCREL;
|
|
|
|
|
break;
|
|
|
|
|
case BFD_RELOC_32:
|
|
|
|
|
code = BFD_RELOC_32_PCREL;
|
|
|
|
|
break;
|
|
|
|
|
case BFD_RELOC_8_PCREL:
|
|
|
|
|
case BFD_RELOC_16_PCREL:
|
|
|
|
|
case BFD_RELOC_32_PCREL:
|
|
|
|
|
case BFD_RELOC_8_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_16_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_32_GOT_PCREL:
|
|
|
|
|
case BFD_RELOC_8_GOTOFF:
|
|
|
|
|
case BFD_RELOC_16_GOTOFF:
|
|
|
|
|
case BFD_RELOC_32_GOTOFF:
|
|
|
|
|
case BFD_RELOC_8_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_16_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_32_PLT_PCREL:
|
|
|
|
|
case BFD_RELOC_8_PLTOFF:
|
|
|
|
|
case BFD_RELOC_16_PLTOFF:
|
|
|
|
|
case BFD_RELOC_32_PLTOFF:
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
case BFD_RELOC_68K_TLS_GD32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE8:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
as_bad_where (fixp->fx_file, fixp->fx_line,
|
|
|
|
|
_("Cannot make %s relocation PC relative"),
|
|
|
|
|
bfd_get_reloc_code_name (code));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
#define F(SZ,PCREL) (((SZ) << 1) + (PCREL))
|
|
|
|
|
switch (F (fixp->fx_size, fixp->fx_pcrel))
|
|
|
|
|
{
|
|
|
|
|
#define MAP(SZ,PCREL,TYPE) case F(SZ,PCREL): code = (TYPE); break
|
|
|
|
|
MAP (1, 0, BFD_RELOC_8);
|
|
|
|
|
MAP (2, 0, BFD_RELOC_16);
|
|
|
|
|
MAP (4, 0, BFD_RELOC_32);
|
|
|
|
|
MAP (1, 1, BFD_RELOC_8_PCREL);
|
|
|
|
|
MAP (2, 1, BFD_RELOC_16_PCREL);
|
|
|
|
|
MAP (4, 1, BFD_RELOC_32_PCREL);
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#undef F
|
|
|
|
|
#undef MAP
|
|
|
|
|
|
|
|
|
|
reloc = (arelent *) xmalloc (sizeof (arelent));
|
Add support for storing local symbols in a small structure to save
memory when assembling large files.
* as.h: Don't include struc-symbol.h.
(symbolS): Add typedef.
* symbols.c: Include struc-symbol.h.
(local_hash): New static variable.
(save_symbol_name): New static function, from symbol_create.
(symbol_create): Call save_symbol_name.
(local_symbol_count): New static variable.
(local_symbol_conversion_count): Likewise.
(LOCAL_SYMBOL_CHECK): Define.
(local_symbol_make): New static function.
(local_symbol_convert): New static function.
(colon): Handle local symbols. Create local symbol for local
label name.
(symbol_table_insert): Handle local symbols.
(symbol_find_or_make): Create local symbol for local label name.
(symbol_find_base): Check for local symbol.
(symbol_append, symbol_insert): Check for local symbols.
(symbol_clear_list_pointers, symbol_remove): Likewise.
(verify_symbol_chain): Likewise.
(copy_symbol_attributes): Likewise.
(resolve_symbol_value): Handle local symbols.
(resolve_local_symbol): New static function.
(resolve_local_symbol_values): New function.
(S_GET_VALUE, S_SET_VALUE): Handle local symbols.
(S_IS_FUNCTION, S_IS_EXTERNAL, S_IS_WEAK, S_IS_COMMON): Likewise.
(S_IS_DEFINED, S_IS_DEBUG, S_IS_LOCAL, S_GET_NAME): Likewise.
(S_GET_SEGMENT, S_SET_SEGMENT, S_SET_EXTERNAL): Likewise.
(S_CLEAR_EXTERNAL, S_SET_WEAK, S_SET_NAME): Likewise.
(symbol_previous, symbol_next): New functions.
(symbol_get_value_expression): Likewise.
(symbol_set_value_expression): Likewise.
(symbol_set_frag, symbol_get_frag): Likewise.
(symbol_mark_used, symbol_clear_used, symbol_used_p): Likewise.
(symbol_mark_used_in_reloc): Likewise.
(symbol_clear_used_in_reloc, symbol_used_in_reloc_p): Likewise.
(symbol_mark_mri_common, symbol_clear_mri_common): Likewise.
(symbol_mri_common_p): Likewise.
(symbol_mark_written, symbol_clear_written): Likewise.
(symbol_written_p): Likewise.
(symbol_mark_resolved, symbol_resolved_p): Likewise.
(symbol_section_p, symbol_equated_p): Likewise.
(symbol_constant_p): Likewise.
(symbol_get_bfdsym, symbol_set_bfdsym): Likewise.
(symbol_get_obj, symbol_set_obj): Likewise.
(symbol_get_tc, symbol_set_tc): Likewise.
(symbol_begin): Initialize local_hash.
(print_symbol_value_1): Handle local symbols.
(symbol_print_statistics): Print local symbol statistics.
* symbols.h: Include "struc-symbol.h" if not BFD_ASSEMBLER.
Declare new symbols.c functions. Move many declarations here from
struc-symbol.h.
(SYMBOLS_NEED_BACKPOINTERS): Define if needed.
* struc-symbol.h (SYMBOLS_NEED_BACKPOINTERS): Don't set.
(struct symbol): Move bsym to make it clearly the first field.
Remove TARGET_SYMBOL_FIELDS.
(symbolS): Don't typedef.
(struct broken_word): Remove.
(N_TYPE_seg, seg_N_TYPE): Move to symbol.h.
(SEGMENT_TO_SYMBOL_TYPE, N_REGISTER): Likewise.
(symbol_clear_list_pointers): Likewise.
(symbol_insert, symbol_remove): Likewise.
(symbol_previous, symbol_append): Likewise.
(verify_symbol_chain, verify_symbol_chain_2): Likewise.
(struct local_symbol): Define.
(local_symbol_converted_p, local_symbol_mark_converted): Define.
(local_symbol_resolved_p, local_symbol_mark_resolved): Define.
(local_symbol_get_frag, local_symbol_set_frag): Define.
(local_symbol_get_real_symbol): Define.
(local_symbol_set_real_symbol): Define.
Define.
* write.c (write_object_file): Call resolve_local_symbol_values.
* config/obj-ecoff.h (OBJ_SYMFIELD_TYPE): Define.
(TARGET_SYMBOL_FIELDS): Don't define.
* config/obj-elf.h (OBJ_SYMFIELD_TYPE): Add local field. If
ECOFF_DEBUGGING, add ECOFF fields.
(ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define.
* config/obj-multi.h (struct elf_obj_sy): Add local field. If
ECOFF_DEBUGGING, add ECOFF fields.
(ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define.
(ECOFF_DEBUG_TARGET_SYMBOL_FIELDS): Don't define.
* config/tc-mcore.h: Don't include struc-symbol.h.
(TARGET_SYMBOL_FIELDS): Don't define.
(struct mcore_tc_sy): Define.
(TC_SYMFIELD_TYPE): Define.
* Many files: Use symbolS instead of struct symbol. Use new
accessor functions rather than referring to symbolS fields
directly.
* read.c (s_mri_common): Don't add in value of line_label.
* config/tc-mips.c (md_apply_fix): Correct parenthesization when
checking for SEC_LINK_ONCE.
* config/tc-sh.h (sh_fix_adjustable): Declare.
1999-06-03 08:29:48 +08:00
|
|
|
|
reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
|
|
|
|
|
*reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
|
|
|
|
|
#ifndef OBJ_ELF
|
|
|
|
|
if (fixp->fx_pcrel)
|
|
|
|
|
reloc->addend = fixp->fx_addnumber;
|
2007-05-03 23:55:38 +08:00
|
|
|
|
else if (OUTPUT_FLAVOR == bfd_target_aout_flavour
|
|
|
|
|
&& fixp->fx_addsy
|
|
|
|
|
&& S_IS_WEAK (fixp->fx_addsy)
|
|
|
|
|
&& ! bfd_is_und_section (S_GET_SEGMENT (fixp->fx_addsy)))
|
2009-10-13 16:55:31 +08:00
|
|
|
|
{
|
|
|
|
|
/* PR gas/3041 References to weak symbols must be treated as extern
|
|
|
|
|
in order to be overridable by the linker, even if they are defined
|
|
|
|
|
in the same object file. So the original addend must be written
|
|
|
|
|
"as is" into the output section without further processing.
|
|
|
|
|
The addend value must be hacked here in order to force
|
|
|
|
|
bfd_install_relocation() to write the original value into the
|
|
|
|
|
output section.
|
|
|
|
|
1) MD_APPLY_SYM_VALUE() is set to 1 for m68k/a.out, so the symbol
|
|
|
|
|
value has already been added to the addend in fixup_segment(). We
|
|
|
|
|
have to remove it.
|
|
|
|
|
2) bfd_install_relocation() will incorrectly treat this symbol as
|
|
|
|
|
resolved, so it will write the symbol value plus its addend and
|
|
|
|
|
section VMA. As a workaround we can tweak the addend value here in
|
|
|
|
|
order to get the original value in the section after the call to
|
|
|
|
|
bfd_install_relocation(). */
|
|
|
|
|
reloc->addend = fixp->fx_addnumber
|
|
|
|
|
/* Fix because of MD_APPLY_SYM_VALUE() */
|
|
|
|
|
- S_GET_VALUE (fixp->fx_addsy)
|
|
|
|
|
/* Fix for bfd_install_relocation() */
|
|
|
|
|
- (S_GET_VALUE (fixp->fx_addsy)
|
|
|
|
|
+ S_GET_SEGMENT (fixp->fx_addsy)->vma);
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
|
|
|
|
reloc->addend = 0;
|
|
|
|
|
#else
|
|
|
|
|
if (!fixp->fx_pcrel)
|
|
|
|
|
reloc->addend = fixp->fx_addnumber;
|
|
|
|
|
else
|
|
|
|
|
reloc->addend = (section->vma
|
2001-05-09 02:03:27 +08:00
|
|
|
|
/* Explicit sign extension in case char is
|
|
|
|
|
unsigned. */
|
|
|
|
|
+ ((fixp->fx_pcrel_adjust & 0xff) ^ 0x80) - 0x80
|
1999-05-03 15:29:11 +08:00
|
|
|
|
+ fixp->fx_addnumber
|
|
|
|
|
+ md_pcrel_from (fixp));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
reloc->howto = bfd_reloc_type_lookup (stdoutput, code);
|
* gas/app, gas/as.c, gas/as.h, gas/atof-generic.c, gas/cgen.c,
gas/config/atof-ieee.c, gas/config/obj-aout.c,
gas/config/obj-coff.c, gas/config/obj-ecoff.c,
gas/config/obj-elf.c, gas/config/obj-som.c, gas/config/tc-alpha.c,
gas/config/tc-arc.c, gas/config/tc-arm.c, gas/config/tc-cr16.c,
gas/config/tc-cris.c, gas/config/tc-crx.c, gas/config/tc-d30v.c,
gas/config/tc-dlx.c, gas/config/tc-hppa.c, gas/config/tc-i370.c,
gas/config/tc-i386-intel.c, gas/config/tc-i386.c,
gas/config/tc-i860.c, gas/config/tc-i960.c, gas/config/tc-ia64.c,
gas/config/tc-iq2000.c, gas/config/tc-m32c.c,
gas/config/tc-m32r.c, gas/config/tc-m68hc11.c,
gas/config/tc-m68k.c, gas/config/tc-maxq.c, gas/config/tc-mcore.c,
gas/config/tc-mep.c, gas/config/tc-mips.c, gas/config/tc-mmix.c,
gas/config/tc-mn10300.c, gas/config/tc-moxie.c,
gas/config/tc-ns32k.c, gas/config/tc-pj.c, gas/config/tc-ppc.c,
gas/config/tc-s390.c, gas/config/tc-score.c,
gas/config/tc-score7.c, gas/config/tc-sh.c, gas/config/tc-sparc.c,
gas/config/tc-spu.c, gas/config/tc-tic30.c, gas/config/tc-vax.c,
gas/config/tc-xtensa.c, gas/config/xtensa-relax.c,
gas/dw2gencfi.c, gas/dwarf2dbg.c, gas/ehopt.c, gas/expr.c,
gas/frags.c, gas/input-file.c, gas/read.c, gas/sb.c,
gas/subsegs.c, gas/symbols.c, gas/write.c: Change the name of the
gas macro `assert' to `gas_assert'.
2009-06-23 01:56:02 +08:00
|
|
|
|
gas_assert (reloc->howto != 0);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
return reloc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle of the OPCODE hash table. NULL means any use before
|
|
|
|
|
m68k_ip_begin() will crash. */
|
|
|
|
|
static struct hash_control *op_hash;
|
|
|
|
|
|
|
|
|
|
/* Assemble an m68k instruction. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_ip (char *instring)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
register char *p;
|
|
|
|
|
register struct m68k_op *opP;
|
|
|
|
|
register const struct m68k_incant *opcode;
|
|
|
|
|
register const char *s;
|
|
|
|
|
register int tmpreg = 0, baseo = 0, outro = 0, nextword;
|
|
|
|
|
char *pdot, *pdotmove;
|
|
|
|
|
enum m68k_size siz1, siz2;
|
|
|
|
|
char c;
|
|
|
|
|
int losing;
|
|
|
|
|
int opsfound;
|
2005-06-09 01:02:54 +08:00
|
|
|
|
struct m68k_op operands_backup[6];
|
1999-05-03 15:29:11 +08:00
|
|
|
|
LITTLENUM_TYPE words[6];
|
|
|
|
|
LITTLENUM_TYPE *wordp;
|
|
|
|
|
unsigned long ok_arch = 0;
|
|
|
|
|
|
|
|
|
|
if (*instring == ' ')
|
2003-10-17 18:50:27 +08:00
|
|
|
|
instring++; /* Skip leading whitespace. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Scan up to end of operation-code, which MUST end in end-of-string
|
2000-09-12 03:49:46 +08:00
|
|
|
|
or exactly 1 space. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
pdot = 0;
|
|
|
|
|
for (p = instring; *p != '\0'; p++)
|
|
|
|
|
{
|
|
|
|
|
if (*p == ' ')
|
|
|
|
|
break;
|
|
|
|
|
if (*p == '.')
|
|
|
|
|
pdot = p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (p == instring)
|
|
|
|
|
{
|
|
|
|
|
the_ins.error = _("No operator");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* p now points to the end of the opcode name, probably whitespace.
|
|
|
|
|
Make sure the name is null terminated by clobbering the
|
|
|
|
|
whitespace, look it up in the hash table, then fix it back.
|
|
|
|
|
Remove a dot, first, since the opcode tables have none. */
|
|
|
|
|
if (pdot != NULL)
|
|
|
|
|
{
|
|
|
|
|
for (pdotmove = pdot; pdotmove < p; pdotmove++)
|
|
|
|
|
*pdotmove = pdotmove[1];
|
|
|
|
|
p--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c = *p;
|
|
|
|
|
*p = '\0';
|
|
|
|
|
opcode = (const struct m68k_incant *) hash_find (op_hash, instring);
|
|
|
|
|
*p = c;
|
|
|
|
|
|
|
|
|
|
if (pdot != NULL)
|
|
|
|
|
{
|
|
|
|
|
for (pdotmove = p; pdotmove > pdot; pdotmove--)
|
|
|
|
|
*pdotmove = pdotmove[-1];
|
|
|
|
|
*pdot = '.';
|
|
|
|
|
++p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opcode == NULL)
|
|
|
|
|
{
|
|
|
|
|
the_ins.error = _("Unknown operator");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Found a legitimate opcode, start matching operands. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
while (*p == ' ')
|
|
|
|
|
++p;
|
|
|
|
|
|
|
|
|
|
if (opcode->m_operands == 0)
|
|
|
|
|
{
|
|
|
|
|
char *old = input_line_pointer;
|
|
|
|
|
*old = '\n';
|
|
|
|
|
input_line_pointer = p;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Ahh - it's a motorola style psuedo op. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
mote_pseudo_table[opcode->m_opnum].poc_handler
|
|
|
|
|
(mote_pseudo_table[opcode->m_opnum].poc_val);
|
|
|
|
|
input_line_pointer = old;
|
|
|
|
|
*old = 0;
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flag_mri && opcode->m_opnum == 0)
|
|
|
|
|
{
|
|
|
|
|
/* In MRI mode, random garbage is allowed after an instruction
|
|
|
|
|
which accepts no operands. */
|
|
|
|
|
the_ins.args = opcode->m_operands;
|
|
|
|
|
the_ins.numargs = opcode->m_opnum;
|
|
|
|
|
the_ins.numo = opcode->m_codenum;
|
|
|
|
|
the_ins.opcode[0] = getone (opcode);
|
|
|
|
|
the_ins.opcode[1] = gettwo (opcode);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (opP = &the_ins.operands[0]; *p; opP++)
|
|
|
|
|
{
|
|
|
|
|
p = crack_operand (p, opP);
|
|
|
|
|
|
|
|
|
|
if (opP->error)
|
|
|
|
|
{
|
|
|
|
|
the_ins.error = opP->error;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opsfound = opP - &the_ins.operands[0];
|
|
|
|
|
|
|
|
|
|
/* This ugly hack is to support the floating pt opcodes in their
|
|
|
|
|
standard form. Essentially, we fake a first enty of type COP#1 */
|
|
|
|
|
if (opcode->m_operands[0] == 'I')
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
for (n = opsfound; n > 0; --n)
|
|
|
|
|
the_ins.operands[n] = the_ins.operands[n - 1];
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
memset (&the_ins.operands[0], '\0', sizeof (the_ins.operands[0]));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
the_ins.operands[0].mode = CONTROL;
|
|
|
|
|
the_ins.operands[0].reg = m68k_float_copnum;
|
|
|
|
|
opsfound++;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* We've got the operands. Find an opcode that'll accept them. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (losing = 0;;)
|
|
|
|
|
{
|
|
|
|
|
/* If we didn't get the right number of ops, or we have no
|
2000-09-12 03:49:46 +08:00
|
|
|
|
common model with this pattern then reject this pattern. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
ok_arch |= opcode->m_arch;
|
|
|
|
|
if (opsfound != opcode->m_opnum
|
|
|
|
|
|| ((opcode->m_arch & current_architecture) == 0))
|
|
|
|
|
++losing;
|
|
|
|
|
else
|
|
|
|
|
{
|
2005-06-09 01:02:54 +08:00
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Make a copy of the operands of this insn so that
|
|
|
|
|
we can modify them safely, should we want to. */
|
* gas/app, gas/as.c, gas/as.h, gas/atof-generic.c, gas/cgen.c,
gas/config/atof-ieee.c, gas/config/obj-aout.c,
gas/config/obj-coff.c, gas/config/obj-ecoff.c,
gas/config/obj-elf.c, gas/config/obj-som.c, gas/config/tc-alpha.c,
gas/config/tc-arc.c, gas/config/tc-arm.c, gas/config/tc-cr16.c,
gas/config/tc-cris.c, gas/config/tc-crx.c, gas/config/tc-d30v.c,
gas/config/tc-dlx.c, gas/config/tc-hppa.c, gas/config/tc-i370.c,
gas/config/tc-i386-intel.c, gas/config/tc-i386.c,
gas/config/tc-i860.c, gas/config/tc-i960.c, gas/config/tc-ia64.c,
gas/config/tc-iq2000.c, gas/config/tc-m32c.c,
gas/config/tc-m32r.c, gas/config/tc-m68hc11.c,
gas/config/tc-m68k.c, gas/config/tc-maxq.c, gas/config/tc-mcore.c,
gas/config/tc-mep.c, gas/config/tc-mips.c, gas/config/tc-mmix.c,
gas/config/tc-mn10300.c, gas/config/tc-moxie.c,
gas/config/tc-ns32k.c, gas/config/tc-pj.c, gas/config/tc-ppc.c,
gas/config/tc-s390.c, gas/config/tc-score.c,
gas/config/tc-score7.c, gas/config/tc-sh.c, gas/config/tc-sparc.c,
gas/config/tc-spu.c, gas/config/tc-tic30.c, gas/config/tc-vax.c,
gas/config/tc-xtensa.c, gas/config/xtensa-relax.c,
gas/dw2gencfi.c, gas/dwarf2dbg.c, gas/ehopt.c, gas/expr.c,
gas/frags.c, gas/input-file.c, gas/read.c, gas/sb.c,
gas/subsegs.c, gas/symbols.c, gas/write.c: Change the name of the
gas macro `assert' to `gas_assert'.
2009-06-23 01:56:02 +08:00
|
|
|
|
gas_assert (opsfound <= (int) ARRAY_SIZE (operands_backup));
|
2005-06-09 01:02:54 +08:00
|
|
|
|
for (i = 0; i < opsfound; i++)
|
|
|
|
|
operands_backup[i] = the_ins.operands[i];
|
|
|
|
|
|
|
|
|
|
for (s = opcode->m_operands, opP = &operands_backup[0];
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s && !losing;
|
|
|
|
|
s += 2, opP++)
|
|
|
|
|
{
|
|
|
|
|
/* Warning: this switch is huge! */
|
|
|
|
|
/* I've tried to organize the cases into this order:
|
|
|
|
|
non-alpha first, then alpha by letter. Lower-case
|
|
|
|
|
goes directly before uppercase counterpart. */
|
|
|
|
|
/* Code with multiple case ...: gets sorted by the lowest
|
|
|
|
|
case ... it belongs to. I hope this makes sense. */
|
|
|
|
|
switch (*s)
|
|
|
|
|
{
|
|
|
|
|
case '!':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case IMMED:
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '<':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '>':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case AINC:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
case ABSL:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (opP->reg == PC
|
|
|
|
|
|| opP->reg == ZPC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'm':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case AINDR:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
}
|
2002-05-08 09:54:04 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case 'n':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DISP:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
}
|
2002-05-08 09:54:04 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case BASE:
|
|
|
|
|
case ABSL:
|
|
|
|
|
case IMMED:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
}
|
2002-05-08 09:54:04 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case 'p':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case AINDR:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
break;
|
|
|
|
|
case DISP:
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
2002-05-08 09:54:04 +08:00
|
|
|
|
losing++;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
}
|
2002-05-08 09:54:04 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case 'q':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AINDR:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
break;
|
|
|
|
|
case DISP:
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
2002-05-08 09:54:04 +08:00
|
|
|
|
losing++;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2002-05-08 09:54:04 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case 'v':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AINDR:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case ABSL:
|
|
|
|
|
break;
|
|
|
|
|
case DISP:
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
2002-05-08 09:54:04 +08:00
|
|
|
|
losing++;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '#':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == 'b'
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| ! isbyte (opP->disp.exp.X_add_number)))
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == 'B'
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| ! issbyte (opP->disp.exp.X_add_number)))
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == 'w'
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| ! isword (opP->disp.exp.X_add_number)))
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == 'W'
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| ! issword (opP->disp.exp.X_add_number)))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '^':
|
|
|
|
|
case 'T':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '$':
|
|
|
|
|
if (opP->mode == AREG
|
|
|
|
|
|| opP->mode == CONTROL
|
|
|
|
|
|| opP->mode == FPREG
|
|
|
|
|
|| opP->mode == IMMED
|
|
|
|
|
|| opP->mode == REGLST
|
|
|
|
|
|| (opP->mode != ABSL
|
|
|
|
|
&& (opP->reg == PC
|
|
|
|
|
|| opP->reg == ZPC)))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
|
if (opP->mode == CONTROL
|
|
|
|
|
|| opP->mode == FPREG
|
|
|
|
|
|| opP->mode == REGLST
|
|
|
|
|
|| opP->mode == IMMED
|
|
|
|
|
|| (opP->mode != ABSL
|
|
|
|
|
&& (opP->reg == PC
|
|
|
|
|
|| opP->reg == ZPC)))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '&':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
case ABSL:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (opP->reg == PC
|
|
|
|
|
|| opP->reg == ZPC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '*':
|
|
|
|
|
if (opP->mode == CONTROL
|
|
|
|
|
|| opP->mode == FPREG
|
|
|
|
|
|| opP->mode == REGLST)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '+':
|
|
|
|
|
if (opP->mode != AINC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '-':
|
|
|
|
|
if (opP->mode != ADEC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '/':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case AREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ';':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case AREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '?':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case AREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case AINC:
|
|
|
|
|
case ADEC:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
case ABSL:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '@':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case AREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '~': /* For now! (JF FOO is this right?) */
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
case AREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case IMMED:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
case ABSL:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (opP->reg == PC
|
|
|
|
|
|| opP->reg == ZPC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '3':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (opP->reg != TT0 && opP->reg != TT1))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'A':
|
|
|
|
|
if (opP->mode != AREG)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'a':
|
|
|
|
|
if (opP->mode != AINDR)
|
|
|
|
|
++losing;
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case '4':
|
|
|
|
|
if (opP->mode != AINDR && opP->mode != AINC && opP->mode != ADEC
|
|
|
|
|
&& (opP->mode != DISP
|
|
|
|
|
|| opP->reg < ADDR0
|
|
|
|
|
|| opP->reg > ADDR7))
|
|
|
|
|
++losing;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'B': /* FOO */
|
|
|
|
|
if (opP->mode != ABSL
|
|
|
|
|
|| (flag_long_jumps
|
|
|
|
|
&& strncmp (instring, "jbsr", 4) == 0))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'b':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case IMMED:
|
|
|
|
|
case ABSL:
|
|
|
|
|
case AREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case POST:
|
|
|
|
|
case PRE:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'C':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != CCR)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
|
if (opP->mode != DISP
|
|
|
|
|
|| opP->reg < ADDR0
|
|
|
|
|
|| opP->reg > ADDR7)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'D':
|
|
|
|
|
if (opP->mode != DREG)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'E':
|
|
|
|
|
if (opP->reg != ACC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'e':
|
|
|
|
|
if (opP->reg != ACC && opP->reg != ACC1
|
|
|
|
|
&& opP->reg != ACC2 && opP->reg != ACC3)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'F':
|
|
|
|
|
if (opP->mode != FPREG)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'G':
|
|
|
|
|
if (opP->reg != MACSR)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'g':
|
|
|
|
|
if (opP->reg != ACCEXT01 && opP->reg != ACCEXT23)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'H':
|
|
|
|
|
if (opP->reg != MASK)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'I':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| opP->reg < COP0
|
|
|
|
|
|| opP->reg > COP7)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'i':
|
|
|
|
|
if (opP->mode != LSH && opP->mode != RSH)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'J':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| opP->reg < USP
|
2006-03-06 21:42:05 +08:00
|
|
|
|
|| opP->reg > last_movec_reg
|
|
|
|
|
|| !control_regs)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
losing++;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const enum m68k_register *rp;
|
2006-03-06 21:42:05 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (rp = control_regs; *rp; rp++)
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
{
|
|
|
|
|
if (*rp == opP->reg)
|
|
|
|
|
break;
|
|
|
|
|
/* In most CPUs RAMBAR refers to control reg
|
|
|
|
|
c05 (RAMBAR1), but a few CPUs have it
|
|
|
|
|
refer to c04 (RAMBAR0). */
|
|
|
|
|
else if (*rp == RAMBAR_ALT && opP->reg == RAMBAR)
|
|
|
|
|
{
|
|
|
|
|
opP->reg = RAMBAR_ALT;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (*rp == 0)
|
|
|
|
|
losing++;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'k':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'l':
|
|
|
|
|
case 'L':
|
|
|
|
|
if (opP->mode == DREG
|
|
|
|
|
|| opP->mode == AREG
|
|
|
|
|
|| opP->mode == FPREG)
|
|
|
|
|
{
|
|
|
|
|
if (s[1] == '8')
|
|
|
|
|
losing++;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case DREG:
|
|
|
|
|
opP->mask = 1 << (opP->reg - DATA0);
|
|
|
|
|
break;
|
|
|
|
|
case AREG:
|
|
|
|
|
opP->mask = 1 << (opP->reg - ADDR0 + 8);
|
|
|
|
|
break;
|
|
|
|
|
case FPREG:
|
|
|
|
|
opP->mask = 1 << (opP->reg - FP0 + 16);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
opP->mode = REGLST;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (opP->mode == CONTROL)
|
|
|
|
|
{
|
|
|
|
|
if (s[1] != '8')
|
|
|
|
|
losing++;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case FPI:
|
|
|
|
|
opP->mask = 1 << 24;
|
|
|
|
|
break;
|
|
|
|
|
case FPS:
|
|
|
|
|
opP->mask = 1 << 25;
|
|
|
|
|
break;
|
|
|
|
|
case FPC:
|
|
|
|
|
opP->mask = 1 << 26;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
opP->mode = REGLST;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (opP->mode != REGLST)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == '8' && (opP->mask & 0x0ffffff) != 0)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (s[1] == '3' && (opP->mask & 0x7000000) != 0)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'M':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| ! issbyte (opP->disp.exp.X_add_number))
|
|
|
|
|
losing++;
|
|
|
|
|
else if (! m68k_quick
|
|
|
|
|
&& instring[3] != 'q'
|
|
|
|
|
&& instring[4] != 'q')
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'O':
|
|
|
|
|
if (opP->mode != DREG
|
|
|
|
|
&& opP->mode != IMMED
|
|
|
|
|
&& opP->mode != ABSL)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'Q':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
2005-03-21 10:25:23 +08:00
|
|
|
|
|| TRUNC (opP->disp.exp.X_add_number) - 1 > 7)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
losing++;
|
|
|
|
|
else if (! m68k_quick
|
|
|
|
|
&& (strncmp (instring, "add", 3) == 0
|
|
|
|
|
|| strncmp (instring, "sub", 3) == 0)
|
|
|
|
|
&& instring[3] != 'q')
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'R':
|
|
|
|
|
if (opP->mode != DREG && opP->mode != AREG)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
|
if (opP->mode != AINDR
|
|
|
|
|
&& (opP->mode != BASE
|
|
|
|
|
|| (opP->reg != 0
|
|
|
|
|
&& opP->reg != ZADDR0)
|
|
|
|
|
|| opP->disp.exp.X_op != O_absent
|
|
|
|
|
|| ((opP->index.reg < DATA0
|
|
|
|
|
|| opP->index.reg > DATA7)
|
|
|
|
|
&& (opP->index.reg < ADDR0
|
|
|
|
|
|| opP->index.reg > ADDR7))
|
|
|
|
|
|| opP->index.size != SIZE_UNSPEC
|
|
|
|
|
|| opP->index.scale != 1))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| ! (opP->reg == FPI
|
|
|
|
|
|| opP->reg == FPS
|
|
|
|
|
|| opP->reg == FPC))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'S':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != SR)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 't':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
2005-03-21 10:25:23 +08:00
|
|
|
|
|| TRUNC (opP->disp.exp.X_add_number) > 7)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'U':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != USP)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'x':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
2005-03-21 10:25:23 +08:00
|
|
|
|
|| (TRUNC (opP->disp.exp.X_add_number) != 0xffffffff
|
|
|
|
|
&& TRUNC (opP->disp.exp.X_add_number) - 1 > 6))
|
2003-10-21 21:28:59 +08:00
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2007-07-03 15:54:19 +08:00
|
|
|
|
case 'j':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| TRUNC (opP->disp.exp.X_add_number) - 1 > 7)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'K':
|
|
|
|
|
if (opP->mode != IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
else if (opP->disp.exp.X_op != O_constant
|
|
|
|
|
|| TRUNC (opP->disp.exp.X_add_number) > 511)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* JF these are out of order. We could put them
|
|
|
|
|
in order if we were willing to put up with
|
|
|
|
|
bunches of #ifdef m68851s in the code.
|
|
|
|
|
|
|
|
|
|
Don't forget that you need these operands
|
|
|
|
|
to use 68030 MMU instructions. */
|
|
|
|
|
#ifndef NO_68851
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Memory addressing mode used by pflushr. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case '|':
|
|
|
|
|
if (opP->mode == CONTROL
|
|
|
|
|
|| opP->mode == FPREG
|
|
|
|
|
|| opP->mode == DREG
|
|
|
|
|
|| opP->mode == AREG
|
|
|
|
|
|| opP->mode == REGLST)
|
|
|
|
|
losing++;
|
|
|
|
|
/* We should accept immediate operands, but they
|
|
|
|
|
supposedly have to be quad word, and we don't
|
|
|
|
|
handle that. I would like to see what a Motorola
|
|
|
|
|
assembler does before doing something here. */
|
|
|
|
|
if (opP->mode == IMMED)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (opP->reg != SFC && opP->reg != DFC))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '0':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != TC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '1':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != AC)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '2':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (opP->reg != CAL
|
|
|
|
|
&& opP->reg != VAL
|
|
|
|
|
&& opP->reg != SCC))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'V':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| opP->reg != VAL)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'W':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (opP->reg != DRP
|
|
|
|
|
&& opP->reg != SRP
|
|
|
|
|
&& opP->reg != CRP))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'w':
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case IMMED:
|
|
|
|
|
case ABSL:
|
|
|
|
|
case AREG:
|
|
|
|
|
case DREG:
|
|
|
|
|
case FPREG:
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case POST:
|
|
|
|
|
case PRE:
|
|
|
|
|
case REGLST:
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'X':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (!(opP->reg >= BAD && opP->reg <= BAD + 7)
|
|
|
|
|
&& !(opP->reg >= BAC && opP->reg <= BAC + 7)))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'Y':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != PSR)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'Z':
|
|
|
|
|
if (opP->mode != CONTROL || opP->reg != PCSR)
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
case 'c':
|
|
|
|
|
if (opP->mode != CONTROL
|
|
|
|
|
|| (opP->reg != NC
|
|
|
|
|
&& opP->reg != IC
|
|
|
|
|
&& opP->reg != DC
|
|
|
|
|
&& opP->reg != BC))
|
2003-10-17 18:50:27 +08:00
|
|
|
|
losing++;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '_':
|
|
|
|
|
if (opP->mode != ABSL)
|
|
|
|
|
++losing;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'u':
|
|
|
|
|
if (opP->reg < DATA0L || opP->reg > ADDR7U)
|
|
|
|
|
losing++;
|
|
|
|
|
/* FIXME: kludge instead of fixing parser:
|
|
|
|
|
upper/lower registers are *not* CONTROL
|
2000-09-12 03:49:46 +08:00
|
|
|
|
registers, but ordinary ones. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
if ((opP->reg >= DATA0L && opP->reg <= DATA7L)
|
|
|
|
|
|| (opP->reg >= DATA0U && opP->reg <= DATA7U))
|
|
|
|
|
opP->mode = DREG;
|
|
|
|
|
else
|
|
|
|
|
opP->mode = AREG;
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'y':
|
|
|
|
|
if (!(opP->mode == AINDR
|
2004-07-11 23:20:30 +08:00
|
|
|
|
|| (opP->mode == DISP
|
|
|
|
|
&& !(opP->reg == PC || opP->reg == ZPC))))
|
2003-10-21 21:28:59 +08:00
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'z':
|
|
|
|
|
if (!(opP->mode == AINDR || opP->mode == DISP))
|
|
|
|
|
losing++;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
abort ();
|
2003-10-17 18:50:27 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (losing)
|
|
|
|
|
break;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
}
|
2005-06-09 01:02:54 +08:00
|
|
|
|
|
|
|
|
|
/* Since we have found the correct instruction, copy
|
|
|
|
|
in the modifications that we may have made. */
|
|
|
|
|
if (!losing)
|
|
|
|
|
for (i = 0; i < opsfound; i++)
|
|
|
|
|
the_ins.operands[i] = operands_backup[i];
|
2003-10-17 18:50:27 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (!losing)
|
2003-10-17 18:50:27 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
opcode = opcode->m_next;
|
|
|
|
|
|
|
|
|
|
if (!opcode)
|
|
|
|
|
{
|
|
|
|
|
if (ok_arch
|
|
|
|
|
&& !(ok_arch & current_architecture))
|
|
|
|
|
{
|
2006-03-28 15:21:49 +08:00
|
|
|
|
const struct m68k_cpu *cpu;
|
|
|
|
|
int any = 0;
|
|
|
|
|
size_t space = 400;
|
|
|
|
|
char *buf = xmalloc (space + 1);
|
|
|
|
|
size_t len;
|
|
|
|
|
int paren = 1;
|
|
|
|
|
|
|
|
|
|
the_ins.error = buf;
|
|
|
|
|
/* Make sure there's a NUL at the end of the buffer -- strncpy
|
2007-10-18 21:03:12 +08:00
|
|
|
|
won't write one when it runs out of buffer. */
|
2006-03-28 15:21:49 +08:00
|
|
|
|
buf[space] = 0;
|
|
|
|
|
#define APPEND(STRING) \
|
|
|
|
|
(strncpy (buf, STRING, space), len = strlen (buf), buf += len, space -= len)
|
|
|
|
|
|
|
|
|
|
APPEND (_("invalid instruction for this architecture; needs "));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (ok_arch)
|
|
|
|
|
{
|
2004-05-05 22:33:14 +08:00
|
|
|
|
case mcfisa_a:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire ISA_A");
|
2004-05-05 22:33:14 +08:00
|
|
|
|
break;
|
|
|
|
|
case mcfhwdiv:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire ");
|
|
|
|
|
APPEND (_("hardware divide"));
|
2004-05-05 22:33:14 +08:00
|
|
|
|
break;
|
|
|
|
|
case mcfisa_aa:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire ISA_A+");
|
2004-05-05 22:33:14 +08:00
|
|
|
|
break;
|
|
|
|
|
case mcfisa_b:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire ISA_B");
|
2004-05-05 22:33:14 +08:00
|
|
|
|
break;
|
2007-09-12 00:07:50 +08:00
|
|
|
|
case mcfisa_c:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire ISA_C");
|
2007-09-12 00:07:50 +08:00
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case cfloat:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("ColdFire fpu");
|
2003-10-21 21:28:59 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case mfloat:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("M68K fpu");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case mmmu:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("M68K mmu");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case m68020up:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("68020 ");
|
|
|
|
|
APPEND (_("or higher"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case m68000up:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("68000 ");
|
|
|
|
|
APPEND (_("or higher"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case m68010up:
|
2007-10-18 21:03:12 +08:00
|
|
|
|
APPEND ("68010 ");
|
|
|
|
|
APPEND (_("or higher"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
2006-03-28 15:21:49 +08:00
|
|
|
|
paren = 0;
|
|
|
|
|
}
|
|
|
|
|
if (paren)
|
|
|
|
|
APPEND (" (");
|
2004-05-05 22:33:14 +08:00
|
|
|
|
|
2006-03-28 15:21:49 +08:00
|
|
|
|
for (cpu = m68k_cpus; cpu->name; cpu++)
|
|
|
|
|
if (!cpu->alias && (cpu->arch & ok_arch))
|
|
|
|
|
{
|
|
|
|
|
const struct m68k_cpu *alias;
|
2006-11-16 15:22:25 +08:00
|
|
|
|
int seen_master = 0;
|
|
|
|
|
|
2006-03-28 15:21:49 +08:00
|
|
|
|
if (any)
|
|
|
|
|
APPEND (", ");
|
|
|
|
|
any = 0;
|
|
|
|
|
APPEND (cpu->name);
|
2006-11-16 15:22:25 +08:00
|
|
|
|
for (alias = cpu; alias != m68k_cpus; alias--)
|
|
|
|
|
if (alias[-1].alias >= 0)
|
|
|
|
|
break;
|
|
|
|
|
for (; !seen_master || alias->alias > 0; alias++)
|
2006-03-28 15:21:49 +08:00
|
|
|
|
{
|
2006-11-16 15:22:25 +08:00
|
|
|
|
if (!alias->alias)
|
|
|
|
|
seen_master = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (any)
|
|
|
|
|
APPEND (", ");
|
|
|
|
|
else
|
|
|
|
|
APPEND (" [");
|
|
|
|
|
APPEND (alias->name);
|
|
|
|
|
any = 1;
|
|
|
|
|
}
|
2006-03-28 15:21:49 +08:00
|
|
|
|
}
|
2006-11-16 15:22:25 +08:00
|
|
|
|
if (any)
|
|
|
|
|
APPEND ("]");
|
2006-03-28 15:21:49 +08:00
|
|
|
|
any = 1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2006-03-28 15:21:49 +08:00
|
|
|
|
if (paren)
|
|
|
|
|
APPEND (")");
|
|
|
|
|
#undef APPEND
|
|
|
|
|
if (!space)
|
|
|
|
|
{
|
2007-10-18 21:03:12 +08:00
|
|
|
|
/* We ran out of space, so replace the end of the list
|
2006-03-28 15:21:49 +08:00
|
|
|
|
with ellipsis. */
|
|
|
|
|
buf -= 4;
|
|
|
|
|
while (*buf != ' ')
|
|
|
|
|
buf--;
|
|
|
|
|
strcpy (buf, " ...");
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
the_ins.error = _("operands mismatch");
|
|
|
|
|
return;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
losing = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Now assemble it. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
the_ins.args = opcode->m_operands;
|
|
|
|
|
the_ins.numargs = opcode->m_opnum;
|
|
|
|
|
the_ins.numo = opcode->m_codenum;
|
|
|
|
|
the_ins.opcode[0] = getone (opcode);
|
|
|
|
|
the_ins.opcode[1] = gettwo (opcode);
|
|
|
|
|
|
|
|
|
|
for (s = the_ins.args, opP = &the_ins.operands[0]; *s; s += 2, opP++)
|
|
|
|
|
{
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
int have_disp = 0;
|
2007-09-25 23:31:05 +08:00
|
|
|
|
int use_pl = 0;
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* This switch is a doozy.
|
2004-07-11 23:20:30 +08:00
|
|
|
|
Watch the first step; its a big one! */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (s[0])
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
case '*':
|
|
|
|
|
case '~':
|
|
|
|
|
case '%':
|
|
|
|
|
case ';':
|
|
|
|
|
case '@':
|
|
|
|
|
case '!':
|
|
|
|
|
case '&':
|
|
|
|
|
case '$':
|
|
|
|
|
case '?':
|
|
|
|
|
case '/':
|
|
|
|
|
case '<':
|
|
|
|
|
case '>':
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'b':
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'm':
|
|
|
|
|
case 'n':
|
|
|
|
|
case 'o':
|
|
|
|
|
case 'p':
|
|
|
|
|
case 'q':
|
|
|
|
|
case 'v':
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'w':
|
|
|
|
|
case 'y':
|
|
|
|
|
case 'z':
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case '4':
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#ifndef NO_68851
|
|
|
|
|
case '|':
|
|
|
|
|
#endif
|
|
|
|
|
switch (opP->mode)
|
|
|
|
|
{
|
|
|
|
|
case IMMED:
|
|
|
|
|
tmpreg = 0x3c; /* 7.4 */
|
|
|
|
|
if (strchr ("bwl", s[1]))
|
2003-10-21 21:28:59 +08:00
|
|
|
|
nextword = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
|
|
|
|
nextword = get_num (&opP->disp, 0);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
add_fix (s[1], &opP->disp, 0, 0);
|
|
|
|
|
switch (s[1])
|
|
|
|
|
{
|
|
|
|
|
case 'b':
|
|
|
|
|
if (!isbyte (nextword))
|
|
|
|
|
opP->error = _("operand out of range");
|
|
|
|
|
addword (nextword);
|
|
|
|
|
baseo = 0;
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
if (!isword (nextword))
|
|
|
|
|
opP->error = _("operand out of range");
|
|
|
|
|
addword (nextword);
|
|
|
|
|
baseo = 0;
|
|
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
if (!issword (nextword))
|
|
|
|
|
opP->error = _("operand out of range");
|
|
|
|
|
addword (nextword);
|
|
|
|
|
baseo = 0;
|
|
|
|
|
break;
|
|
|
|
|
case 'l':
|
|
|
|
|
addword (nextword >> 16);
|
|
|
|
|
addword (nextword);
|
|
|
|
|
baseo = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
|
baseo = 2;
|
|
|
|
|
outro = 8;
|
|
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
baseo = 4;
|
|
|
|
|
outro = 11;
|
|
|
|
|
break;
|
|
|
|
|
case 'x':
|
|
|
|
|
baseo = 6;
|
|
|
|
|
outro = 15;
|
|
|
|
|
break;
|
|
|
|
|
case 'p':
|
|
|
|
|
baseo = 6;
|
|
|
|
|
outro = -1;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
if (!baseo)
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* We gotta put out some float. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (op (&opP->disp) != O_big)
|
|
|
|
|
{
|
|
|
|
|
valueT val;
|
|
|
|
|
int gencnt;
|
|
|
|
|
|
|
|
|
|
/* Can other cases happen here? */
|
|
|
|
|
if (op (&opP->disp) != O_constant)
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
val = (valueT) offs (&opP->disp);
|
|
|
|
|
gencnt = 0;
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
generic_bignum[gencnt] = (LITTLENUM_TYPE) val;
|
|
|
|
|
val >>= LITTLENUM_NUMBER_OF_BITS;
|
|
|
|
|
++gencnt;
|
|
|
|
|
}
|
|
|
|
|
while (val != 0);
|
|
|
|
|
offs (&opP->disp) = gencnt;
|
|
|
|
|
}
|
|
|
|
|
if (offs (&opP->disp) > 0)
|
|
|
|
|
{
|
|
|
|
|
if (offs (&opP->disp) > baseo)
|
|
|
|
|
{
|
|
|
|
|
as_warn (_("Bignum too big for %c format; truncated"),
|
|
|
|
|
s[1]);
|
|
|
|
|
offs (&opP->disp) = baseo;
|
|
|
|
|
}
|
|
|
|
|
baseo -= offs (&opP->disp);
|
|
|
|
|
while (baseo--)
|
|
|
|
|
addword (0);
|
|
|
|
|
for (wordp = generic_bignum + offs (&opP->disp) - 1;
|
|
|
|
|
offs (&opP->disp)--;
|
|
|
|
|
--wordp)
|
|
|
|
|
addword (*wordp);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
gen_to_words (words, baseo, (long) outro);
|
|
|
|
|
for (wordp = words; baseo--; wordp++)
|
|
|
|
|
addword (*wordp);
|
|
|
|
|
break;
|
|
|
|
|
case DREG:
|
|
|
|
|
tmpreg = opP->reg - DATA; /* 0.dreg */
|
|
|
|
|
break;
|
|
|
|
|
case AREG:
|
|
|
|
|
tmpreg = 0x08 + opP->reg - ADDR; /* 1.areg */
|
|
|
|
|
break;
|
|
|
|
|
case AINDR:
|
|
|
|
|
tmpreg = 0x10 + opP->reg - ADDR; /* 2.areg */
|
|
|
|
|
break;
|
|
|
|
|
case ADEC:
|
|
|
|
|
tmpreg = 0x20 + opP->reg - ADDR; /* 4.areg */
|
|
|
|
|
break;
|
|
|
|
|
case AINC:
|
|
|
|
|
tmpreg = 0x18 + opP->reg - ADDR; /* 3.areg */
|
|
|
|
|
break;
|
|
|
|
|
case DISP:
|
|
|
|
|
|
2003-10-21 21:28:59 +08:00
|
|
|
|
nextword = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-05-28 15:55:21 +08:00
|
|
|
|
/* Convert mode 5 addressing with a zero offset into
|
|
|
|
|
mode 2 addressing to reduce the instruction size by a
|
|
|
|
|
word. */
|
|
|
|
|
if (! isvar (&opP->disp)
|
|
|
|
|
&& (nextword == 0)
|
|
|
|
|
&& (opP->disp.size == SIZE_UNSPEC)
|
|
|
|
|
&& (opP->reg >= ADDR0)
|
|
|
|
|
&& (opP->reg <= ADDR7))
|
|
|
|
|
{
|
|
|
|
|
tmpreg = 0x10 + opP->reg - ADDR; /* 2.areg */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (opP->reg == PC
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& m68k_abspcadd)
|
|
|
|
|
{
|
|
|
|
|
opP->disp.exp.X_op = O_symbol;
|
|
|
|
|
opP->disp.exp.X_add_symbol =
|
|
|
|
|
section_symbol (absolute_section);
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Force into index mode. Hope this works. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* We do the first bit for 32-bit displacements, and the
|
|
|
|
|
second bit for 16 bit ones. It is possible that we
|
|
|
|
|
should make the default be WORD instead of LONG, but
|
|
|
|
|
I think that'd break GCC, so we put up with a little
|
|
|
|
|
inefficiency for the sake of working output. */
|
|
|
|
|
|
|
|
|
|
if (!issword (nextword)
|
|
|
|
|
|| (isvar (&opP->disp)
|
|
|
|
|
&& ((opP->disp.size == SIZE_UNSPEC
|
|
|
|
|
&& flag_short_refs == 0
|
|
|
|
|
&& cpu_of_arch (current_architecture) >= m68020
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
&& ! arch_coldfire_p (current_architecture))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| opP->disp.size == SIZE_LONG)))
|
|
|
|
|
{
|
|
|
|
|
if (cpu_of_arch (current_architecture) < m68020
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
|| arch_coldfire_p (current_architecture))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
opP->error =
|
|
|
|
|
_("displacement too large for this architecture; needs 68020 or higher");
|
|
|
|
|
if (opP->reg == PC)
|
|
|
|
|
tmpreg = 0x3B; /* 7.3 */
|
|
|
|
|
else
|
|
|
|
|
tmpreg = 0x30 + opP->reg - ADDR; /* 6.areg */
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
{
|
|
|
|
|
if (opP->reg == PC)
|
|
|
|
|
{
|
|
|
|
|
if (opP->disp.size == SIZE_LONG
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
/* If the displacement needs pic
|
|
|
|
|
relocation it cannot be relaxed. */
|
|
|
|
|
|| opP->disp.pic_reloc != pic_none
|
|
|
|
|
#endif
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
addword (0x0170);
|
|
|
|
|
add_fix ('l', &opP->disp, 1, 2);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
add_frag (adds (&opP->disp),
|
2005-03-21 10:25:23 +08:00
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (PCREL1632, SZ_UNDEF));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
addword (0x0170);
|
|
|
|
|
add_fix ('l', &opP->disp, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
addword (0x0170);
|
|
|
|
|
addword (nextword >> 16);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (opP->reg == PC)
|
|
|
|
|
tmpreg = 0x3A; /* 7.2 */
|
|
|
|
|
else
|
|
|
|
|
tmpreg = 0x28 + opP->reg - ADDR; /* 5.areg */
|
|
|
|
|
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
{
|
|
|
|
|
if (opP->reg == PC)
|
|
|
|
|
{
|
|
|
|
|
add_fix ('w', &opP->disp, 1, 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
add_fix ('w', &opP->disp, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
addword (nextword);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case POST:
|
|
|
|
|
case PRE:
|
|
|
|
|
case BASE:
|
|
|
|
|
nextword = 0;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
baseo = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (opP->mode == POST || opP->mode == PRE)
|
2003-10-21 21:28:59 +08:00
|
|
|
|
outro = get_num (&opP->odisp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Figure out the `addressing mode'.
|
|
|
|
|
Also turn on the BASE_DISABLE bit, if needed. */
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
|
|
|
|
{
|
|
|
|
|
tmpreg = 0x3b; /* 7.3 */
|
|
|
|
|
if (opP->reg == ZPC)
|
|
|
|
|
nextword |= 0x80;
|
|
|
|
|
}
|
|
|
|
|
else if (opP->reg == 0)
|
|
|
|
|
{
|
|
|
|
|
nextword |= 0x80;
|
|
|
|
|
tmpreg = 0x30; /* 6.garbage */
|
|
|
|
|
}
|
|
|
|
|
else if (opP->reg >= ZADDR0 && opP->reg <= ZADDR7)
|
|
|
|
|
{
|
|
|
|
|
nextword |= 0x80;
|
|
|
|
|
tmpreg = 0x30 + opP->reg - ZADDR0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
tmpreg = 0x30 + opP->reg - ADDR; /* 6.areg */
|
|
|
|
|
|
|
|
|
|
siz1 = opP->disp.size;
|
|
|
|
|
if (opP->mode == POST || opP->mode == PRE)
|
|
|
|
|
siz2 = opP->odisp.size;
|
|
|
|
|
else
|
|
|
|
|
siz2 = SIZE_UNSPEC;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Index register stuff. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (opP->index.reg != 0
|
|
|
|
|
&& opP->index.reg >= DATA
|
|
|
|
|
&& opP->index.reg <= ADDR7)
|
|
|
|
|
{
|
|
|
|
|
nextword |= (opP->index.reg - DATA) << 12;
|
|
|
|
|
|
|
|
|
|
if (opP->index.size == SIZE_LONG
|
|
|
|
|
|| (opP->index.size == SIZE_UNSPEC
|
|
|
|
|
&& m68k_index_width_default == SIZE_LONG))
|
|
|
|
|
nextword |= 0x800;
|
|
|
|
|
|
2000-09-12 03:49:46 +08:00
|
|
|
|
if ((opP->index.scale != 1
|
1999-05-03 15:29:11 +08:00
|
|
|
|
&& cpu_of_arch (current_architecture) < m68020)
|
2000-09-12 03:49:46 +08:00
|
|
|
|
|| (opP->index.scale == 8
|
2003-10-21 21:28:59 +08:00
|
|
|
|
&& (arch_coldfire_p (current_architecture)
|
2004-05-05 22:33:14 +08:00
|
|
|
|
&& !arch_coldfire_fpu (current_architecture))))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
opP->error =
|
|
|
|
|
_("scale factor invalid on this architecture; needs cpu32 or 68020 or higher");
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
if (arch_coldfire_p (current_architecture)
|
|
|
|
|
&& opP->index.size == SIZE_WORD)
|
|
|
|
|
opP->error = _("invalid index size for coldfire");
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (opP->index.scale)
|
|
|
|
|
{
|
|
|
|
|
case 1:
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
nextword |= 0x200;
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
nextword |= 0x400;
|
|
|
|
|
break;
|
|
|
|
|
case 8:
|
|
|
|
|
nextword |= 0x600;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
/* IF its simple,
|
|
|
|
|
GET US OUT OF HERE! */
|
|
|
|
|
|
|
|
|
|
/* Must be INDEX, with an index register. Address
|
|
|
|
|
register cannot be ZERO-PC, and either :b was
|
|
|
|
|
forced, or we know it will fit. For a 68000 or
|
|
|
|
|
68010, force this mode anyways, because the
|
|
|
|
|
larger modes aren't supported. */
|
|
|
|
|
if (opP->mode == BASE
|
|
|
|
|
&& ((opP->reg >= ADDR0
|
|
|
|
|
&& opP->reg <= ADDR7)
|
|
|
|
|
|| opP->reg == PC))
|
|
|
|
|
{
|
|
|
|
|
if (siz1 == SIZE_BYTE
|
|
|
|
|
|| cpu_of_arch (current_architecture) < m68020
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
|| arch_coldfire_p (current_architecture)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|| (siz1 == SIZE_UNSPEC
|
|
|
|
|
&& ! isvar (&opP->disp)
|
|
|
|
|
&& issbyte (baseo)))
|
|
|
|
|
{
|
|
|
|
|
nextword += baseo & 0xff;
|
|
|
|
|
addword (nextword);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
{
|
|
|
|
|
/* Do a byte relocation. If it doesn't
|
|
|
|
|
fit (possible on m68000) let the
|
|
|
|
|
fixup processing complain later. */
|
|
|
|
|
if (opP->reg == PC)
|
|
|
|
|
add_fix ('B', &opP->disp, 1, 1);
|
|
|
|
|
else
|
|
|
|
|
add_fix ('B', &opP->disp, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
else if (siz1 != SIZE_BYTE)
|
|
|
|
|
{
|
|
|
|
|
if (siz1 != SIZE_UNSPEC)
|
|
|
|
|
as_warn (_("Forcing byte displacement"));
|
|
|
|
|
if (! issbyte (baseo))
|
|
|
|
|
opP->error = _("byte displacement out of range");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else if (siz1 == SIZE_UNSPEC
|
|
|
|
|
&& opP->reg == PC
|
|
|
|
|
&& isvar (&opP->disp)
|
|
|
|
|
&& subs (&opP->disp) == NULL
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
/* If the displacement needs pic
|
|
|
|
|
relocation it cannot be relaxed. */
|
|
|
|
|
&& opP->disp.pic_reloc == pic_none
|
|
|
|
|
#endif
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
/* The code in md_convert_frag_1 needs to be
|
|
|
|
|
able to adjust nextword. Call frag_grow
|
|
|
|
|
to ensure that we have enough space in
|
|
|
|
|
the frag obstack to make all the bytes
|
|
|
|
|
contiguous. */
|
|
|
|
|
frag_grow (14);
|
2002-05-08 09:54:04 +08:00
|
|
|
|
nextword += baseo & 0xff;
|
|
|
|
|
addword (nextword);
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2002-05-08 09:54:04 +08:00
|
|
|
|
TAB (PCINDEX, SZ_UNDEF));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
break;
|
2002-05-08 09:54:04 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
nextword |= 0x40; /* No index reg. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (opP->index.reg >= ZDATA0
|
|
|
|
|
&& opP->index.reg <= ZDATA7)
|
|
|
|
|
nextword |= (opP->index.reg - ZDATA0) << 12;
|
|
|
|
|
else if (opP->index.reg >= ZADDR0
|
|
|
|
|
|| opP->index.reg <= ZADDR7)
|
|
|
|
|
nextword |= (opP->index.reg - ZADDR0 + 8) << 12;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* It isn't simple. */
|
|
|
|
|
|
|
|
|
|
if (cpu_of_arch (current_architecture) < m68020
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
|| arch_coldfire_p (current_architecture))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
opP->error =
|
|
|
|
|
_("invalid operand mode for this architecture; needs 68020 or higher");
|
|
|
|
|
|
|
|
|
|
nextword |= 0x100;
|
|
|
|
|
/* If the guy specified a width, we assume that it is
|
|
|
|
|
wide enough. Maybe it isn't. If so, we lose. */
|
|
|
|
|
switch (siz1)
|
|
|
|
|
{
|
|
|
|
|
case SIZE_UNSPEC:
|
|
|
|
|
if (isvar (&opP->disp)
|
|
|
|
|
? m68k_rel32
|
|
|
|
|
: ! issword (baseo))
|
|
|
|
|
{
|
|
|
|
|
siz1 = SIZE_LONG;
|
|
|
|
|
nextword |= 0x30;
|
|
|
|
|
}
|
|
|
|
|
else if (! isvar (&opP->disp) && baseo == 0)
|
|
|
|
|
nextword |= 0x10;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nextword |= 0x20;
|
|
|
|
|
siz1 = SIZE_WORD;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case SIZE_BYTE:
|
|
|
|
|
as_warn (_(":b not permitted; defaulting to :w"));
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case SIZE_WORD:
|
|
|
|
|
nextword |= 0x20;
|
|
|
|
|
break;
|
|
|
|
|
case SIZE_LONG:
|
|
|
|
|
nextword |= 0x30;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2003-11-22 10:35:31 +08:00
|
|
|
|
/* Figure out inner displacement stuff. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (opP->mode == POST || opP->mode == PRE)
|
|
|
|
|
{
|
|
|
|
|
if (cpu_of_arch (current_architecture) & cpu32)
|
|
|
|
|
opP->error = _("invalid operand mode for this architecture; needs 68020 or higher");
|
|
|
|
|
switch (siz2)
|
|
|
|
|
{
|
|
|
|
|
case SIZE_UNSPEC:
|
|
|
|
|
if (isvar (&opP->odisp)
|
|
|
|
|
? m68k_rel32
|
|
|
|
|
: ! issword (outro))
|
|
|
|
|
{
|
|
|
|
|
siz2 = SIZE_LONG;
|
|
|
|
|
nextword |= 0x3;
|
|
|
|
|
}
|
|
|
|
|
else if (! isvar (&opP->odisp) && outro == 0)
|
|
|
|
|
nextword |= 0x1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
nextword |= 0x2;
|
|
|
|
|
siz2 = SIZE_WORD;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
as_warn (_(":b not permitted; defaulting to :w"));
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
case 2:
|
|
|
|
|
nextword |= 0x2;
|
|
|
|
|
break;
|
|
|
|
|
case 3:
|
|
|
|
|
nextword |= 0x3;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (opP->mode == POST
|
|
|
|
|
&& (nextword & 0x40) == 0)
|
|
|
|
|
nextword |= 0x04;
|
|
|
|
|
}
|
|
|
|
|
addword (nextword);
|
|
|
|
|
|
|
|
|
|
if (siz1 != SIZE_UNSPEC && isvar (&opP->disp))
|
|
|
|
|
{
|
|
|
|
|
if (opP->reg == PC || opP->reg == ZPC)
|
|
|
|
|
add_fix (siz1 == SIZE_LONG ? 'l' : 'w', &opP->disp, 1, 2);
|
|
|
|
|
else
|
|
|
|
|
add_fix (siz1 == SIZE_LONG ? 'l' : 'w', &opP->disp, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
if (siz1 == SIZE_LONG)
|
|
|
|
|
addword (baseo >> 16);
|
|
|
|
|
if (siz1 != SIZE_UNSPEC)
|
|
|
|
|
addword (baseo);
|
|
|
|
|
|
|
|
|
|
if (siz2 != SIZE_UNSPEC && isvar (&opP->odisp))
|
|
|
|
|
add_fix (siz2 == SIZE_LONG ? 'l' : 'w', &opP->odisp, 0, 0);
|
|
|
|
|
if (siz2 == SIZE_LONG)
|
|
|
|
|
addword (outro >> 16);
|
|
|
|
|
if (siz2 != SIZE_UNSPEC)
|
|
|
|
|
addword (outro);
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ABSL:
|
2003-10-21 21:28:59 +08:00
|
|
|
|
nextword = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (opP->disp.size)
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
case SIZE_UNSPEC:
|
|
|
|
|
if (!isvar (&opP->disp) && issword (offs (&opP->disp)))
|
|
|
|
|
{
|
|
|
|
|
tmpreg = 0x38; /* 7.0 */
|
|
|
|
|
addword (nextword);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (isvar (&opP->disp)
|
|
|
|
|
&& !subs (&opP->disp)
|
|
|
|
|
&& adds (&opP->disp)
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
/* If the displacement needs pic relocation it
|
|
|
|
|
cannot be relaxed. */
|
|
|
|
|
&& opP->disp.pic_reloc == pic_none
|
|
|
|
|
#endif
|
|
|
|
|
&& !flag_long_jumps
|
|
|
|
|
&& !strchr ("~%&$?", s[0]))
|
|
|
|
|
{
|
|
|
|
|
tmpreg = 0x3A; /* 7.2 */
|
|
|
|
|
add_frag (adds (&opP->disp),
|
2005-03-21 10:25:23 +08:00
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (ABSTOPCREL, SZ_UNDEF));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Fall through into long. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case SIZE_LONG:
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
add_fix ('l', &opP->disp, 0, 0);
|
|
|
|
|
|
|
|
|
|
tmpreg = 0x39;/* 7.1 mode */
|
|
|
|
|
addword (nextword >> 16);
|
|
|
|
|
addword (nextword);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIZE_BYTE:
|
|
|
|
|
as_bad (_("unsupported byte value; use a different suffix"));
|
|
|
|
|
/* Fall through. */
|
2003-10-17 18:50:27 +08:00
|
|
|
|
|
|
|
|
|
case SIZE_WORD:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
add_fix ('w', &opP->disp, 0, 0);
|
|
|
|
|
|
|
|
|
|
tmpreg = 0x38;/* 7.0 mode */
|
|
|
|
|
addword (nextword);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case CONTROL:
|
|
|
|
|
case FPREG:
|
|
|
|
|
default:
|
|
|
|
|
as_bad (_("unknown/incorrect operand"));
|
2000-12-03 14:49:23 +08:00
|
|
|
|
/* abort (); */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2004-04-22 18:33:16 +08:00
|
|
|
|
|
|
|
|
|
/* If s[0] is '4', then this is for the mac instructions
|
|
|
|
|
that can have a trailing_ampersand set. If so, set 0x100
|
|
|
|
|
bit on tmpreg so install_gen_operand can check for it and
|
|
|
|
|
set the appropriate bit (word2, bit 5). */
|
|
|
|
|
if (s[0] == '4')
|
|
|
|
|
{
|
|
|
|
|
if (opP->trailing_ampersand)
|
|
|
|
|
tmpreg |= 0x100;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
install_gen_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '#':
|
|
|
|
|
case '^':
|
|
|
|
|
switch (s[1])
|
|
|
|
|
{ /* JF: I hate floating point! */
|
|
|
|
|
case 'j':
|
|
|
|
|
tmpreg = 70;
|
|
|
|
|
break;
|
|
|
|
|
case '8':
|
|
|
|
|
tmpreg = 20;
|
|
|
|
|
break;
|
|
|
|
|
case 'C':
|
|
|
|
|
tmpreg = 50;
|
|
|
|
|
break;
|
|
|
|
|
case '3':
|
|
|
|
|
default:
|
2003-10-21 21:28:59 +08:00
|
|
|
|
tmpreg = 90;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
tmpreg = get_num (&opP->disp, tmpreg);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
add_fix (s[1], &opP->disp, 0, 0);
|
|
|
|
|
switch (s[1])
|
|
|
|
|
{
|
|
|
|
|
case 'b': /* Danger: These do no check for
|
|
|
|
|
certain types of overflow.
|
|
|
|
|
user beware! */
|
|
|
|
|
if (!isbyte (tmpreg))
|
|
|
|
|
opP->error = _("out of range");
|
|
|
|
|
insop (tmpreg, opcode);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
the_ins.reloc[the_ins.nrel - 1].n =
|
|
|
|
|
(opcode->m_codenum) * 2 + 1;
|
|
|
|
|
break;
|
|
|
|
|
case 'B':
|
|
|
|
|
if (!issbyte (tmpreg))
|
|
|
|
|
opP->error = _("out of range");
|
|
|
|
|
the_ins.opcode[the_ins.numo - 1] |= tmpreg & 0xff;
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
the_ins.reloc[the_ins.nrel - 1].n = opcode->m_codenum * 2 - 1;
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
if (!isword (tmpreg))
|
|
|
|
|
opP->error = _("out of range");
|
|
|
|
|
insop (tmpreg, opcode);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
the_ins.reloc[the_ins.nrel - 1].n = (opcode->m_codenum) * 2;
|
|
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
if (!issword (tmpreg))
|
|
|
|
|
opP->error = _("out of range");
|
|
|
|
|
insop (tmpreg, opcode);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
the_ins.reloc[the_ins.nrel - 1].n = (opcode->m_codenum) * 2;
|
|
|
|
|
break;
|
|
|
|
|
case 'l':
|
|
|
|
|
/* Because of the way insop works, we put these two out
|
|
|
|
|
backwards. */
|
|
|
|
|
insop (tmpreg, opcode);
|
|
|
|
|
insop (tmpreg >> 16, opcode);
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
the_ins.reloc[the_ins.nrel - 1].n = (opcode->m_codenum) * 2;
|
|
|
|
|
break;
|
|
|
|
|
case '3':
|
|
|
|
|
tmpreg &= 0xFF;
|
|
|
|
|
case '8':
|
|
|
|
|
case 'C':
|
|
|
|
|
case 'j':
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '+':
|
|
|
|
|
case '-':
|
|
|
|
|
case 'A':
|
|
|
|
|
case 'a':
|
|
|
|
|
install_operand (s[1], opP->reg - ADDR);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'B':
|
2003-10-21 21:28:59 +08:00
|
|
|
|
tmpreg = get_num (&opP->disp, 90);
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (s[1])
|
|
|
|
|
{
|
|
|
|
|
case 'B':
|
2001-05-09 02:03:27 +08:00
|
|
|
|
add_fix ('B', &opP->disp, 1, -1);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'W':
|
|
|
|
|
add_fix ('w', &opP->disp, 1, 0);
|
|
|
|
|
addword (0);
|
|
|
|
|
break;
|
|
|
|
|
case 'L':
|
|
|
|
|
long_branch:
|
2000-09-23 01:33:55 +08:00
|
|
|
|
the_ins.opcode[0] |= 0xff;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
add_fix ('l', &opP->disp, 1, 0);
|
|
|
|
|
addword (0);
|
|
|
|
|
addword (0);
|
|
|
|
|
break;
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
case 'g': /* Conditional branch */
|
|
|
|
|
have_disp = HAVE_LONG_CALL (current_architecture);
|
|
|
|
|
goto var_branch;
|
|
|
|
|
|
|
|
|
|
case 'b': /* Unconditional branch */
|
|
|
|
|
have_disp = HAVE_LONG_BRANCH (current_architecture);
|
2007-09-25 23:31:05 +08:00
|
|
|
|
use_pl = LONG_BRANCH_VIA_COND (current_architecture);
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
goto var_branch;
|
|
|
|
|
|
|
|
|
|
case 's': /* Unconditional subroutine */
|
|
|
|
|
have_disp = HAVE_LONG_CALL (current_architecture);
|
|
|
|
|
|
|
|
|
|
var_branch:
|
|
|
|
|
if (subs (&opP->disp) /* We can't relax it. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#ifdef OBJ_ELF
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
/* If the displacement needs pic relocation it cannot be
|
|
|
|
|
relaxed. */
|
|
|
|
|
|| opP->disp.pic_reloc != pic_none
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
|| 0)
|
|
|
|
|
{
|
|
|
|
|
if (!have_disp)
|
|
|
|
|
as_warn (_("Can't use long branches on this architecture"));
|
|
|
|
|
goto long_branch;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* This could either be a symbol, or an absolute
|
2000-09-23 01:33:55 +08:00
|
|
|
|
address. If it's an absolute address, turn it into
|
|
|
|
|
an absolute jump right here and keep it out of the
|
|
|
|
|
relaxer. */
|
|
|
|
|
if (adds (&opP->disp) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (the_ins.opcode[0] == 0x6000) /* jbra */
|
2001-10-16 22:27:03 +08:00
|
|
|
|
the_ins.opcode[0] = 0x4EF9;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
else if (the_ins.opcode[0] == 0x6100) /* jbsr */
|
2001-10-16 22:27:03 +08:00
|
|
|
|
the_ins.opcode[0] = 0x4EB9;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
else /* jCC */
|
|
|
|
|
{
|
|
|
|
|
the_ins.opcode[0] ^= 0x0100;
|
|
|
|
|
the_ins.opcode[0] |= 0x0006;
|
2001-10-16 22:27:03 +08:00
|
|
|
|
addword (0x4EF9);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
}
|
|
|
|
|
add_fix ('l', &opP->disp, 0, 0);
|
|
|
|
|
addword (0);
|
|
|
|
|
addword (0);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now we know it's going into the relaxer. Now figure
|
|
|
|
|
out which mode. We try in this order of preference:
|
|
|
|
|
long branch, absolute jump, byte/word branches only. */
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
if (have_disp)
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (BRANCHBWL, SZ_UNDEF));
|
|
|
|
|
else if (! flag_keep_pcrel)
|
|
|
|
|
{
|
|
|
|
|
if ((the_ins.opcode[0] == 0x6000)
|
|
|
|
|
|| (the_ins.opcode[0] == 0x6100))
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (BRABSJUNC, SZ_UNDEF));
|
|
|
|
|
else
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (BRABSJCOND, SZ_UNDEF));
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
else
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2007-09-25 23:31:05 +08:00
|
|
|
|
(use_pl ? TAB (BRANCHBWPL, SZ_UNDEF)
|
|
|
|
|
: TAB (BRANCHBW, SZ_UNDEF)));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Check for DBcc instructions. We can relax them,
|
|
|
|
|
but only if we have long branches and/or absolute
|
|
|
|
|
jumps. */
|
|
|
|
|
if (((the_ins.opcode[0] & 0xf0f8) == 0x50c8)
|
|
|
|
|
&& (HAVE_LONG_BRANCH (current_architecture)
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
|| ! flag_keep_pcrel))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
if (HAVE_LONG_BRANCH (current_architecture))
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (DBCCLBR, SZ_UNDEF));
|
|
|
|
|
else
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (DBCCABSJ, SZ_UNDEF));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
add_fix ('w', &opP->disp, 1, 0);
|
|
|
|
|
}
|
|
|
|
|
addword (0);
|
|
|
|
|
break;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'C': /* Fixed size LONG coproc branches. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
add_fix ('l', &opP->disp, 1, 0);
|
|
|
|
|
addword (0);
|
|
|
|
|
addword (0);
|
|
|
|
|
break;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'c': /* Var size Coprocesssor branches. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
if (subs (&opP->disp) || (adds (&opP->disp) == 0))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
the_ins.opcode[the_ins.numo - 1] |= 0x40;
|
|
|
|
|
add_fix ('l', &opP->disp, 1, 0);
|
|
|
|
|
addword (0);
|
|
|
|
|
addword (0);
|
|
|
|
|
}
|
2000-09-23 01:33:55 +08:00
|
|
|
|
else
|
2005-03-21 10:25:23 +08:00
|
|
|
|
add_frag (adds (&opP->disp),
|
|
|
|
|
SEXT (offs (&opP->disp)),
|
2000-09-23 01:33:55 +08:00
|
|
|
|
TAB (FBRANCH, SZ_UNDEF));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'C': /* Ignore it. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'd': /* JF this is a kludge. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
install_operand ('s', opP->reg - ADDR);
|
2003-10-21 21:28:59 +08:00
|
|
|
|
tmpreg = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!issword (tmpreg))
|
|
|
|
|
{
|
|
|
|
|
as_warn (_("Expression out of range, using 0"));
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
}
|
|
|
|
|
addword (tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'D':
|
|
|
|
|
install_operand (s[1], opP->reg - DATA);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'e': /* EMAC ACCx, reg/reg. */
|
|
|
|
|
install_operand (s[1], opP->reg - ACC);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'E': /* Ignore it. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'F':
|
|
|
|
|
install_operand (s[1], opP->reg - FP0);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'g': /* EMAC ACCEXTx. */
|
|
|
|
|
install_operand (s[1], opP->reg - ACCEXT01);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'G': /* Ignore it. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'H':
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'I':
|
|
|
|
|
tmpreg = opP->reg - COP0;
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'i': /* MAC/EMAC scale factor. */
|
|
|
|
|
install_operand (s[1], opP->mode == LSH ? 0x1 : 0x3);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'J': /* JF foo. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case SFC:
|
|
|
|
|
tmpreg = 0x000;
|
|
|
|
|
break;
|
|
|
|
|
case DFC:
|
|
|
|
|
tmpreg = 0x001;
|
|
|
|
|
break;
|
|
|
|
|
case CACR:
|
|
|
|
|
tmpreg = 0x002;
|
|
|
|
|
break;
|
|
|
|
|
case TC:
|
2007-02-16 02:37:08 +08:00
|
|
|
|
case ASID:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpreg = 0x003;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case ACR0:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case ITT0:
|
|
|
|
|
tmpreg = 0x004;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case ACR1:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case ITT1:
|
|
|
|
|
tmpreg = 0x005;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case ACR2:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case DTT0:
|
|
|
|
|
tmpreg = 0x006;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case ACR3:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case DTT1:
|
|
|
|
|
tmpreg = 0x007;
|
|
|
|
|
break;
|
|
|
|
|
case BUSCR:
|
2007-02-16 02:37:08 +08:00
|
|
|
|
case MMUBAR:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpreg = 0x008;
|
|
|
|
|
break;
|
2009-11-11 02:05:24 +08:00
|
|
|
|
case RGPIOBAR:
|
|
|
|
|
tmpreg = 0x009;
|
|
|
|
|
break;
|
|
|
|
|
case ACR4:
|
|
|
|
|
case ACR5:
|
|
|
|
|
case ACR6:
|
|
|
|
|
case ACR7:
|
|
|
|
|
tmpreg = 0x00c + (opP->reg - ACR4);
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case USP:
|
|
|
|
|
tmpreg = 0x800;
|
|
|
|
|
break;
|
|
|
|
|
case VBR:
|
|
|
|
|
tmpreg = 0x801;
|
|
|
|
|
break;
|
|
|
|
|
case CAAR:
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
case CPUCR:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpreg = 0x802;
|
|
|
|
|
break;
|
|
|
|
|
case MSP:
|
|
|
|
|
tmpreg = 0x803;
|
|
|
|
|
break;
|
|
|
|
|
case ISP:
|
|
|
|
|
tmpreg = 0x804;
|
|
|
|
|
break;
|
|
|
|
|
case MMUSR:
|
|
|
|
|
tmpreg = 0x805;
|
|
|
|
|
break;
|
|
|
|
|
case URP:
|
|
|
|
|
tmpreg = 0x806;
|
|
|
|
|
break;
|
|
|
|
|
case SRP:
|
|
|
|
|
tmpreg = 0x807;
|
|
|
|
|
break;
|
|
|
|
|
case PCR:
|
|
|
|
|
tmpreg = 0x808;
|
|
|
|
|
break;
|
|
|
|
|
case ROMBAR:
|
2007-02-16 02:37:08 +08:00
|
|
|
|
case ROMBAR0:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpreg = 0xC00;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case ROMBAR1:
|
|
|
|
|
tmpreg = 0xC01;
|
|
|
|
|
break;
|
|
|
|
|
case FLASHBAR:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case RAMBAR0:
|
gas/
* config/m68k-parse.h (RAMBAR_ALT): New.
* config/tc-m68k.c (mcf5206_ctrl, mcf5307_ctrl): New.
(mcf_ctrl, mcf5208_ctrl, mcf5210a_ctrl, mcf5213_ctrl, mcf52235_ctrl,
mcf5225_ctrl, mcf5235_ctrl, mcf5271_ctrl, mcf5275_ctrl,
mcf5282_ctrl, mcf5329_ctrl, mcf5373_ctrl, mcfv4e_ctrl,
mcf5475_ctrl, mcf5485_ctrl): Add RAMBAR synonym for
RAMBAR1.
(mcf5272_ctrl): Add RAMBAR0, replace add RAMBAR with RAMBAR_ALT.
(m68k_cpus): Adjust 5206, 5206e & 5307 entries.
(m68k_ip) <Case J>: Detect when RAMBAR_ALT should be used. Add it
to control register mapping.
gas/testsuite/
* gas/m68k/ctrl-1.d, gas/m68k/ctrl-1.s: New.
* gas/m68k/ctrl-2.d, gas/m68k/ctrl-2.s: New.
* gas/m68k/all.exp: Add them.
opcodes/
* m68k-dis.c (print_insn_arg): Show c04 as rambar0 and c05 as
rambar1.
2007-04-20 22:09:00 +08:00
|
|
|
|
case RAMBAR_ALT:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmpreg = 0xC04;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case RAMBAR:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case RAMBAR1:
|
|
|
|
|
tmpreg = 0xC05;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case MPCR:
|
|
|
|
|
tmpreg = 0xC0C;
|
|
|
|
|
break;
|
|
|
|
|
case EDRAMBAR:
|
|
|
|
|
tmpreg = 0xC0D;
|
|
|
|
|
break;
|
|
|
|
|
case MBAR0:
|
2004-10-08 16:45:54 +08:00
|
|
|
|
case MBAR2:
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case SECMBAR:
|
|
|
|
|
tmpreg = 0xC0E;
|
|
|
|
|
break;
|
|
|
|
|
case MBAR1:
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case MBAR:
|
|
|
|
|
tmpreg = 0xC0F;
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case PCR1U0:
|
|
|
|
|
tmpreg = 0xD02;
|
|
|
|
|
break;
|
|
|
|
|
case PCR1L0:
|
|
|
|
|
tmpreg = 0xD03;
|
|
|
|
|
break;
|
|
|
|
|
case PCR2U0:
|
|
|
|
|
tmpreg = 0xD04;
|
|
|
|
|
break;
|
|
|
|
|
case PCR2L0:
|
|
|
|
|
tmpreg = 0xD05;
|
|
|
|
|
break;
|
|
|
|
|
case PCR3U0:
|
|
|
|
|
tmpreg = 0xD06;
|
|
|
|
|
break;
|
|
|
|
|
case PCR3L0:
|
|
|
|
|
tmpreg = 0xD07;
|
|
|
|
|
break;
|
|
|
|
|
case PCR1L1:
|
|
|
|
|
tmpreg = 0xD0A;
|
|
|
|
|
break;
|
|
|
|
|
case PCR1U1:
|
|
|
|
|
tmpreg = 0xD0B;
|
|
|
|
|
break;
|
|
|
|
|
case PCR2L1:
|
|
|
|
|
tmpreg = 0xD0C;
|
|
|
|
|
break;
|
|
|
|
|
case PCR2U1:
|
|
|
|
|
tmpreg = 0xD0D;
|
|
|
|
|
break;
|
|
|
|
|
case PCR3L1:
|
|
|
|
|
tmpreg = 0xD0E;
|
|
|
|
|
break;
|
|
|
|
|
case PCR3U1:
|
|
|
|
|
tmpreg = 0xD0F;
|
|
|
|
|
break;
|
2006-12-27 15:15:02 +08:00
|
|
|
|
case CAC:
|
|
|
|
|
tmpreg = 0xFFE;
|
|
|
|
|
break;
|
2007-09-27 19:14:10 +08:00
|
|
|
|
case MBO:
|
2006-12-27 15:15:02 +08:00
|
|
|
|
tmpreg = 0xFFF;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'k':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 55);
|
|
|
|
|
install_operand (s[1], tmpreg & 0x7f);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'l':
|
|
|
|
|
tmpreg = opP->mask;
|
|
|
|
|
if (s[1] == 'w')
|
|
|
|
|
{
|
|
|
|
|
if (tmpreg & 0x7FF0000)
|
|
|
|
|
as_bad (_("Floating point register in register list"));
|
|
|
|
|
insop (reverse_16_bits (tmpreg), opcode);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (tmpreg & 0x700FFFF)
|
|
|
|
|
as_bad (_("Wrong register in floating-point reglist"));
|
|
|
|
|
install_operand (s[1], reverse_8_bits (tmpreg >> 16));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'L':
|
|
|
|
|
tmpreg = opP->mask;
|
|
|
|
|
if (s[1] == 'w')
|
|
|
|
|
{
|
|
|
|
|
if (tmpreg & 0x7FF0000)
|
|
|
|
|
as_bad (_("Floating point register in register list"));
|
|
|
|
|
insop (tmpreg, opcode);
|
|
|
|
|
}
|
|
|
|
|
else if (s[1] == '8')
|
|
|
|
|
{
|
|
|
|
|
if (tmpreg & 0x0FFFFFF)
|
|
|
|
|
as_bad (_("incorrect register in reglist"));
|
|
|
|
|
install_operand (s[1], tmpreg >> 24);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (tmpreg & 0x700FFFF)
|
|
|
|
|
as_bad (_("wrong register in floating-point reglist"));
|
|
|
|
|
else
|
|
|
|
|
install_operand (s[1], tmpreg >> 16);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'M':
|
|
|
|
|
install_operand (s[1], get_num (&opP->disp, 60));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'O':
|
|
|
|
|
tmpreg = ((opP->mode == DREG)
|
2000-05-08 18:24:06 +08:00
|
|
|
|
? 0x20 + (int) (opP->reg - DATA)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
: (get_num (&opP->disp, 40) & 0x1F));
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'Q':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 10);
|
|
|
|
|
if (tmpreg == 8)
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'R':
|
|
|
|
|
/* This depends on the fact that ADDR registers are eight
|
|
|
|
|
more than their corresponding DATA regs, so the result
|
2003-10-17 18:50:27 +08:00
|
|
|
|
will have the ADDR_REG bit set. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
install_operand (s[1], opP->reg - DATA);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
|
if (opP->mode == AINDR)
|
|
|
|
|
install_operand (s[1], opP->reg - DATA);
|
|
|
|
|
else
|
|
|
|
|
install_operand (s[1], opP->index.reg - DATA);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
|
if (opP->reg == FPI)
|
|
|
|
|
tmpreg = 0x1;
|
|
|
|
|
else if (opP->reg == FPS)
|
|
|
|
|
tmpreg = 0x2;
|
|
|
|
|
else if (opP->reg == FPC)
|
|
|
|
|
tmpreg = 0x4;
|
|
|
|
|
else
|
|
|
|
|
abort ();
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'S': /* Ignore it. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'T':
|
|
|
|
|
install_operand (s[1], get_num (&opP->disp, 30));
|
|
|
|
|
break;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case 'U': /* Ignore it. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case NC:
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
break;
|
|
|
|
|
case DC:
|
|
|
|
|
tmpreg = 1;
|
|
|
|
|
break;
|
|
|
|
|
case IC:
|
|
|
|
|
tmpreg = 2;
|
|
|
|
|
break;
|
|
|
|
|
case BC:
|
|
|
|
|
tmpreg = 3;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
as_fatal (_("failed sanity check"));
|
2003-10-17 18:50:27 +08:00
|
|
|
|
} /* switch on cache token. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
#ifndef NO_68851
|
2000-09-12 03:49:46 +08:00
|
|
|
|
/* JF: These are out of order, I fear. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'f':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case SFC:
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
break;
|
|
|
|
|
case DFC:
|
|
|
|
|
tmpreg = 1;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case '0':
|
|
|
|
|
case '1':
|
|
|
|
|
case '2':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case TC:
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
break;
|
|
|
|
|
case CAL:
|
|
|
|
|
tmpreg = 4;
|
|
|
|
|
break;
|
|
|
|
|
case VAL:
|
|
|
|
|
tmpreg = 5;
|
|
|
|
|
break;
|
|
|
|
|
case SCC:
|
|
|
|
|
tmpreg = 6;
|
|
|
|
|
break;
|
|
|
|
|
case AC:
|
|
|
|
|
tmpreg = 7;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'V':
|
|
|
|
|
if (opP->reg == VAL)
|
|
|
|
|
break;
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
case 'W':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case DRP:
|
|
|
|
|
tmpreg = 1;
|
|
|
|
|
break;
|
|
|
|
|
case SRP:
|
|
|
|
|
tmpreg = 2;
|
|
|
|
|
break;
|
|
|
|
|
case CRP:
|
|
|
|
|
tmpreg = 3;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'X':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case BAD:
|
|
|
|
|
case BAD + 1:
|
|
|
|
|
case BAD + 2:
|
|
|
|
|
case BAD + 3:
|
|
|
|
|
case BAD + 4:
|
|
|
|
|
case BAD + 5:
|
|
|
|
|
case BAD + 6:
|
|
|
|
|
case BAD + 7:
|
|
|
|
|
tmpreg = (4 << 10) | ((opP->reg - BAD) << 2);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BAC:
|
|
|
|
|
case BAC + 1:
|
|
|
|
|
case BAC + 2:
|
|
|
|
|
case BAC + 3:
|
|
|
|
|
case BAC + 4:
|
|
|
|
|
case BAC + 5:
|
|
|
|
|
case BAC + 6:
|
|
|
|
|
case BAC + 7:
|
|
|
|
|
tmpreg = (5 << 10) | ((opP->reg - BAC) << 2);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
case 'Y':
|
|
|
|
|
know (opP->reg == PSR);
|
|
|
|
|
break;
|
|
|
|
|
case 'Z':
|
|
|
|
|
know (opP->reg == PCSR);
|
|
|
|
|
break;
|
|
|
|
|
#endif /* m68851 */
|
|
|
|
|
case '3':
|
|
|
|
|
switch (opP->reg)
|
|
|
|
|
{
|
|
|
|
|
case TT0:
|
|
|
|
|
tmpreg = 2;
|
|
|
|
|
break;
|
|
|
|
|
case TT1:
|
|
|
|
|
tmpreg = 3;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
|
|
|
|
case 't':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 20);
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
case '_': /* used only for move16 absolute 32-bit address. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (isvar (&opP->disp))
|
|
|
|
|
add_fix ('l', &opP->disp, 0, 0);
|
2003-10-21 21:28:59 +08:00
|
|
|
|
tmpreg = get_num (&opP->disp, 90);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
addword (tmpreg >> 16);
|
|
|
|
|
addword (tmpreg & 0xFFFF);
|
|
|
|
|
break;
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'u':
|
|
|
|
|
install_operand (s[1], opP->reg - DATA0L);
|
|
|
|
|
opP->reg -= (DATA0L);
|
2003-10-17 18:50:27 +08:00
|
|
|
|
opP->reg &= 0x0F; /* remove upper/lower bit. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 'x':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 80);
|
|
|
|
|
if (tmpreg == -1)
|
|
|
|
|
tmpreg = 0;
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
2007-07-03 15:54:19 +08:00
|
|
|
|
case 'j':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 10);
|
|
|
|
|
install_operand (s[1], tmpreg - 1);
|
|
|
|
|
break;
|
|
|
|
|
case 'K':
|
|
|
|
|
tmpreg = get_num (&opP->disp, 65);
|
|
|
|
|
install_operand (s[1], tmpreg);
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* By the time whe get here (FINALLY) the_ins contains the complete
|
2000-09-12 03:49:46 +08:00
|
|
|
|
instruction, ready to be emitted. . . */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
reverse_16_bits (int in)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int out = 0;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
static int mask[16] =
|
|
|
|
|
{
|
|
|
|
|
0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
|
|
|
|
|
0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000
|
|
|
|
|
};
|
|
|
|
|
for (n = 0; n < 16; n++)
|
|
|
|
|
{
|
|
|
|
|
if (in & mask[n])
|
|
|
|
|
out |= mask[15 - n];
|
|
|
|
|
}
|
|
|
|
|
return out;
|
|
|
|
|
} /* reverse_16_bits() */
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
reverse_8_bits (int in)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int out = 0;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
static int mask[8] =
|
|
|
|
|
{
|
|
|
|
|
0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (n = 0; n < 8; n++)
|
|
|
|
|
{
|
|
|
|
|
if (in & mask[n])
|
|
|
|
|
out |= mask[7 - n];
|
|
|
|
|
}
|
|
|
|
|
return out;
|
|
|
|
|
} /* reverse_8_bits() */
|
|
|
|
|
|
2007-09-25 23:31:05 +08:00
|
|
|
|
/* Cause an extra frag to be generated here, inserting up to
|
|
|
|
|
FRAG_VAR_SIZE bytes. TYPE is the subtype of the frag to be
|
|
|
|
|
generated; its primary type is rs_machine_dependent.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
The TYPE parameter is also used by md_convert_frag_1 and
|
|
|
|
|
md_estimate_size_before_relax. The appropriate type of fixup will
|
|
|
|
|
be emitted by md_convert_frag_1.
|
|
|
|
|
|
|
|
|
|
ADD becomes the FR_SYMBOL field of the frag, and OFF the FR_OFFSET. */
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
install_operand (int mode, int val)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (mode)
|
|
|
|
|
{
|
|
|
|
|
case 's':
|
2003-10-17 18:50:27 +08:00
|
|
|
|
the_ins.opcode[0] |= val & 0xFF; /* JF FF is for M kludge. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'd':
|
|
|
|
|
the_ins.opcode[0] |= val << 9;
|
|
|
|
|
break;
|
2007-07-03 15:54:19 +08:00
|
|
|
|
case 'E':
|
|
|
|
|
the_ins.opcode[1] |= val << 9;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case '1':
|
|
|
|
|
the_ins.opcode[1] |= val << 12;
|
|
|
|
|
break;
|
|
|
|
|
case '2':
|
|
|
|
|
the_ins.opcode[1] |= val << 6;
|
|
|
|
|
break;
|
|
|
|
|
case '3':
|
|
|
|
|
the_ins.opcode[1] |= val;
|
|
|
|
|
break;
|
|
|
|
|
case '4':
|
|
|
|
|
the_ins.opcode[2] |= val << 12;
|
|
|
|
|
break;
|
|
|
|
|
case '5':
|
|
|
|
|
the_ins.opcode[2] |= val << 6;
|
|
|
|
|
break;
|
|
|
|
|
case '6':
|
|
|
|
|
/* DANGER! This is a hack to force cas2l and cas2w cmds to be
|
|
|
|
|
three words long! */
|
|
|
|
|
the_ins.numo++;
|
|
|
|
|
the_ins.opcode[2] |= val;
|
|
|
|
|
break;
|
|
|
|
|
case '7':
|
|
|
|
|
the_ins.opcode[1] |= val << 7;
|
|
|
|
|
break;
|
|
|
|
|
case '8':
|
|
|
|
|
the_ins.opcode[1] |= val << 10;
|
|
|
|
|
break;
|
|
|
|
|
#ifndef NO_68851
|
|
|
|
|
case '9':
|
|
|
|
|
the_ins.opcode[1] |= val << 5;
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
case 't':
|
|
|
|
|
the_ins.opcode[1] |= (val << 10) | (val << 7);
|
|
|
|
|
break;
|
|
|
|
|
case 'D':
|
|
|
|
|
the_ins.opcode[1] |= (val << 12) | val;
|
|
|
|
|
break;
|
|
|
|
|
case 'g':
|
|
|
|
|
the_ins.opcode[0] |= val = 0xff;
|
|
|
|
|
break;
|
|
|
|
|
case 'i':
|
|
|
|
|
the_ins.opcode[0] |= val << 9;
|
|
|
|
|
break;
|
|
|
|
|
case 'C':
|
|
|
|
|
the_ins.opcode[1] |= val;
|
|
|
|
|
break;
|
|
|
|
|
case 'j':
|
|
|
|
|
the_ins.opcode[1] |= val;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
the_ins.numo++; /* What a hack. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 'k':
|
|
|
|
|
the_ins.opcode[1] |= val << 4;
|
|
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
case 'w':
|
|
|
|
|
case 'W':
|
|
|
|
|
case 'l':
|
|
|
|
|
break;
|
|
|
|
|
case 'e':
|
|
|
|
|
the_ins.opcode[0] |= (val << 6);
|
|
|
|
|
break;
|
|
|
|
|
case 'L':
|
|
|
|
|
the_ins.opcode[1] = (val >> 16);
|
|
|
|
|
the_ins.opcode[2] = val & 0xffff;
|
|
|
|
|
break;
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
case 'm':
|
|
|
|
|
the_ins.opcode[0] |= ((val & 0x8) << (6 - 3));
|
|
|
|
|
the_ins.opcode[0] |= ((val & 0x7) << 9);
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x10) << (7 - 4));
|
|
|
|
|
break;
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'n': /* MAC/EMAC Rx on !load. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
the_ins.opcode[0] |= ((val & 0x8) << (6 - 3));
|
|
|
|
|
the_ins.opcode[0] |= ((val & 0x7) << 9);
|
2004-04-22 18:33:16 +08:00
|
|
|
|
the_ins.opcode[1] |= ((val & 0x10) << (7 - 4));
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
break;
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'o': /* MAC/EMAC Rx on load. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
the_ins.opcode[1] |= val << 12;
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x10) << (7 - 4));
|
|
|
|
|
break;
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'M': /* MAC/EMAC Ry on !load. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
the_ins.opcode[0] |= (val & 0xF);
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x10) << (6 - 4));
|
|
|
|
|
break;
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'N': /* MAC/EMAC Ry on load. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
the_ins.opcode[1] |= (val & 0xF);
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x10) << (6 - 4));
|
|
|
|
|
break;
|
|
|
|
|
case 'h':
|
|
|
|
|
the_ins.opcode[1] |= ((val != 1) << 10);
|
|
|
|
|
break;
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case 'F':
|
|
|
|
|
the_ins.opcode[0] |= ((val & 0x3) << 9);
|
|
|
|
|
break;
|
|
|
|
|
case 'f':
|
|
|
|
|
the_ins.opcode[0] |= ((val & 0x3) << 0);
|
|
|
|
|
break;
|
2004-05-24 22:33:22 +08:00
|
|
|
|
case 'G': /* EMAC accumulator in a EMAC load instruction. */
|
2004-04-22 18:33:16 +08:00
|
|
|
|
the_ins.opcode[0] |= ((~val & 0x1) << 7);
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x2) << (4 - 1));
|
|
|
|
|
break;
|
2004-05-24 22:33:22 +08:00
|
|
|
|
case 'H': /* EMAC accumulator in a EMAC non-load instruction. */
|
2004-04-22 18:33:16 +08:00
|
|
|
|
the_ins.opcode[0] |= ((val & 0x1) << 7);
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x2) << (4 - 1));
|
|
|
|
|
break;
|
|
|
|
|
case 'I':
|
|
|
|
|
the_ins.opcode[1] |= ((val & 0x3) << 9);
|
|
|
|
|
break;
|
|
|
|
|
case ']':
|
|
|
|
|
the_ins.opcode[0] |= (val & 0x1) <<10;
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'c':
|
|
|
|
|
default:
|
|
|
|
|
as_fatal (_("failed sanity check."));
|
|
|
|
|
}
|
2004-05-05 22:33:14 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
install_gen_operand (int mode, int val)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (mode)
|
|
|
|
|
{
|
2004-04-22 18:33:16 +08:00
|
|
|
|
case '/': /* Special for mask loads for mac/msac insns with
|
|
|
|
|
possible mask; trailing_ampersend set in bit 8. */
|
|
|
|
|
the_ins.opcode[0] |= (val & 0x3f);
|
|
|
|
|
the_ins.opcode[1] |= (((val & 0x100) >> 8) << 5);
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 's':
|
|
|
|
|
the_ins.opcode[0] |= val;
|
|
|
|
|
break;
|
|
|
|
|
case 'd':
|
|
|
|
|
/* This is a kludge!!! */
|
|
|
|
|
the_ins.opcode[0] |= (val & 0x07) << 9 | (val & 0x38) << 3;
|
|
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
case 'w':
|
|
|
|
|
case 'l':
|
|
|
|
|
case 'f':
|
|
|
|
|
case 'F':
|
|
|
|
|
case 'x':
|
|
|
|
|
case 'p':
|
|
|
|
|
the_ins.opcode[0] |= val;
|
|
|
|
|
break;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* more stuff goes here. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
as_fatal (_("failed sanity check."));
|
|
|
|
|
}
|
2004-05-05 22:33:14 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2004-05-05 22:33:14 +08:00
|
|
|
|
/* Verify that we have some number of paren pairs, do m68k_ip_op(), and
|
|
|
|
|
then deal with the bitfield hack. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static char *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
crack_operand (char *str, struct m68k_op *opP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
register int parens;
|
|
|
|
|
register int c;
|
|
|
|
|
register char *beg_str;
|
|
|
|
|
int inquote = 0;
|
|
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
|
{
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
beg_str = str;
|
|
|
|
|
for (parens = 0; *str && (parens > 0 || inquote || notend (str)); str++)
|
|
|
|
|
{
|
|
|
|
|
if (! inquote)
|
|
|
|
|
{
|
|
|
|
|
if (*str == '(')
|
|
|
|
|
parens++;
|
|
|
|
|
else if (*str == ')')
|
|
|
|
|
{
|
|
|
|
|
if (!parens)
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ /* ERROR. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
opP->error = _("Extra )");
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
--parens;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (flag_mri && *str == '\'')
|
|
|
|
|
inquote = ! inquote;
|
|
|
|
|
}
|
|
|
|
|
if (!*str && parens)
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ /* ERROR. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
opP->error = _("Missing )");
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
c = *str;
|
|
|
|
|
*str = '\0';
|
|
|
|
|
if (m68k_ip_op (beg_str, opP) != 0)
|
|
|
|
|
{
|
|
|
|
|
*str = c;
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
*str = c;
|
|
|
|
|
if (c == '}')
|
2003-10-17 18:50:27 +08:00
|
|
|
|
c = *++str; /* JF bitfield hack. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (c)
|
|
|
|
|
{
|
|
|
|
|
c = *++str;
|
|
|
|
|
if (!c)
|
|
|
|
|
as_bad (_("Missing operand"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Detect MRI REG symbols and convert them to REGLSTs. */
|
|
|
|
|
if (opP->mode == CONTROL && (int)opP->reg < 0)
|
|
|
|
|
{
|
|
|
|
|
opP->mode = REGLST;
|
|
|
|
|
opP->mask = ~(int)opP->reg;
|
|
|
|
|
opP->reg = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is the guts of the machine-dependent assembler. STR points to a
|
|
|
|
|
machine dependent instruction. This function is supposed to emit
|
|
|
|
|
the frags/bytes it assembles to.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
insert_reg (const char *regname, int regnum)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char buf[100];
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
#ifdef REGISTER_PREFIX
|
|
|
|
|
if (!flag_reg_prefix_optional)
|
|
|
|
|
{
|
|
|
|
|
buf[0] = REGISTER_PREFIX;
|
|
|
|
|
strcpy (buf + 1, regname);
|
|
|
|
|
regname = buf;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
symbol_table_insert (symbol_new (regname, reg_section, regnum,
|
|
|
|
|
&zero_address_frag));
|
|
|
|
|
|
|
|
|
|
for (i = 0; regname[i]; i++)
|
2001-09-19 13:33:36 +08:00
|
|
|
|
buf[i] = TOUPPER (regname[i]);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
buf[i] = '\0';
|
|
|
|
|
|
|
|
|
|
symbol_table_insert (symbol_new (buf, reg_section, regnum,
|
|
|
|
|
&zero_address_frag));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct init_entry
|
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
int number;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct init_entry init_table[] =
|
|
|
|
|
{
|
|
|
|
|
{ "d0", DATA0 },
|
|
|
|
|
{ "d1", DATA1 },
|
|
|
|
|
{ "d2", DATA2 },
|
|
|
|
|
{ "d3", DATA3 },
|
|
|
|
|
{ "d4", DATA4 },
|
|
|
|
|
{ "d5", DATA5 },
|
|
|
|
|
{ "d6", DATA6 },
|
|
|
|
|
{ "d7", DATA7 },
|
|
|
|
|
{ "a0", ADDR0 },
|
|
|
|
|
{ "a1", ADDR1 },
|
|
|
|
|
{ "a2", ADDR2 },
|
|
|
|
|
{ "a3", ADDR3 },
|
|
|
|
|
{ "a4", ADDR4 },
|
|
|
|
|
{ "a5", ADDR5 },
|
|
|
|
|
{ "a6", ADDR6 },
|
|
|
|
|
{ "fp", ADDR6 },
|
|
|
|
|
{ "a7", ADDR7 },
|
|
|
|
|
{ "sp", ADDR7 },
|
|
|
|
|
{ "ssp", ADDR7 },
|
|
|
|
|
{ "fp0", FP0 },
|
|
|
|
|
{ "fp1", FP1 },
|
|
|
|
|
{ "fp2", FP2 },
|
|
|
|
|
{ "fp3", FP3 },
|
|
|
|
|
{ "fp4", FP4 },
|
|
|
|
|
{ "fp5", FP5 },
|
|
|
|
|
{ "fp6", FP6 },
|
|
|
|
|
{ "fp7", FP7 },
|
|
|
|
|
{ "fpi", FPI },
|
|
|
|
|
{ "fpiar", FPI },
|
|
|
|
|
{ "fpc", FPI },
|
|
|
|
|
{ "fps", FPS },
|
|
|
|
|
{ "fpsr", FPS },
|
|
|
|
|
{ "fpc", FPC },
|
|
|
|
|
{ "fpcr", FPC },
|
|
|
|
|
{ "control", FPC },
|
|
|
|
|
{ "status", FPS },
|
|
|
|
|
{ "iaddr", FPI },
|
|
|
|
|
|
|
|
|
|
{ "cop0", COP0 },
|
|
|
|
|
{ "cop1", COP1 },
|
|
|
|
|
{ "cop2", COP2 },
|
|
|
|
|
{ "cop3", COP3 },
|
|
|
|
|
{ "cop4", COP4 },
|
|
|
|
|
{ "cop5", COP5 },
|
|
|
|
|
{ "cop6", COP6 },
|
|
|
|
|
{ "cop7", COP7 },
|
|
|
|
|
{ "pc", PC },
|
|
|
|
|
{ "zpc", ZPC },
|
|
|
|
|
{ "sr", SR },
|
|
|
|
|
|
|
|
|
|
{ "ccr", CCR },
|
|
|
|
|
{ "cc", CCR },
|
|
|
|
|
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
{ "acc", ACC },
|
2004-04-22 18:33:16 +08:00
|
|
|
|
{ "acc0", ACC },
|
|
|
|
|
{ "acc1", ACC1 },
|
|
|
|
|
{ "acc2", ACC2 },
|
|
|
|
|
{ "acc3", ACC3 },
|
|
|
|
|
{ "accext01", ACCEXT01 },
|
|
|
|
|
{ "accext23", ACCEXT23 },
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
{ "macsr", MACSR },
|
|
|
|
|
{ "mask", MASK },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Control registers. */
|
|
|
|
|
{ "sfc", SFC }, /* Source Function Code. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "sfcr", SFC },
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "dfc", DFC }, /* Destination Function Code. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "dfcr", DFC },
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "cacr", CACR }, /* Cache Control Register. */
|
|
|
|
|
{ "caar", CAAR }, /* Cache Address Register. */
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
{ "cpucr", CPUCR }, /* CPU Control Register. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "usp", USP }, /* User Stack Pointer. */
|
|
|
|
|
{ "vbr", VBR }, /* Vector Base Register. */
|
|
|
|
|
{ "msp", MSP }, /* Master Stack Pointer. */
|
|
|
|
|
{ "isp", ISP }, /* Interrupt Stack Pointer. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "itt0", ITT0 }, /* Instruction Transparent Translation Reg 0. */
|
|
|
|
|
{ "itt1", ITT1 }, /* Instruction Transparent Translation Reg 1. */
|
|
|
|
|
{ "dtt0", DTT0 }, /* Data Transparent Translation Register 0. */
|
|
|
|
|
{ "dtt1", DTT1 }, /* Data Transparent Translation Register 1. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* 68ec040 versions of same */
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "iacr0", ITT0 }, /* Instruction Access Control Register 0. */
|
|
|
|
|
{ "iacr1", ITT1 }, /* Instruction Access Control Register 0. */
|
|
|
|
|
{ "dacr0", DTT0 }, /* Data Access Control Register 0. */
|
|
|
|
|
{ "dacr1", DTT1 }, /* Data Access Control Register 0. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-02-16 02:37:08 +08:00
|
|
|
|
/* Coldfire versions of same. The ColdFire programmer's reference
|
1999-05-03 15:29:11 +08:00
|
|
|
|
manual indicated that the order is 2,3,0,1, but Ken Rose
|
|
|
|
|
<rose@netcom.com> says that 0,1,2,3 is the correct order. */
|
2003-10-21 21:28:59 +08:00
|
|
|
|
{ "acr0", ACR0 }, /* Access Control Unit 0. */
|
|
|
|
|
{ "acr1", ACR1 }, /* Access Control Unit 1. */
|
|
|
|
|
{ "acr2", ACR2 }, /* Access Control Unit 2. */
|
|
|
|
|
{ "acr3", ACR3 }, /* Access Control Unit 3. */
|
2009-11-11 02:05:24 +08:00
|
|
|
|
{ "acr4", ACR4 }, /* Access Control Unit 4. */
|
|
|
|
|
{ "acr5", ACR5 }, /* Access Control Unit 5. */
|
|
|
|
|
{ "acr6", ACR6 }, /* Access Control Unit 6. */
|
|
|
|
|
{ "acr7", ACR7 }, /* Access Control Unit 7. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "tc", TC }, /* MMU Translation Control Register. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "tcr", TC },
|
2007-02-16 02:37:08 +08:00
|
|
|
|
{ "asid", ASID },
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "mmusr", MMUSR }, /* MMU Status Register. */
|
|
|
|
|
{ "srp", SRP }, /* User Root Pointer. */
|
|
|
|
|
{ "urp", URP }, /* Supervisor Root Pointer. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
{ "buscr", BUSCR },
|
2007-02-16 02:37:08 +08:00
|
|
|
|
{ "mmubar", MMUBAR },
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "pcr", PCR },
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
{ "rombar", ROMBAR }, /* ROM Base Address Register. */
|
|
|
|
|
{ "rambar0", RAMBAR0 }, /* ROM Base Address Register. */
|
|
|
|
|
{ "rambar1", RAMBAR1 }, /* ROM Base Address Register. */
|
|
|
|
|
{ "mbar", MBAR }, /* Module Base Address Register. */
|
2003-10-21 21:28:59 +08:00
|
|
|
|
|
|
|
|
|
{ "mbar0", MBAR0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "mbar1", MBAR1 }, /* mcfv4e registers. */
|
2007-02-16 02:37:08 +08:00
|
|
|
|
{ "rombar0", ROMBAR0 }, /* mcfv4e registers. */
|
2003-10-21 21:28:59 +08:00
|
|
|
|
{ "rombar1", ROMBAR1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "mpcr", MPCR }, /* mcfv4e registers. */
|
|
|
|
|
{ "edrambar", EDRAMBAR }, /* mcfv4e registers. */
|
|
|
|
|
{ "secmbar", SECMBAR }, /* mcfv4e registers. */
|
|
|
|
|
{ "asid", TC }, /* mcfv4e registers. */
|
|
|
|
|
{ "mmubar", BUSCR }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr1u0", PCR1U0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr1l0", PCR1L0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr2u0", PCR2U0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr2l0", PCR2L0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr3u0", PCR3U0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr3l0", PCR3L0 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr1u1", PCR1U1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr1l1", PCR1L1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr2u1", PCR2U1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr2l1", PCR2L1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr3u1", PCR3U1 }, /* mcfv4e registers. */
|
|
|
|
|
{ "pcr3l1", PCR3L1 }, /* mcfv4e registers. */
|
|
|
|
|
|
|
|
|
|
{ "flashbar", FLASHBAR }, /* mcf528x registers. */
|
|
|
|
|
{ "rambar", RAMBAR }, /* mcf528x registers. */
|
2004-10-08 16:45:54 +08:00
|
|
|
|
|
|
|
|
|
{ "mbar2", MBAR2 }, /* mcf5249 registers. */
|
2006-12-27 15:15:02 +08:00
|
|
|
|
|
2009-11-11 02:05:24 +08:00
|
|
|
|
{ "rgpiobar", RGPIOBAR }, /* mcf54418 registers. */
|
|
|
|
|
|
2006-12-27 15:15:02 +08:00
|
|
|
|
{ "cac", CAC }, /* fido registers. */
|
2007-09-27 19:14:10 +08:00
|
|
|
|
{ "mbb", MBO }, /* fido registers (obsolete). */
|
|
|
|
|
{ "mbo", MBO }, /* fido registers. */
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* End of control registers. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
{ "ac", AC },
|
|
|
|
|
{ "bc", BC },
|
|
|
|
|
{ "cal", CAL },
|
|
|
|
|
{ "crp", CRP },
|
|
|
|
|
{ "drp", DRP },
|
|
|
|
|
{ "pcsr", PCSR },
|
|
|
|
|
{ "psr", PSR },
|
|
|
|
|
{ "scc", SCC },
|
|
|
|
|
{ "val", VAL },
|
|
|
|
|
{ "bad0", BAD0 },
|
|
|
|
|
{ "bad1", BAD1 },
|
|
|
|
|
{ "bad2", BAD2 },
|
|
|
|
|
{ "bad3", BAD3 },
|
|
|
|
|
{ "bad4", BAD4 },
|
|
|
|
|
{ "bad5", BAD5 },
|
|
|
|
|
{ "bad6", BAD6 },
|
|
|
|
|
{ "bad7", BAD7 },
|
|
|
|
|
{ "bac0", BAC0 },
|
|
|
|
|
{ "bac1", BAC1 },
|
|
|
|
|
{ "bac2", BAC2 },
|
|
|
|
|
{ "bac3", BAC3 },
|
|
|
|
|
{ "bac4", BAC4 },
|
|
|
|
|
{ "bac5", BAC5 },
|
|
|
|
|
{ "bac6", BAC6 },
|
|
|
|
|
{ "bac7", BAC7 },
|
|
|
|
|
|
|
|
|
|
{ "ic", IC },
|
|
|
|
|
{ "dc", DC },
|
|
|
|
|
{ "nc", NC },
|
|
|
|
|
|
|
|
|
|
{ "tt0", TT0 },
|
|
|
|
|
{ "tt1", TT1 },
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* 68ec030 versions of same. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "ac0", TT0 },
|
|
|
|
|
{ "ac1", TT1 },
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* 68ec030 access control unit, identical to 030 MMU status reg. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ "acusr", PSR },
|
|
|
|
|
|
|
|
|
|
/* Suppressed data and address registers. */
|
|
|
|
|
{ "zd0", ZDATA0 },
|
|
|
|
|
{ "zd1", ZDATA1 },
|
|
|
|
|
{ "zd2", ZDATA2 },
|
|
|
|
|
{ "zd3", ZDATA3 },
|
|
|
|
|
{ "zd4", ZDATA4 },
|
|
|
|
|
{ "zd5", ZDATA5 },
|
|
|
|
|
{ "zd6", ZDATA6 },
|
|
|
|
|
{ "zd7", ZDATA7 },
|
|
|
|
|
{ "za0", ZADDR0 },
|
|
|
|
|
{ "za1", ZADDR1 },
|
|
|
|
|
{ "za2", ZADDR2 },
|
|
|
|
|
{ "za3", ZADDR3 },
|
|
|
|
|
{ "za4", ZADDR4 },
|
|
|
|
|
{ "za5", ZADDR5 },
|
|
|
|
|
{ "za6", ZADDR6 },
|
|
|
|
|
{ "za7", ZADDR7 },
|
|
|
|
|
|
2000-09-12 03:49:46 +08:00
|
|
|
|
/* Upper and lower data and address registers, used by macw and msacw. */
|
1999-05-28 Torbjorn Granlund <tege@matematik.su.se>
* config/tc-m68k.c (m68k_ip): Check for disallowed index register
width for Coldfire.
(arch_coldfire_p): New #define.
(m68k_ip, m68k_init_after_args): Use arch_coldfire_p.
1999-05-28 Linus Nordberg <linus.nordberg@canit.se>
* config/tc-m68k.c (install_operand): Add places `n', `o'.
* config/tc-m68k.c (m68k_ip): Add formats `E', `G', `H'.
(install_operand): Add place `N'.
(init_table): Add registers ACC, MACSR, MASK.
* config/m68k-parse.h (m68k_register): Add ACC, MACSR, MASK.
* config/tc-m68k.c: Change mcf5200 --> mcf.
(archs): Add mcf5206e, mcf5307.
(m68k_ip): Add format `u'.
(install_operand): Add place `m', `M', `h'.
(init_table): Add upper/lower registers.
* config/m68k-parse.h (m68k_register): Add upper/lower registers.
1999-05-28 06:36:51 +08:00
|
|
|
|
{ "d0l", DATA0L },
|
|
|
|
|
{ "d1l", DATA1L },
|
|
|
|
|
{ "d2l", DATA2L },
|
|
|
|
|
{ "d3l", DATA3L },
|
|
|
|
|
{ "d4l", DATA4L },
|
|
|
|
|
{ "d5l", DATA5L },
|
|
|
|
|
{ "d6l", DATA6L },
|
|
|
|
|
{ "d7l", DATA7L },
|
|
|
|
|
|
|
|
|
|
{ "a0l", ADDR0L },
|
|
|
|
|
{ "a1l", ADDR1L },
|
|
|
|
|
{ "a2l", ADDR2L },
|
|
|
|
|
{ "a3l", ADDR3L },
|
|
|
|
|
{ "a4l", ADDR4L },
|
|
|
|
|
{ "a5l", ADDR5L },
|
|
|
|
|
{ "a6l", ADDR6L },
|
|
|
|
|
{ "a7l", ADDR7L },
|
|
|
|
|
|
|
|
|
|
{ "d0u", DATA0U },
|
|
|
|
|
{ "d1u", DATA1U },
|
|
|
|
|
{ "d2u", DATA2U },
|
|
|
|
|
{ "d3u", DATA3U },
|
|
|
|
|
{ "d4u", DATA4U },
|
|
|
|
|
{ "d5u", DATA5U },
|
|
|
|
|
{ "d6u", DATA6U },
|
|
|
|
|
{ "d7u", DATA7U },
|
|
|
|
|
|
|
|
|
|
{ "a0u", ADDR0U },
|
|
|
|
|
{ "a1u", ADDR1U },
|
|
|
|
|
{ "a2u", ADDR2U },
|
|
|
|
|
{ "a3u", ADDR3U },
|
|
|
|
|
{ "a4u", ADDR4U },
|
|
|
|
|
{ "a5u", ADDR5U },
|
|
|
|
|
{ "a6u", ADDR6U },
|
|
|
|
|
{ "a7u", ADDR7U },
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{ 0, 0 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
init_regtable (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; init_table[i].name; i++)
|
|
|
|
|
insert_reg (init_table[i].name, init_table[i].number);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_assemble (char *str)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
const char *er;
|
|
|
|
|
short *fromP;
|
|
|
|
|
char *toP = NULL;
|
|
|
|
|
int m, n = 0;
|
|
|
|
|
char *to_beg_P;
|
|
|
|
|
int shorts_this_frag;
|
|
|
|
|
fixS *fixP;
|
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
if (!selected_cpu && !selected_arch)
|
|
|
|
|
{
|
|
|
|
|
/* We've not selected an architecture yet. Set the default
|
|
|
|
|
now. We do this lazily so that an initial .cpu or .arch directive
|
|
|
|
|
can specify. */
|
|
|
|
|
if (!m68k_set_cpu (TARGET_CPU, 1, 1))
|
|
|
|
|
as_bad (_("unrecognized default cpu `%s'"), TARGET_CPU);
|
|
|
|
|
}
|
|
|
|
|
if (!initialized)
|
|
|
|
|
m68k_init_arch ();
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* In MRI mode, the instruction and operands are separated by a
|
|
|
|
|
space. Anything following the operands is a comment. The label
|
|
|
|
|
has already been removed. */
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
int fields = 0;
|
|
|
|
|
int infield = 0;
|
|
|
|
|
int inquote = 0;
|
|
|
|
|
|
|
|
|
|
for (s = str; *s != '\0'; s++)
|
|
|
|
|
{
|
|
|
|
|
if ((*s == ' ' || *s == '\t') && ! inquote)
|
|
|
|
|
{
|
|
|
|
|
if (infield)
|
|
|
|
|
{
|
|
|
|
|
++fields;
|
|
|
|
|
if (fields >= 2)
|
|
|
|
|
{
|
|
|
|
|
*s = '\0';
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
infield = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! infield)
|
|
|
|
|
infield = 1;
|
|
|
|
|
if (*s == '\'')
|
|
|
|
|
inquote = ! inquote;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
memset (&the_ins, '\0', sizeof (the_ins));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
m68k_ip (str);
|
|
|
|
|
er = the_ins.error;
|
|
|
|
|
if (!er)
|
|
|
|
|
{
|
|
|
|
|
for (n = 0; n < the_ins.numargs; n++)
|
|
|
|
|
if (the_ins.operands[n].error)
|
|
|
|
|
{
|
|
|
|
|
er = the_ins.operands[n].error;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (er)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("%s -- statement `%s' ignored"), er, str);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If there is a current label, record that it marks an instruction. */
|
|
|
|
|
if (current_label != NULL)
|
|
|
|
|
{
|
|
|
|
|
current_label->text = 1;
|
|
|
|
|
current_label = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-18 18:25:58 +08:00
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
/* Tie dwarf2 debug info to the address at the start of the insn. */
|
|
|
|
|
dwarf2_emit_insn (0);
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (the_ins.nfrag == 0)
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* No frag hacking involved; just put it out. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
toP = frag_more (2 * the_ins.numo);
|
|
|
|
|
fromP = &the_ins.opcode[0];
|
|
|
|
|
for (m = the_ins.numo; m; --m)
|
|
|
|
|
{
|
|
|
|
|
md_number_to_chars (toP, (long) (*fromP), 2);
|
|
|
|
|
toP += 2;
|
|
|
|
|
fromP++;
|
|
|
|
|
}
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Put out symbol-dependent info. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (m = 0; m < the_ins.nrel; m++)
|
|
|
|
|
{
|
|
|
|
|
switch (the_ins.reloc[m].wid)
|
|
|
|
|
{
|
|
|
|
|
case 'B':
|
|
|
|
|
n = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 'b':
|
|
|
|
|
n = 1;
|
|
|
|
|
break;
|
|
|
|
|
case '3':
|
|
|
|
|
n = 1;
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
case 'W':
|
|
|
|
|
n = 2;
|
|
|
|
|
break;
|
|
|
|
|
case 'l':
|
|
|
|
|
n = 4;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
as_fatal (_("Don't know how to figure width of %c in md_assemble()"),
|
|
|
|
|
the_ins.reloc[m].wid);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fixP = fix_new_exp (frag_now,
|
|
|
|
|
((toP - frag_now->fr_literal)
|
|
|
|
|
- the_ins.numo * 2 + the_ins.reloc[m].n),
|
|
|
|
|
n,
|
|
|
|
|
&the_ins.reloc[m].exp,
|
|
|
|
|
the_ins.reloc[m].pcrel,
|
|
|
|
|
get_reloc_code (n, the_ins.reloc[m].pcrel,
|
|
|
|
|
the_ins.reloc[m].pic_reloc));
|
|
|
|
|
fixP->fx_pcrel_adjust = the_ins.reloc[m].pcrel_fix;
|
|
|
|
|
if (the_ins.reloc[m].wid == 'B')
|
|
|
|
|
fixP->fx_signed = 1;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* There's some frag hacking. */
|
2001-05-27 19:57:25 +08:00
|
|
|
|
{
|
|
|
|
|
/* Calculate the max frag size. */
|
|
|
|
|
int wid;
|
|
|
|
|
|
|
|
|
|
wid = 2 * the_ins.fragb[0].fragoff;
|
|
|
|
|
for (n = 1; n < the_ins.nfrag; n++)
|
|
|
|
|
wid += 2 * (the_ins.numo - the_ins.fragb[n - 1].fragoff);
|
|
|
|
|
/* frag_var part. */
|
2007-09-25 23:31:05 +08:00
|
|
|
|
wid += FRAG_VAR_SIZE;
|
2001-05-27 19:57:25 +08:00
|
|
|
|
/* Make sure the whole insn fits in one chunk, in particular that
|
|
|
|
|
the var part is attached, as we access one byte before the
|
|
|
|
|
variable frag for byte branches. */
|
|
|
|
|
frag_grow (wid);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
for (n = 0, fromP = &the_ins.opcode[0]; n < the_ins.nfrag; n++)
|
|
|
|
|
{
|
|
|
|
|
int wid;
|
|
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
|
wid = 2 * the_ins.fragb[n].fragoff;
|
|
|
|
|
else
|
|
|
|
|
wid = 2 * (the_ins.numo - the_ins.fragb[n - 1].fragoff);
|
|
|
|
|
toP = frag_more (wid);
|
|
|
|
|
to_beg_P = toP;
|
|
|
|
|
shorts_this_frag = 0;
|
|
|
|
|
for (m = wid / 2; m; --m)
|
|
|
|
|
{
|
|
|
|
|
md_number_to_chars (toP, (long) (*fromP), 2);
|
|
|
|
|
toP += 2;
|
|
|
|
|
fromP++;
|
|
|
|
|
shorts_this_frag++;
|
|
|
|
|
}
|
|
|
|
|
for (m = 0; m < the_ins.nrel; m++)
|
|
|
|
|
{
|
|
|
|
|
if ((the_ins.reloc[m].n) >= 2 * shorts_this_frag)
|
|
|
|
|
{
|
|
|
|
|
the_ins.reloc[m].n -= 2 * shorts_this_frag;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
wid = the_ins.reloc[m].wid;
|
|
|
|
|
if (wid == 0)
|
|
|
|
|
continue;
|
|
|
|
|
the_ins.reloc[m].wid = 0;
|
|
|
|
|
wid = (wid == 'b') ? 1 : (wid == 'w') ? 2 : (wid == 'l') ? 4 : 4000;
|
|
|
|
|
|
|
|
|
|
fixP = fix_new_exp (frag_now,
|
|
|
|
|
((toP - frag_now->fr_literal)
|
|
|
|
|
- the_ins.numo * 2 + the_ins.reloc[m].n),
|
|
|
|
|
wid,
|
|
|
|
|
&the_ins.reloc[m].exp,
|
|
|
|
|
the_ins.reloc[m].pcrel,
|
|
|
|
|
get_reloc_code (wid, the_ins.reloc[m].pcrel,
|
|
|
|
|
the_ins.reloc[m].pic_reloc));
|
|
|
|
|
fixP->fx_pcrel_adjust = the_ins.reloc[m].pcrel_fix;
|
|
|
|
|
}
|
2007-09-25 23:31:05 +08:00
|
|
|
|
(void) frag_var (rs_machine_dependent, FRAG_VAR_SIZE, 0,
|
1999-05-03 15:29:11 +08:00
|
|
|
|
(relax_substateT) (the_ins.fragb[n].fragty),
|
|
|
|
|
the_ins.fragb[n].fadd, the_ins.fragb[n].foff, to_beg_P);
|
|
|
|
|
}
|
|
|
|
|
n = (the_ins.numo - the_ins.fragb[n - 1].fragoff);
|
|
|
|
|
shorts_this_frag = 0;
|
|
|
|
|
if (n)
|
|
|
|
|
{
|
2005-03-01 09:57:39 +08:00
|
|
|
|
toP = frag_more (n * 2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
while (n--)
|
|
|
|
|
{
|
|
|
|
|
md_number_to_chars (toP, (long) (*fromP), 2);
|
|
|
|
|
toP += 2;
|
|
|
|
|
fromP++;
|
|
|
|
|
shorts_this_frag++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (m = 0; m < the_ins.nrel; m++)
|
|
|
|
|
{
|
|
|
|
|
int wid;
|
|
|
|
|
|
|
|
|
|
wid = the_ins.reloc[m].wid;
|
|
|
|
|
if (wid == 0)
|
|
|
|
|
continue;
|
|
|
|
|
the_ins.reloc[m].wid = 0;
|
|
|
|
|
wid = (wid == 'b') ? 1 : (wid == 'w') ? 2 : (wid == 'l') ? 4 : 4000;
|
|
|
|
|
|
|
|
|
|
fixP = fix_new_exp (frag_now,
|
|
|
|
|
((the_ins.reloc[m].n + toP - frag_now->fr_literal)
|
|
|
|
|
- shorts_this_frag * 2),
|
|
|
|
|
wid,
|
|
|
|
|
&the_ins.reloc[m].exp,
|
|
|
|
|
the_ins.reloc[m].pcrel,
|
|
|
|
|
get_reloc_code (wid, the_ins.reloc[m].pcrel,
|
|
|
|
|
the_ins.reloc[m].pic_reloc));
|
|
|
|
|
fixP->fx_pcrel_adjust = the_ins.reloc[m].pcrel_fix;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-27 15:56:27 +08:00
|
|
|
|
/* Comparison function used by qsort to rank the opcode entries by name. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
m68k_compare_opcode (const void * v1, const void * v2)
|
|
|
|
|
{
|
|
|
|
|
struct m68k_opcode * op1, * op2;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2005-06-09 01:02:54 +08:00
|
|
|
|
if (v1 == v2)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2004-05-27 15:56:27 +08:00
|
|
|
|
op1 = *(struct m68k_opcode **) v1;
|
|
|
|
|
op2 = *(struct m68k_opcode **) v2;
|
|
|
|
|
|
|
|
|
|
/* Compare the two names. If different, return the comparison.
|
|
|
|
|
If the same, return the order they are in the opcode table. */
|
|
|
|
|
ret = strcmp (op1->name, op2->name);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
if (op1 < op2)
|
|
|
|
|
return -1;
|
2005-06-09 01:02:54 +08:00
|
|
|
|
return 1;
|
2004-05-27 15:56:27 +08:00
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
void
|
2004-05-27 15:56:27 +08:00
|
|
|
|
md_begin (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2004-05-27 15:56:27 +08:00
|
|
|
|
const struct m68k_opcode *ins;
|
|
|
|
|
struct m68k_incant *hack, *slak;
|
|
|
|
|
const char *retval = 0; /* Empty string, or error msg text. */
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Set up hash tables with 68000 instructions.
|
|
|
|
|
similar to what the vax assembler does. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* RMS claims the thing to do is take the m68k-opcode.h table, and make
|
|
|
|
|
a copy of it at runtime, adding in the information we want but isn't
|
|
|
|
|
there. I think it'd be better to have an awk script hack the table
|
|
|
|
|
at compile time. Or even just xstr the table and use it as-is. But
|
|
|
|
|
my lord ghod hath spoken, so we do it this way. Excuse the ugly var
|
|
|
|
|
names. */
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
flag_reg_prefix_optional = 1;
|
|
|
|
|
m68k_abspcadd = 1;
|
|
|
|
|
if (! m68k_rel32_from_cmdline)
|
|
|
|
|
m68k_rel32 = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-05-27 15:56:27 +08:00
|
|
|
|
/* First sort the opcode table into alphabetical order to seperate
|
|
|
|
|
the order that the assembler wants to see the opcodes from the
|
|
|
|
|
order that the disassembler wants to see them. */
|
|
|
|
|
m68k_sorted_opcodes = xmalloc (m68k_numopcodes * sizeof (* m68k_sorted_opcodes));
|
|
|
|
|
if (!m68k_sorted_opcodes)
|
|
|
|
|
as_fatal (_("Internal Error: Can't allocate m68k_sorted_opcodes of size %d"),
|
2005-04-11 00:28:08 +08:00
|
|
|
|
m68k_numopcodes * ((int) sizeof (* m68k_sorted_opcodes)));
|
2004-05-27 15:56:27 +08:00
|
|
|
|
|
|
|
|
|
for (i = m68k_numopcodes; i--;)
|
|
|
|
|
m68k_sorted_opcodes[i] = m68k_opcodes + i;
|
|
|
|
|
|
|
|
|
|
qsort (m68k_sorted_opcodes, m68k_numopcodes,
|
|
|
|
|
sizeof (m68k_sorted_opcodes[0]), m68k_compare_opcode);
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
op_hash = hash_new ();
|
|
|
|
|
|
|
|
|
|
obstack_begin (&robyn, 4000);
|
|
|
|
|
for (i = 0; i < m68k_numopcodes; i++)
|
|
|
|
|
{
|
2008-10-21 08:26:17 +08:00
|
|
|
|
hack = slak = obstack_alloc (&robyn, sizeof (struct m68k_incant));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
do
|
|
|
|
|
{
|
2004-05-27 15:56:27 +08:00
|
|
|
|
ins = m68k_sorted_opcodes[i];
|
|
|
|
|
|
2007-07-03 15:54:19 +08:00
|
|
|
|
/* We must enter all insns into the table, because .arch and
|
|
|
|
|
.cpu directives can change things. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
slak->m_operands = ins->args;
|
|
|
|
|
slak->m_arch = ins->arch;
|
|
|
|
|
slak->m_opcode = ins->opcode;
|
2007-07-03 15:54:19 +08:00
|
|
|
|
|
|
|
|
|
/* In most cases we can determine the number of opcode words
|
|
|
|
|
by checking the second word of the mask. Unfortunately
|
|
|
|
|
some instructions have 2 opcode words, but no fixed bits
|
|
|
|
|
in the second word. A leading dot in the operands
|
|
|
|
|
string also indicates 2 opcodes. */
|
|
|
|
|
if (*slak->m_operands == '.')
|
|
|
|
|
{
|
|
|
|
|
slak->m_operands++;
|
|
|
|
|
slak->m_codenum = 2;
|
|
|
|
|
}
|
|
|
|
|
else if (ins->match & 0xffffL)
|
|
|
|
|
slak->m_codenum = 2;
|
|
|
|
|
else
|
|
|
|
|
slak->m_codenum = 1;
|
|
|
|
|
slak->m_opnum = strlen (slak->m_operands) / 2;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (i + 1 != m68k_numopcodes
|
2004-05-27 15:56:27 +08:00
|
|
|
|
&& !strcmp (ins->name, m68k_sorted_opcodes[i + 1]->name))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2004-05-27 15:56:27 +08:00
|
|
|
|
slak->m_next = obstack_alloc (&robyn, sizeof (struct m68k_incant));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
slak->m_next = 0;
|
|
|
|
|
slak = slak->m_next;
|
|
|
|
|
}
|
|
|
|
|
while (slak);
|
|
|
|
|
|
|
|
|
|
retval = hash_insert (op_hash, ins->name, (char *) hack);
|
|
|
|
|
if (retval)
|
|
|
|
|
as_fatal (_("Internal Error: Can't hash %s: %s"), ins->name, retval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < m68k_numaliases; i++)
|
|
|
|
|
{
|
|
|
|
|
const char *name = m68k_opcode_aliases[i].primary;
|
|
|
|
|
const char *alias = m68k_opcode_aliases[i].alias;
|
2008-08-13 07:39:31 +08:00
|
|
|
|
void *val = hash_find (op_hash, name);
|
2004-05-27 15:56:27 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!val)
|
|
|
|
|
as_fatal (_("Internal Error: Can't find %s in hash table"), name);
|
|
|
|
|
retval = hash_insert (op_hash, alias, val);
|
|
|
|
|
if (retval)
|
|
|
|
|
as_fatal (_("Internal Error: Can't hash %s: %s"), alias, retval);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* In MRI mode, all unsized branches are variable sized. Normally,
|
|
|
|
|
they are word sized. */
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
static struct m68k_opcode_alias mri_aliases[] =
|
|
|
|
|
{
|
|
|
|
|
{ "bhi", "jhi", },
|
|
|
|
|
{ "bls", "jls", },
|
|
|
|
|
{ "bcc", "jcc", },
|
|
|
|
|
{ "bcs", "jcs", },
|
|
|
|
|
{ "bne", "jne", },
|
|
|
|
|
{ "beq", "jeq", },
|
|
|
|
|
{ "bvc", "jvc", },
|
|
|
|
|
{ "bvs", "jvs", },
|
|
|
|
|
{ "bpl", "jpl", },
|
|
|
|
|
{ "bmi", "jmi", },
|
|
|
|
|
{ "bge", "jge", },
|
|
|
|
|
{ "blt", "jlt", },
|
|
|
|
|
{ "bgt", "jgt", },
|
|
|
|
|
{ "ble", "jle", },
|
|
|
|
|
{ "bra", "jra", },
|
|
|
|
|
{ "bsr", "jbsr", },
|
|
|
|
|
};
|
|
|
|
|
|
2000-05-08 18:24:06 +08:00
|
|
|
|
for (i = 0;
|
|
|
|
|
i < (int) (sizeof mri_aliases / sizeof mri_aliases[0]);
|
|
|
|
|
i++)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
const char *name = mri_aliases[i].primary;
|
|
|
|
|
const char *alias = mri_aliases[i].alias;
|
2008-08-13 07:39:31 +08:00
|
|
|
|
void *val = hash_find (op_hash, name);
|
2004-05-27 15:56:27 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (!val)
|
|
|
|
|
as_fatal (_("Internal Error: Can't find %s in hash table"), name);
|
|
|
|
|
retval = hash_jam (op_hash, alias, val);
|
|
|
|
|
if (retval)
|
|
|
|
|
as_fatal (_("Internal Error: Can't hash %s: %s"), alias, retval);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-05-08 18:24:06 +08:00
|
|
|
|
for (i = 0; i < (int) sizeof (notend_table); i++)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
notend_table[i] = 0;
|
|
|
|
|
alt_notend_table[i] = 0;
|
|
|
|
|
}
|
2004-05-27 15:56:27 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
notend_table[','] = 1;
|
|
|
|
|
notend_table['{'] = 1;
|
|
|
|
|
notend_table['}'] = 1;
|
|
|
|
|
alt_notend_table['a'] = 1;
|
|
|
|
|
alt_notend_table['A'] = 1;
|
|
|
|
|
alt_notend_table['d'] = 1;
|
|
|
|
|
alt_notend_table['D'] = 1;
|
|
|
|
|
alt_notend_table['#'] = 1;
|
|
|
|
|
alt_notend_table['&'] = 1;
|
|
|
|
|
alt_notend_table['f'] = 1;
|
|
|
|
|
alt_notend_table['F'] = 1;
|
|
|
|
|
#ifdef REGISTER_PREFIX
|
|
|
|
|
alt_notend_table[REGISTER_PREFIX] = 1;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* We need to put '(' in alt_notend_table to handle
|
2004-05-27 15:56:27 +08:00
|
|
|
|
cas2 %d0:%d2,%d3:%d4,(%a0):(%a1) */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
alt_notend_table['('] = 1;
|
|
|
|
|
|
|
|
|
|
/* We need to put '@' in alt_notend_table to handle
|
2004-05-27 15:56:27 +08:00
|
|
|
|
cas2 %d0:%d2,%d3:%d4,@(%d0):@(%d1) */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
alt_notend_table['@'] = 1;
|
|
|
|
|
|
|
|
|
|
/* We need to put digits in alt_notend_table to handle
|
2004-05-27 15:56:27 +08:00
|
|
|
|
bfextu %d0{24:1},%d0 */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
alt_notend_table['0'] = 1;
|
|
|
|
|
alt_notend_table['1'] = 1;
|
|
|
|
|
alt_notend_table['2'] = 1;
|
|
|
|
|
alt_notend_table['3'] = 1;
|
|
|
|
|
alt_notend_table['4'] = 1;
|
|
|
|
|
alt_notend_table['5'] = 1;
|
|
|
|
|
alt_notend_table['6'] = 1;
|
|
|
|
|
alt_notend_table['7'] = 1;
|
|
|
|
|
alt_notend_table['8'] = 1;
|
|
|
|
|
alt_notend_table['9'] = 1;
|
|
|
|
|
|
|
|
|
|
#ifndef MIT_SYNTAX_ONLY
|
|
|
|
|
/* Insert pseudo ops, these have to go into the opcode table since
|
2003-10-17 18:50:27 +08:00
|
|
|
|
gas expects pseudo ops to start with a dot. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int n = 0;
|
2004-05-27 15:56:27 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
while (mote_pseudo_table[n].poc_name)
|
|
|
|
|
{
|
2004-05-27 15:56:27 +08:00
|
|
|
|
hack = obstack_alloc (&robyn, sizeof (struct m68k_incant));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
hash_insert (op_hash,
|
|
|
|
|
mote_pseudo_table[n].poc_name, (char *) hack);
|
|
|
|
|
hack->m_operands = 0;
|
|
|
|
|
hack->m_opnum = n;
|
|
|
|
|
n++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
init_regtable ();
|
|
|
|
|
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
record_alignment (text_section, 2);
|
|
|
|
|
record_alignment (data_section, 2);
|
|
|
|
|
record_alignment (bss_section, 2);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This is called when a label is defined. */
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_frob_label (symbolS *sym)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct label_line *n;
|
|
|
|
|
|
|
|
|
|
n = (struct label_line *) xmalloc (sizeof *n);
|
|
|
|
|
n->next = labels;
|
|
|
|
|
n->label = sym;
|
|
|
|
|
as_where (&n->file, &n->line);
|
|
|
|
|
n->text = 0;
|
|
|
|
|
labels = n;
|
|
|
|
|
current_label = n;
|
2005-09-21 02:24:48 +08:00
|
|
|
|
|
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
dwarf2_emit_label (sym);
|
|
|
|
|
#endif
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is called when a value that is not an instruction is emitted. */
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_flush_pending_output (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
current_label = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is called at the end of the assembly, when the final value of
|
|
|
|
|
the label is known. We warn if this is a text symbol aligned at an
|
|
|
|
|
odd location. */
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_frob_symbol (symbolS *sym)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (S_GET_SEGMENT (sym) == reg_section
|
|
|
|
|
&& (int) S_GET_VALUE (sym) < 0)
|
|
|
|
|
{
|
|
|
|
|
S_SET_SEGMENT (sym, absolute_section);
|
|
|
|
|
S_SET_VALUE (sym, ~(int)S_GET_VALUE (sym));
|
|
|
|
|
}
|
|
|
|
|
else if ((S_GET_VALUE (sym) & 1) != 0)
|
|
|
|
|
{
|
|
|
|
|
struct label_line *l;
|
|
|
|
|
|
|
|
|
|
for (l = labels; l != NULL; l = l->next)
|
|
|
|
|
{
|
|
|
|
|
if (l->label == sym)
|
|
|
|
|
{
|
|
|
|
|
if (l->text)
|
|
|
|
|
as_warn_where (l->file, l->line,
|
|
|
|
|
_("text label `%s' aligned to odd boundary"),
|
|
|
|
|
S_GET_NAME (sym));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is called if we go in or out of MRI mode because of the .mri
|
|
|
|
|
pseudo-op. */
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_mri_mode_change (int on)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (on)
|
|
|
|
|
{
|
|
|
|
|
if (! flag_reg_prefix_optional)
|
|
|
|
|
{
|
|
|
|
|
flag_reg_prefix_optional = 1;
|
|
|
|
|
#ifdef REGISTER_PREFIX
|
|
|
|
|
init_regtable ();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
m68k_abspcadd = 1;
|
|
|
|
|
if (! m68k_rel32_from_cmdline)
|
|
|
|
|
m68k_rel32 = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (! reg_prefix_optional_seen)
|
|
|
|
|
{
|
|
|
|
|
#ifdef REGISTER_PREFIX_OPTIONAL
|
|
|
|
|
flag_reg_prefix_optional = REGISTER_PREFIX_OPTIONAL;
|
|
|
|
|
#else
|
|
|
|
|
flag_reg_prefix_optional = 0;
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef REGISTER_PREFIX
|
|
|
|
|
init_regtable ();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
m68k_abspcadd = 0;
|
|
|
|
|
if (! m68k_rel32_from_cmdline)
|
|
|
|
|
m68k_rel32 = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_atof (int type, char *litP, int *sizeP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-10-18 00:45:56 +08:00
|
|
|
|
return ieee_md_atof (type, litP, sizeP, TRUE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_number_to_chars (char *buf, valueT val, int n)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
number_to_chars_bigendian (buf, val, n);
|
|
|
|
|
}
|
|
|
|
|
|
2001-11-16 05:29:00 +08:00
|
|
|
|
void
|
gas:
* cgen.c, cgen.h, tc.h, write.c, config/obj-coff.c
* config/tc-a29k.c, config/tc-alpha.c, config/tc-alpha.h
* config/tc-arc.c, config/tc-arc.h, config/tc-arm.c
* config/tc-arm.h, config/tc-avr.c, config/tc-avr.h
* config/tc-cris.c, config/tc-crx.c, config/tc-d10v.c
* config/tc-d10v.h, config/tc-d30v.c, config/tc-d30v.h
* config/tc-dlx.c, config/tc-dlx.h, config/tc-fr30.h
* config/tc-frv.c, config/tc-frv.h, config/tc-h8300.c
* config/tc-h8500.c, config/tc-hppa.c, config/tc-hppa.h
* config/tc-i370.c, config/tc-i370.h, config/tc-i386.c
* config/tc-i386.h, config/tc-i860.c, config/tc-i860.h
* config/tc-i960.c, config/tc-i960.h, config/tc-ia64.c
* config/tc-ip2k.c, config/tc-ip2k.h, config/tc-iq2000.c
* config/tc-iq2000.h, config/tc-m32r.c, config/tc-m32r.h
* config/tc-m68hc11.c, config/tc-m68hc11.h, config/tc-m68k.c
* config/tc-m68k.h, config/tc-m88k.c, config/tc-maxq.c
* config/tc-mcore.c, config/tc-mcore.h, config/tc-mips.c
* config/tc-mips.h, config/tc-mmix.c, config/tc-mn10200.c
* config/tc-mn10300.c, config/tc-msp430.c, config/tc-ns32k.c
* config/tc-openrisc.h, config/tc-or32.c, config/tc-or32.h
* config/tc-pdp11.c, config/tc-pj.c, config/tc-pj.h
* config/tc-ppc.c, config/tc-ppc.h, config/tc-s390.c
* config/tc-s390.h, config/tc-sh64.c, config/tc-sh.c
* config/tc-sh.h, config/tc-sparc.c, config/tc-sparc.h
* config/tc-tahoe.c, config/tc-tic30.c, config/tc-tic4x.c
* config/tc-tic54x.c, config/tc-tic80.c, config/tc-v850.c
* config/tc-v850.h, config/tc-vax.c, config/tc-vax.h
* config/tc-w65.c, config/tc-xstormy16.c, config/tc-xstormy16.h
* config/tc-xtensa.c, config/tc-z8k.c:
Replace all instances of the string "_apply_fix3" with
"_apply_fix".
* po/POTFILES.in, po/gas.pot: Regenerate.
bfd:
* coff-i386.c: Change md_apply_fix3 to md_apply_fix in comment.
cgen:
* doc/porting.texi: Change all mention of md_apply_fix3 and
gas_cgen_md_apply_fix3 to md_apply_fix and gas_cgen_md_apply_fix
respectively.
2005-06-08 01:54:22 +08:00
|
|
|
|
md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2001-11-16 17:34:28 +08:00
|
|
|
|
offsetT val = *valP;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
addressT upper_limit;
|
|
|
|
|
offsetT lower_limit;
|
|
|
|
|
|
|
|
|
|
/* This is unnecessary but it convinces the native rs6000 compiler
|
|
|
|
|
to generate the code we want. */
|
|
|
|
|
char *buf = fixP->fx_frag->fr_literal;
|
|
|
|
|
buf += fixP->fx_where;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* End ibm compiler workaround. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2005-03-21 10:25:23 +08:00
|
|
|
|
val = SEXT (val);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2001-11-16 05:29:00 +08:00
|
|
|
|
if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0)
|
|
|
|
|
fixP->fx_done = 1;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#ifdef OBJ_ELF
|
|
|
|
|
if (fixP->fx_addsy)
|
|
|
|
|
{
|
|
|
|
|
memset (buf, 0, fixP->fx_size);
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fixP->fx_addnumber = val; /* Remember value for emit_reloc. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
|
|
|
|
|
&& !S_IS_DEFINED (fixP->fx_addsy)
|
|
|
|
|
&& !S_IS_WEAK (fixP->fx_addsy))
|
|
|
|
|
S_SET_WEAK (fixP->fx_addsy);
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
|
|
|
|
switch (fixP->fx_r_type)
|
|
|
|
|
{
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_GD8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDM8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LDO8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_IE8:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE32:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE16:
|
|
|
|
|
case BFD_RELOC_68K_TLS_LE8:
|
|
|
|
|
S_SET_THREAD_LOCAL (fixP->fx_addsy);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
2007-05-03 23:55:38 +08:00
|
|
|
|
#elif defined(OBJ_AOUT)
|
2007-05-15 17:21:24 +08:00
|
|
|
|
/* PR gas/3041 Do not fix frags referencing a weak symbol. */
|
2007-05-03 23:55:38 +08:00
|
|
|
|
if (fixP->fx_addsy && S_IS_WEAK (fixP->fx_addsy))
|
|
|
|
|
{
|
|
|
|
|
memset (buf, 0, fixP->fx_size);
|
2007-05-15 17:21:24 +08:00
|
|
|
|
fixP->fx_addnumber = val; /* Remember value for emit_reloc. */
|
2007-05-03 23:55:38 +08:00
|
|
|
|
return;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
|
|
|
|
|
|| fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
switch (fixP->fx_size)
|
|
|
|
|
{
|
2001-11-16 05:29:00 +08:00
|
|
|
|
/* The cast to offsetT below are necessary to make code
|
|
|
|
|
correct for machines where ints are smaller than offsetT. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 1:
|
|
|
|
|
*buf++ = val;
|
|
|
|
|
upper_limit = 0x7f;
|
|
|
|
|
lower_limit = - (offsetT) 0x80;
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
*buf++ = (val >> 8);
|
|
|
|
|
*buf++ = val;
|
|
|
|
|
upper_limit = 0x7fff;
|
|
|
|
|
lower_limit = - (offsetT) 0x8000;
|
|
|
|
|
break;
|
|
|
|
|
case 4:
|
|
|
|
|
*buf++ = (val >> 24);
|
|
|
|
|
*buf++ = (val >> 16);
|
|
|
|
|
*buf++ = (val >> 8);
|
|
|
|
|
*buf++ = val;
|
|
|
|
|
upper_limit = 0x7fffffff;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
lower_limit = - (offsetT) 0x7fffffff - 1; /* Avoid constant overflow. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
BAD_CASE (fixP->fx_size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fix up a negative reloc. */
|
|
|
|
|
if (fixP->fx_addsy == NULL && fixP->fx_subsy != NULL)
|
|
|
|
|
{
|
|
|
|
|
fixP->fx_addsy = fixP->fx_subsy;
|
|
|
|
|
fixP->fx_subsy = NULL;
|
|
|
|
|
fixP->fx_tcbit = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* For non-pc-relative values, it's conceivable we might get something
|
|
|
|
|
like "0xff" for a byte field. So extend the upper part of the range
|
|
|
|
|
to accept such numbers. We arbitrarily disallow "-0xff" or "0xff+0xff",
|
|
|
|
|
so that we can do any range checking at all. */
|
|
|
|
|
if (! fixP->fx_pcrel && ! fixP->fx_signed)
|
|
|
|
|
upper_limit = upper_limit * 2 + 1;
|
|
|
|
|
|
|
|
|
|
if ((addressT) val > upper_limit
|
|
|
|
|
&& (val > 0 || val < lower_limit))
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fixP->fx_file, fixP->fx_line,
|
|
|
|
|
_("value %ld out of range"), (long)val);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* A one byte PC-relative reloc means a short branch. We can't use
|
|
|
|
|
a short branch with a value of 0 or -1, because those indicate
|
|
|
|
|
different opcodes (branches with longer offsets). fixup_segment
|
|
|
|
|
in write.c may have clobbered fx_pcrel, so we need to examine the
|
|
|
|
|
reloc type. */
|
|
|
|
|
if ((fixP->fx_pcrel
|
* README-vms: Delete.
* config-gas.com: Delete.
* makefile.vms: Delete.
* vmsconf.sh: Delete.
* config/atof-tahoe.c: Delete.
* config/m88k-opcode.h: Delete.
* config/obj-bout.c: Delete.
* config/obj-bout.h: Delete.
* config/obj-hp300.c: Delete.
* config/obj-hp300.h: Delete.
* config/tc-a29k.c: Delete.
* config/tc-a29k.h: Delete.
* config/tc-h8500.c: Delete.
* config/tc-h8500.h: Delete.
* config/tc-m88k.c: Delete.
* config/tc-m88k.h: Delete.
* config/tc-tahoe.c: Delete.
* config/tc-tahoe.h: Delete.
* config/tc-tic80.c: Delete.
* config/tc-tic80.h: Delete.
* config/tc-w65.c: Delete.
* config/tc-w65.h: Delete.
* config/te-aux.h: Delete.
* config/te-delt88.h: Delete.
* config/te-delta.h: Delete.
* config/te-dpx2.h: Delete.
* config/te-hp300.h: Delete.
* config/te-ic960.h: Delete.
* config/vms-a-conf.h: Delete.
* doc/c-a29k.texi: Delete.
* doc/c-h8500.texi: Delete.
* doc/c-m88k.texi: Delete.
* README: Remove obsolete examples, and list of supported targets.
* Makefile.am: Remove a29k, h8500, m88k, tahoe, tic80, w65,
bout and hp300 support.
(DEP_FLAGS): Don't define BFD_ASSEMBLER.
* configure.in: Remove --enable-bfd-assembler, need_bfd,
primary_bfd_gas.
* configure.tgt: Remove a29k, h8300-coff, h8500-*, i960 non-elf,
m68k non bfd, m88k, or32-coff, tic80-*, vax non-bfd, w65k-*, *-nindy.
* as.c: Remove all non-BFD_ASSEMBLER code, support for above targets.
* as.h: Likewise.
* dw2gencfi.c: Likewise.
* dwarf2dbg.c: Likewise.
* ehopt.c: Likewise.
* input-file.c: Likewise.
* listing.c: Likewise.
* literal.c: Likewise.
* messages.c: Likewise.
* obj.h: Likewise.
* output-file.c: Likewise.
* read.c: Likewise.
* stabs.c: Likewise.
* struc-symbol.h: Likewise.
* subsegs.c: Likewise.
* subsegs.h: Likewise.
* symbols.c: Likewise.
* symbols.h: Likewise.
* tc.h: Likewise.
* write.c: Likewise.
* write.h: Likewise.
* config/aout_gnu.h: Likewise.
* config/obj-aout.c: Likewise.
* config/obj-aout.h: Likewise.
* config/obj-coff.c: Likewise.
* config/obj-coff.h: Likewise.
* config/obj-evax.h: Likewise.
* config/obj-ieee.h: Likewise.
* config/tc-arm.c: Likewise.
* config/tc-arm.h: Likewise.
* config/tc-avr.c: Likewise.
* config/tc-avr.h: Likewise.
* config/tc-crx.h: Likewise.
* config/tc-d10v.h: Likewise.
* config/tc-d30v.h: Likewise.
* config/tc-dlx.h: Likewise.
* config/tc-fr30.h: Likewise.
* config/tc-frv.h: Likewise.
* config/tc-h8300.c: Likewise.
* config/tc-h8300.h: Likewise.
* config/tc-hppa.h: Likewise.
* config/tc-i370.h: Likewise.
* config/tc-i386.c: Likewise.
* config/tc-i386.h: Likewise.
* config/tc-i860.h: Likewise.
* config/tc-i960.c: Likewise.
* config/tc-i960.h: Likewise.
* config/tc-ip2k.h: Likewise.
* config/tc-iq2000.h: Likewise.
* config/tc-m32c.h: Likewise.
* config/tc-m32r.h: Likewise.
* config/tc-m68hc11.h: Likewise.
* config/tc-m68k.c: Likewise.
* config/tc-m68k.h: Likewise.
* config/tc-maxq.c: Likewise.
* config/tc-maxq.h: Likewise.
* config/tc-mcore.c: Likewise.
* config/tc-mcore.h: Likewise.
* config/tc-mn10200.h: Likewise.
* config/tc-mn10300.c: Likewise.
* config/tc-mn10300.h: Likewise.
* config/tc-ms1.h: Likewise.
* config/tc-msp430.c: Likewise.
* config/tc-msp430.h: Likewise.
* config/tc-ns32k.c: Likewise.
* config/tc-ns32k.h: Likewise.
* config/tc-openrisc.h: Likewise.
* config/tc-or32.c: Likewise.
* config/tc-or32.h: Likewise.
* config/tc-ppc.c: Likewise.
* config/tc-ppc.h: Likewise.
* config/tc-s390.h: Likewise.
* config/tc-sh.c: Likewise.
* config/tc-sh.h: Likewise.
* config/tc-sparc.c: Likewise.
* config/tc-tic30.c: Likewise.
* config/tc-tic30.h: Likewise.
* config/tc-tic4x.c: Likewise.
* config/tc-tic4x.h: Likewise.
* config/tc-tic54x.c: Likewise.
* config/tc-tic54x.h: Likewise.
* config/tc-v850.h: Likewise.
* config/tc-vax.c: Likewise.
* config/tc-vax.h: Likewise.
* config/tc-xstormy16.h: Likewise.
* config/tc-xtensa.h: Likewise.
* config/tc-z8k.c: Likewise.
* config/tc-z8k.h: Likewise.
* config/vms-a-conf.h
* doc/Makefile.am: Likewise.
* doc/all.texi: Likewise.
* doc/as.texinfo: Likewise.
* doc/Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.
* config.in: Regenerate.
* po/POTFILES.in: Regenerate.
2005-08-11 09:25:29 +08:00
|
|
|
|
|| fixP->fx_r_type == BFD_RELOC_8_PCREL)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
&& fixP->fx_size == 1
|
|
|
|
|
&& (fixP->fx_addsy == NULL
|
|
|
|
|
|| S_IS_DEFINED (fixP->fx_addsy))
|
|
|
|
|
&& (val == 0 || val == -1))
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fixP->fx_file, fixP->fx_line,
|
|
|
|
|
_("invalid byte branch offset"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* *fragP has been relaxed to its final size, and now needs to have
|
|
|
|
|
the bytes inside it modified to conform to the new size There is UGLY
|
|
|
|
|
MAGIC here. ..
|
|
|
|
|
*/
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_convert_frag_1 (fragS *fragP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
long disp;
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixS *fixP = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Address in object code of the displacement. */
|
|
|
|
|
register int object_address = fragP->fr_fix + fragP->fr_address;
|
|
|
|
|
|
|
|
|
|
/* Address in gas core of the place to store the displacement. */
|
|
|
|
|
/* This convinces the native rs6000 compiler to generate the code we
|
2000-09-12 03:49:46 +08:00
|
|
|
|
want. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
register char *buffer_address = fragP->fr_literal;
|
|
|
|
|
buffer_address += fragP->fr_fix;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* End ibm compiler workaround. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The displacement of the address, from current location. */
|
|
|
|
|
disp = fragP->fr_symbol ? S_GET_VALUE (fragP->fr_symbol) : 0;
|
|
|
|
|
disp = (disp + fragP->fr_offset) - object_address;
|
|
|
|
|
|
|
|
|
|
switch (fragP->fr_subtype)
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRANCHBWL, BYTE):
|
|
|
|
|
case TAB (BRABSJUNC, BYTE):
|
|
|
|
|
case TAB (BRABSJCOND, BYTE):
|
|
|
|
|
case TAB (BRANCHBW, BYTE):
|
2007-09-25 23:31:05 +08:00
|
|
|
|
case TAB (BRANCHBWPL, BYTE):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
know (issbyte (disp));
|
|
|
|
|
if (disp == 0)
|
2001-06-21 14:12:11 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("short branch with zero offset: use :w"));
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix - 1, 1, fragP->fr_symbol,
|
2000-10-19 01:42:27 +08:00
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC8);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP->fx_pcrel_adjust = -1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRANCHBWL, SHORT):
|
|
|
|
|
case TAB (BRABSJUNC, SHORT):
|
|
|
|
|
case TAB (BRABSJCOND, SHORT):
|
|
|
|
|
case TAB (BRANCHBW, SHORT):
|
2007-09-25 23:31:05 +08:00
|
|
|
|
case TAB (BRANCHBWPL, SHORT):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fragP->fr_opcode[1] = 0x00;
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (BRANCHBWL, LONG):
|
|
|
|
|
fragP->fr_opcode[1] = (char) 0xFF;
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2007-09-25 23:31:05 +08:00
|
|
|
|
case TAB (BRANCHBWPL, LONG):
|
|
|
|
|
/* Here we are converting an unconditional branch into a pair of
|
|
|
|
|
conditional branches, in order to get the range. */
|
|
|
|
|
fragP->fr_opcode[0] = 0x66; /* bne */
|
|
|
|
|
fragP->fr_opcode[1] = 0xFF;
|
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
|
|
|
|
fixP->fx_file = fragP->fr_file;
|
|
|
|
|
fixP->fx_line = fragP->fr_line;
|
|
|
|
|
fragP->fr_fix += 4; /* Skip first offset */
|
|
|
|
|
buffer_address += 4;
|
|
|
|
|
*buffer_address++ = 0x67; /* beq */
|
|
|
|
|
*buffer_address++ = 0xff;
|
|
|
|
|
fragP->fr_fix += 2; /* Skip second branch opcode */
|
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRABSJUNC, LONG):
|
|
|
|
|
if (fragP->fr_opcode[0] == 0x61) /* jbsr */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (flag_keep_pcrel)
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of PC relative BSR to absolute JSR"));
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_opcode[0] = 0x4E;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_opcode[1] = (char) 0xB9; /* JSR with ABSL LONG operand. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 0, RELAX_RELOC_ABS32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
}
|
|
|
|
|
else if (fragP->fr_opcode[0] == 0x60) /* jbra */
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (flag_keep_pcrel)
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of PC relative branch to absolute jump"));
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_opcode[0] = 0x4E;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_opcode[1] = (char) 0xF9; /* JMP with ABSL LONG operand. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 0, RELAX_RELOC_ABS32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* This cannot happen, because jbsr and jbra are the only two
|
|
|
|
|
unconditional branches. */
|
|
|
|
|
abort ();
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRABSJCOND, LONG):
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (flag_keep_pcrel)
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of PC relative conditional branch to absolute jump"));
|
2000-09-12 03:49:46 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Only Bcc 68000 instructions can come here
|
|
|
|
|
Change bcc into b!cc/jmp absl long. */
|
|
|
|
|
fragP->fr_opcode[0] ^= 0x01; /* Invert bcc. */
|
|
|
|
|
fragP->fr_opcode[1] = 0x06; /* Branch offset = 6. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* JF: these used to be fr_opcode[2,3], but they may be in a
|
2003-11-22 10:35:31 +08:00
|
|
|
|
different frag, in which case referring to them is a no-no.
|
2000-09-12 03:49:46 +08:00
|
|
|
|
Only fr_opcode[0,1] are guaranteed to work. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*buffer_address++ = 0x4e; /* put in jmp long (0x4ef9) */
|
|
|
|
|
*buffer_address++ = (char) 0xf9;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_fix += 2; /* Account for jmp instruction. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 0, RELAX_RELOC_ABS32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (FBRANCH, SHORT):
|
|
|
|
|
know ((fragP->fr_opcode[1] & 0x40) == 0);
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (FBRANCH, LONG):
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_opcode[1] |= 0x40; /* Turn on LONG bit. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (DBCCLBR, SHORT):
|
|
|
|
|
case TAB (DBCCABSJ, SHORT):
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (DBCCLBR, LONG):
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Only DBcc instructions can come here.
|
|
|
|
|
Change dbcc into dbcc/bral.
|
|
|
|
|
JF: these used to be fr_opcode[2-7], but that's wrong. */
|
|
|
|
|
if (flag_keep_pcrel)
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of DBcc to absolute jump"));
|
2000-08-01 06:08:14 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
*buffer_address++ = 0x00; /* Branch offset = 4. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*buffer_address++ = 0x04;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
*buffer_address++ = 0x60; /* Put in bra pc+6. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*buffer_address++ = 0x06;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
*buffer_address++ = 0x60; /* Put in bral (0x60ff). */
|
|
|
|
|
*buffer_address++ = (char) 0xff;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_fix += 6; /* Account for bra/jmp instructions. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (DBCCABSJ, LONG):
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Only DBcc instructions can come here.
|
|
|
|
|
Change dbcc into dbcc/jmp.
|
|
|
|
|
JF: these used to be fr_opcode[2-7], but that's wrong. */
|
|
|
|
|
if (flag_keep_pcrel)
|
2007-05-17 21:10:42 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of PC relative conditional branch to absolute jump"));
|
2000-09-23 01:33:55 +08:00
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
*buffer_address++ = 0x00; /* Branch offset = 4. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
*buffer_address++ = 0x04;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
*buffer_address++ = 0x60; /* Put in bra pc + 6. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
*buffer_address++ = 0x06;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
*buffer_address++ = 0x4e; /* Put in jmp long (0x4ef9). */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
*buffer_address++ = (char) 0xf9;
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
fragP->fr_fix += 6; /* Account for bra/jmp instructions. */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 0, RELAX_RELOC_ABS32);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (PCREL1632, SHORT):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fragP->fr_opcode[1] &= ~0x3F;
|
|
|
|
|
fragP->fr_opcode[1] |= 0x3A; /* 072 - mode 7.2 */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, (int) (fragP->fr_fix), 2, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (PCREL1632, LONG):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Already set to mode 7.3; this indicates: PC indirect with
|
|
|
|
|
suppressed index, 32-bit displacement. */
|
|
|
|
|
*buffer_address++ = 0x01;
|
|
|
|
|
*buffer_address++ = 0x70;
|
|
|
|
|
fragP->fr_fix += 2;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP = fix_new (fragP, (int) (fragP->fr_fix), 4, fragP->fr_symbol,
|
2000-10-19 01:42:27 +08:00
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP->fx_pcrel_adjust = 2;
|
|
|
|
|
fragP->fr_fix += 4;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case TAB (PCINDEX, BYTE):
|
* gas/app, gas/as.c, gas/as.h, gas/atof-generic.c, gas/cgen.c,
gas/config/atof-ieee.c, gas/config/obj-aout.c,
gas/config/obj-coff.c, gas/config/obj-ecoff.c,
gas/config/obj-elf.c, gas/config/obj-som.c, gas/config/tc-alpha.c,
gas/config/tc-arc.c, gas/config/tc-arm.c, gas/config/tc-cr16.c,
gas/config/tc-cris.c, gas/config/tc-crx.c, gas/config/tc-d30v.c,
gas/config/tc-dlx.c, gas/config/tc-hppa.c, gas/config/tc-i370.c,
gas/config/tc-i386-intel.c, gas/config/tc-i386.c,
gas/config/tc-i860.c, gas/config/tc-i960.c, gas/config/tc-ia64.c,
gas/config/tc-iq2000.c, gas/config/tc-m32c.c,
gas/config/tc-m32r.c, gas/config/tc-m68hc11.c,
gas/config/tc-m68k.c, gas/config/tc-maxq.c, gas/config/tc-mcore.c,
gas/config/tc-mep.c, gas/config/tc-mips.c, gas/config/tc-mmix.c,
gas/config/tc-mn10300.c, gas/config/tc-moxie.c,
gas/config/tc-ns32k.c, gas/config/tc-pj.c, gas/config/tc-ppc.c,
gas/config/tc-s390.c, gas/config/tc-score.c,
gas/config/tc-score7.c, gas/config/tc-sh.c, gas/config/tc-sparc.c,
gas/config/tc-spu.c, gas/config/tc-tic30.c, gas/config/tc-vax.c,
gas/config/tc-xtensa.c, gas/config/xtensa-relax.c,
gas/dw2gencfi.c, gas/dwarf2dbg.c, gas/ehopt.c, gas/expr.c,
gas/frags.c, gas/input-file.c, gas/read.c, gas/sb.c,
gas/subsegs.c, gas/symbols.c, gas/write.c: Change the name of the
gas macro `assert' to `gas_assert'.
2009-06-23 01:56:02 +08:00
|
|
|
|
gas_assert (fragP->fr_fix >= 2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
buffer_address[-2] &= ~1;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix - 1, 1, fragP->fr_symbol,
|
2000-10-19 01:42:27 +08:00
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC8);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP->fx_pcrel_adjust = 1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case TAB (PCINDEX, SHORT):
|
* gas/app, gas/as.c, gas/as.h, gas/atof-generic.c, gas/cgen.c,
gas/config/atof-ieee.c, gas/config/obj-aout.c,
gas/config/obj-coff.c, gas/config/obj-ecoff.c,
gas/config/obj-elf.c, gas/config/obj-som.c, gas/config/tc-alpha.c,
gas/config/tc-arc.c, gas/config/tc-arm.c, gas/config/tc-cr16.c,
gas/config/tc-cris.c, gas/config/tc-crx.c, gas/config/tc-d30v.c,
gas/config/tc-dlx.c, gas/config/tc-hppa.c, gas/config/tc-i370.c,
gas/config/tc-i386-intel.c, gas/config/tc-i386.c,
gas/config/tc-i860.c, gas/config/tc-i960.c, gas/config/tc-ia64.c,
gas/config/tc-iq2000.c, gas/config/tc-m32c.c,
gas/config/tc-m32r.c, gas/config/tc-m68hc11.c,
gas/config/tc-m68k.c, gas/config/tc-maxq.c, gas/config/tc-mcore.c,
gas/config/tc-mep.c, gas/config/tc-mips.c, gas/config/tc-mmix.c,
gas/config/tc-mn10300.c, gas/config/tc-moxie.c,
gas/config/tc-ns32k.c, gas/config/tc-pj.c, gas/config/tc-ppc.c,
gas/config/tc-s390.c, gas/config/tc-score.c,
gas/config/tc-score7.c, gas/config/tc-sh.c, gas/config/tc-sparc.c,
gas/config/tc-spu.c, gas/config/tc-tic30.c, gas/config/tc-vax.c,
gas/config/tc-xtensa.c, gas/config/xtensa-relax.c,
gas/dw2gencfi.c, gas/dwarf2dbg.c, gas/ehopt.c, gas/expr.c,
gas/frags.c, gas/input-file.c, gas/read.c, gas/sb.c,
gas/subsegs.c, gas/symbols.c, gas/write.c: Change the name of the
gas macro `assert' to `gas_assert'.
2009-06-23 01:56:02 +08:00
|
|
|
|
gas_assert (fragP->fr_fix >= 2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
buffer_address[-2] |= 0x1;
|
|
|
|
|
buffer_address[-1] = 0x20;
|
|
|
|
|
fixP = fix_new (fragP, (int) (fragP->fr_fix), 2, fragP->fr_symbol,
|
2000-10-19 01:42:27 +08:00
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
fixP->fx_pcrel_adjust = 2;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case TAB (PCINDEX, LONG):
|
* gas/app, gas/as.c, gas/as.h, gas/atof-generic.c, gas/cgen.c,
gas/config/atof-ieee.c, gas/config/obj-aout.c,
gas/config/obj-coff.c, gas/config/obj-ecoff.c,
gas/config/obj-elf.c, gas/config/obj-som.c, gas/config/tc-alpha.c,
gas/config/tc-arc.c, gas/config/tc-arm.c, gas/config/tc-cr16.c,
gas/config/tc-cris.c, gas/config/tc-crx.c, gas/config/tc-d30v.c,
gas/config/tc-dlx.c, gas/config/tc-hppa.c, gas/config/tc-i370.c,
gas/config/tc-i386-intel.c, gas/config/tc-i386.c,
gas/config/tc-i860.c, gas/config/tc-i960.c, gas/config/tc-ia64.c,
gas/config/tc-iq2000.c, gas/config/tc-m32c.c,
gas/config/tc-m32r.c, gas/config/tc-m68hc11.c,
gas/config/tc-m68k.c, gas/config/tc-maxq.c, gas/config/tc-mcore.c,
gas/config/tc-mep.c, gas/config/tc-mips.c, gas/config/tc-mmix.c,
gas/config/tc-mn10300.c, gas/config/tc-moxie.c,
gas/config/tc-ns32k.c, gas/config/tc-pj.c, gas/config/tc-ppc.c,
gas/config/tc-s390.c, gas/config/tc-score.c,
gas/config/tc-score7.c, gas/config/tc-sh.c, gas/config/tc-sparc.c,
gas/config/tc-spu.c, gas/config/tc-tic30.c, gas/config/tc-vax.c,
gas/config/tc-xtensa.c, gas/config/xtensa-relax.c,
gas/dw2gencfi.c, gas/dwarf2dbg.c, gas/ehopt.c, gas/expr.c,
gas/frags.c, gas/input-file.c, gas/read.c, gas/sb.c,
gas/subsegs.c, gas/symbols.c, gas/write.c: Change the name of the
gas macro `assert' to `gas_assert'.
2009-06-23 01:56:02 +08:00
|
|
|
|
gas_assert (fragP->fr_fix >= 2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
buffer_address[-2] |= 0x1;
|
|
|
|
|
buffer_address[-1] = 0x30;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP = fix_new (fragP, (int) (fragP->fr_fix), 4, fragP->fr_symbol,
|
2000-10-19 01:42:27 +08:00
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fixP->fx_pcrel_adjust = 2;
|
|
|
|
|
fragP->fr_fix += 4;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (ABSTOPCREL, SHORT):
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 2, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 1, RELAX_RELOC_PC16);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 2;
|
|
|
|
|
break;
|
|
|
|
|
case TAB (ABSTOPCREL, LONG):
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (flag_keep_pcrel)
|
2008-03-28 17:51:13 +08:00
|
|
|
|
as_bad_where (fragP->fr_file, fragP->fr_line,
|
|
|
|
|
_("Conversion of PC relative displacement to absolute"));
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* The thing to do here is force it to ABSOLUTE LONG, since
|
2003-10-17 18:50:27 +08:00
|
|
|
|
ABSTOPCREL is really trying to shorten an ABSOLUTE address anyway. */
|
2000-09-23 01:33:55 +08:00
|
|
|
|
if ((fragP->fr_opcode[1] & 0x3F) != 0x3A)
|
|
|
|
|
abort ();
|
|
|
|
|
fragP->fr_opcode[1] &= ~0x3F;
|
|
|
|
|
fragP->fr_opcode[1] |= 0x39; /* Mode 7.1 */
|
2007-05-17 21:10:42 +08:00
|
|
|
|
fixP = fix_new (fragP, fragP->fr_fix, 4, fragP->fr_symbol,
|
|
|
|
|
fragP->fr_offset, 0, RELAX_RELOC_ABS32);
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_fix += 4;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
2007-05-17 21:10:42 +08:00
|
|
|
|
if (fixP)
|
|
|
|
|
{
|
|
|
|
|
fixP->fx_file = fragP->fr_file;
|
|
|
|
|
fixP->fx_line = fragP->fr_line;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
|
|
|
|
|
segT sec ATTRIBUTE_UNUSED,
|
|
|
|
|
fragS *fragP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
md_convert_frag_1 (fragP);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Force truly undefined symbols to their maximum size, and generally set up
|
|
|
|
|
the frag list to be relaxed
|
|
|
|
|
*/
|
|
|
|
|
int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_estimate_size_before_relax (fragS *fragP, segT segment)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Handle SZ_UNDEF first, it can be changed to BYTE or SHORT. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (fragP->fr_subtype)
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRANCHBWL, SZ_UNDEF):
|
2007-09-25 23:31:05 +08:00
|
|
|
|
case TAB (BRANCHBWPL, SZ_UNDEF):
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRABSJUNC, SZ_UNDEF):
|
|
|
|
|
case TAB (BRABSJCOND, SZ_UNDEF):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
if (S_GET_SEGMENT (fragP->fr_symbol) == segment
|
|
|
|
|
&& relaxable_symbol (fragP->fr_symbol))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), BYTE);
|
|
|
|
|
}
|
|
|
|
|
else if (flag_short_refs)
|
|
|
|
|
{
|
|
|
|
|
/* Symbol is undefined and we want short ref. */
|
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Symbol is still undefined. Make it LONG. */
|
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), LONG);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRANCHBW, SZ_UNDEF):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
if (S_GET_SEGMENT (fragP->fr_symbol) == segment
|
|
|
|
|
&& relaxable_symbol (fragP->fr_symbol))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), BYTE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Symbol is undefined and we don't have long branches. */
|
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (FBRANCH, SZ_UNDEF):
|
|
|
|
|
case TAB (DBCCLBR, SZ_UNDEF):
|
|
|
|
|
case TAB (DBCCABSJ, SZ_UNDEF):
|
2001-05-08 21:13:56 +08:00
|
|
|
|
case TAB (PCREL1632, SZ_UNDEF):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2001-01-26 04:26:17 +08:00
|
|
|
|
if ((S_GET_SEGMENT (fragP->fr_symbol) == segment
|
|
|
|
|
&& relaxable_symbol (fragP->fr_symbol))
|
2000-09-23 01:33:55 +08:00
|
|
|
|
|| flag_short_refs)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), LONG);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
break;
|
2000-09-23 01:33:55 +08:00
|
|
|
|
}
|
2000-09-26 15:09:19 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case TAB (PCINDEX, SZ_UNDEF):
|
|
|
|
|
if ((S_GET_SEGMENT (fragP->fr_symbol) == segment
|
2000-09-23 01:33:55 +08:00
|
|
|
|
&& relaxable_symbol (fragP->fr_symbol)))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
fragP->fr_subtype = TAB (PCINDEX, BYTE);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fragP->fr_subtype = TAB (PCINDEX, LONG);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (ABSTOPCREL, SZ_UNDEF):
|
|
|
|
|
{
|
|
|
|
|
if ((S_GET_SEGMENT (fragP->fr_symbol) == segment
|
|
|
|
|
&& relaxable_symbol (fragP->fr_symbol)))
|
|
|
|
|
{
|
|
|
|
|
fragP->fr_subtype = TAB (ABSTOPCREL, SHORT);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fragP->fr_subtype = TAB (ABSTOPCREL, LONG);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2000-09-23 01:33:55 +08:00
|
|
|
|
/* Now that SZ_UNDEF are taken care of, check others. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
switch (fragP->fr_subtype)
|
|
|
|
|
{
|
2000-09-23 01:33:55 +08:00
|
|
|
|
case TAB (BRANCHBWL, BYTE):
|
|
|
|
|
case TAB (BRABSJUNC, BYTE):
|
|
|
|
|
case TAB (BRABSJCOND, BYTE):
|
|
|
|
|
case TAB (BRANCHBW, BYTE):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* We can't do a short jump to the next instruction, so in that
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
case we force word mode. If the symbol is at the start of a
|
|
|
|
|
frag, and it is the next frag with any data in it (usually
|
|
|
|
|
this is just the next frag, but assembler listings may
|
|
|
|
|
introduce empty frags), we must use word mode. */
|
|
|
|
|
if (fragP->fr_symbol)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
fragS *sym_frag;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
sym_frag = symbol_get_frag (fragP->fr_symbol);
|
|
|
|
|
if (S_GET_VALUE (fragP->fr_symbol) == sym_frag->fr_address)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
fragS *l;
|
|
|
|
|
|
2002-01-03 01:19:07 +08:00
|
|
|
|
for (l = fragP->fr_next; l && l != sym_frag; l = l->fr_next)
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
if (l->fr_fix != 0)
|
|
|
|
|
break;
|
|
|
|
|
if (l == sym_frag)
|
|
|
|
|
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
* symbols.c (S_GET_VALUE): Don't treat O_constant and local
symbols specially. Always resolve, adding fr_address to value.
* write.c (write_object_file): Don't add fr_address to sym values.
(relax_frag): Likewise.
(relax_segment): Likewise.
* config/obj-ieee.c (do_symbols): Likewise.
* config/tc-cris.c (md_convert_frag): Likewise.
* config/tc-fr30.c (md_convert_frag): Likewise.
* config/tc-i386.c (md_convert_frag): Likewise.
* config/tc-m32r.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-mcore.c (md_convert_frag): Likewise.
* config/tc-mips.c (mips16_extended_frag): Likewise.
* config/tc-ns32k.c (md_convert_frag): Likewise.
* config/tc-m68k.c (md_convert_frag_1): Likewise.
(BRANCHBWL, BRABSJUNC, BRABSJCOND, BRANCHBW, FBRANCH, DBCCLBR,
DBCCABSJ, PCREL1632, PCINDEX, ABSTOPCREL): Decrement.
(md_relax_table): Remove first four entries. Format.
(md_estimate_size_before_relax): Remove old_fix. Don't bother
setting fr_var. Simplify byte branch checks.
2001-07-23 21:03:40 +08:00
|
|
|
|
return md_relax_table[fragP->fr_subtype].rlx_length;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if defined(OBJ_AOUT) | defined(OBJ_BOUT)
|
|
|
|
|
/* the bit-field entries in the relocation_info struct plays hell
|
|
|
|
|
with the byte-order problems of cross-assembly. So as a hack,
|
|
|
|
|
I added this mach. dependent ri twiddler. Ugly, but it gets
|
2003-10-17 18:50:27 +08:00
|
|
|
|
you there. -KWK */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* on m68k: first 4 bytes are normal unsigned long, next three bytes
|
|
|
|
|
are symbolnum, most sig. byte first. Last byte is broken up with
|
|
|
|
|
bit 7 as pcrel, bits 6 & 5 as length, bit 4 as pcrel, and the lower
|
|
|
|
|
nibble as nuthin. (on Sun 3 at least) */
|
|
|
|
|
/* Translate the internal relocation information into target-specific
|
2000-09-12 03:49:46 +08:00
|
|
|
|
format. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#ifdef comment
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_ri_to_chars (char *the_bytes, struct reloc_info_generic *ri)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* This is easy. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
md_number_to_chars (the_bytes, ri->r_address, 4);
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Now the fun stuff. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
the_bytes[4] = (ri->r_symbolnum >> 16) & 0x0ff;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
the_bytes[5] = (ri->r_symbolnum >> 8) & 0x0ff;
|
|
|
|
|
the_bytes[6] = ri->r_symbolnum & 0x0ff;
|
2004-07-11 23:20:30 +08:00
|
|
|
|
the_bytes[7] = (((ri->r_pcrel << 7) & 0x80)
|
|
|
|
|
| ((ri->r_length << 5) & 0x60)
|
|
|
|
|
| ((ri->r_extern << 4) & 0x10));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
#endif
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#endif /* OBJ_AOUT or OBJ_BOUT */
|
|
|
|
|
|
|
|
|
|
#ifndef WORKING_DOT_WORD
|
2004-11-03 09:54:25 +08:00
|
|
|
|
int md_short_jump_size = 4;
|
|
|
|
|
int md_long_jump_size = 6;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_create_short_jump (char *ptr, addressT from_addr, addressT to_addr,
|
|
|
|
|
fragS *frag ATTRIBUTE_UNUSED,
|
|
|
|
|
symbolS *to_symbol ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
valueT offset;
|
|
|
|
|
|
|
|
|
|
offset = to_addr - (from_addr + 2);
|
|
|
|
|
|
|
|
|
|
md_number_to_chars (ptr, (valueT) 0x6000, 2);
|
|
|
|
|
md_number_to_chars (ptr + 2, (valueT) offset, 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_create_long_jump (char *ptr, addressT from_addr, addressT to_addr,
|
|
|
|
|
fragS *frag, symbolS *to_symbol)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
valueT offset;
|
|
|
|
|
|
2004-05-05 22:33:14 +08:00
|
|
|
|
if (!HAVE_LONG_BRANCH (current_architecture))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (flag_keep_pcrel)
|
2004-05-05 22:33:14 +08:00
|
|
|
|
as_fatal (_("Tried to convert PC relative branch to absolute jump"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
offset = to_addr - S_GET_VALUE (to_symbol);
|
|
|
|
|
md_number_to_chars (ptr, (valueT) 0x4EF9, 2);
|
|
|
|
|
md_number_to_chars (ptr + 2, (valueT) offset, 4);
|
|
|
|
|
fix_new (frag, (ptr + 2) - frag->fr_literal, 4, to_symbol, (offsetT) 0,
|
|
|
|
|
0, NO_RELOC);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
offset = to_addr - (from_addr + 2);
|
|
|
|
|
md_number_to_chars (ptr, (valueT) 0x60ff, 2);
|
|
|
|
|
md_number_to_chars (ptr + 2, (valueT) offset, 4);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Different values of OK tell what its OK to return. Things that
|
|
|
|
|
aren't OK are an error (what a shock, no?)
|
|
|
|
|
|
|
|
|
|
0: Everything is OK
|
2003-10-21 21:28:59 +08:00
|
|
|
|
10: Absolute 1:8 only
|
|
|
|
|
20: Absolute 0:7 only
|
|
|
|
|
30: absolute 0:15 only
|
|
|
|
|
40: Absolute 0:31 only
|
|
|
|
|
50: absolute 0:127 only
|
1999-05-03 15:29:11 +08:00
|
|
|
|
55: absolute -64:63 only
|
2003-10-21 21:28:59 +08:00
|
|
|
|
60: absolute -128:127 only
|
2007-07-03 15:54:19 +08:00
|
|
|
|
65: absolute 0:511 only
|
2003-10-21 21:28:59 +08:00
|
|
|
|
70: absolute 0:4095 only
|
|
|
|
|
80: absolute -1, 1:7 only
|
|
|
|
|
90: No bignums. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
get_num (struct m68k_exp *exp, int ok)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (exp->exp.X_op == O_absent)
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Do the same thing the VAX asm does. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
op (exp) = O_constant;
|
|
|
|
|
adds (exp) = 0;
|
|
|
|
|
subs (exp) = 0;
|
|
|
|
|
offs (exp) = 0;
|
|
|
|
|
if (ok == 10)
|
|
|
|
|
{
|
|
|
|
|
as_warn (_("expression out of range: defaulting to 1"));
|
|
|
|
|
offs (exp) = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (exp->exp.X_op == O_constant)
|
|
|
|
|
{
|
|
|
|
|
switch (ok)
|
|
|
|
|
{
|
|
|
|
|
case 10:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) - 1 > 7)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
as_warn (_("expression out of range: defaulting to 1"));
|
|
|
|
|
offs (exp) = 1;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 20:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 7)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
|
|
|
|
break;
|
|
|
|
|
case 30:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 15)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
|
|
|
|
break;
|
|
|
|
|
case 40:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 32)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
|
|
|
|
break;
|
|
|
|
|
case 50:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 127)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
|
|
|
|
break;
|
|
|
|
|
case 55:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) SEXT (offs (exp)) + 64 > 127)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
|
|
|
|
break;
|
|
|
|
|
case 60:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) SEXT (offs (exp)) + 128 > 255)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
goto outrange;
|
2007-07-03 15:54:19 +08:00
|
|
|
|
break;
|
|
|
|
|
case 65:
|
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 511)
|
|
|
|
|
goto outrange;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
|
|
|
|
case 70:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) > 4095)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
outrange:
|
|
|
|
|
as_warn (_("expression out of range: defaulting to 0"));
|
|
|
|
|
offs (exp) = 0;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2003-10-21 21:28:59 +08:00
|
|
|
|
case 80:
|
2005-03-21 10:25:23 +08:00
|
|
|
|
if ((valueT) TRUNC (offs (exp)) != 0xffffffff
|
|
|
|
|
&& (valueT) TRUNC (offs (exp)) - 1 > 6)
|
2003-10-21 21:28:59 +08:00
|
|
|
|
{
|
|
|
|
|
as_warn (_("expression out of range: defaulting to 1"));
|
|
|
|
|
offs (exp) = 1;
|
|
|
|
|
}
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (exp->exp.X_op == O_big)
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if (offs (exp) <= 0 /* flonum. */
|
2003-10-21 21:28:59 +08:00
|
|
|
|
&& (ok == 90 /* no bignums */
|
2003-10-17 18:50:27 +08:00
|
|
|
|
|| (ok > 10 /* Small-int ranges including 0 ok. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* If we have a flonum zero, a zero integer should
|
|
|
|
|
do as well (e.g., in moveq). */
|
|
|
|
|
&& generic_floating_point_number.exponent == 0
|
|
|
|
|
&& generic_floating_point_number.low[0] == 0)))
|
|
|
|
|
{
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* HACK! Turn it into a long. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
LITTLENUM_TYPE words[6];
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
gen_to_words (words, 2, 8L); /* These numbers are magic! */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
op (exp) = O_constant;
|
|
|
|
|
adds (exp) = 0;
|
|
|
|
|
subs (exp) = 0;
|
|
|
|
|
offs (exp) = words[1] | (words[0] << 16);
|
|
|
|
|
}
|
|
|
|
|
else if (ok != 0)
|
|
|
|
|
{
|
|
|
|
|
op (exp) = O_constant;
|
|
|
|
|
adds (exp) = 0;
|
|
|
|
|
subs (exp) = 0;
|
|
|
|
|
offs (exp) = (ok == 10) ? 1 : 0;
|
|
|
|
|
as_warn (_("Can't deal with expression; defaulting to %ld"),
|
2005-04-11 00:28:08 +08:00
|
|
|
|
(long) offs (exp));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-10-21 21:28:59 +08:00
|
|
|
|
if (ok >= 10 && ok <= 80)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
op (exp) = O_constant;
|
|
|
|
|
adds (exp) = 0;
|
|
|
|
|
subs (exp) = 0;
|
|
|
|
|
offs (exp) = (ok == 10) ? 1 : 0;
|
|
|
|
|
as_warn (_("Can't deal with expression; defaulting to %ld"),
|
2005-04-11 00:28:08 +08:00
|
|
|
|
(long) offs (exp));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (exp->size != SIZE_UNSPEC)
|
|
|
|
|
{
|
|
|
|
|
switch (exp->size)
|
|
|
|
|
{
|
|
|
|
|
case SIZE_UNSPEC:
|
|
|
|
|
case SIZE_LONG:
|
|
|
|
|
break;
|
|
|
|
|
case SIZE_BYTE:
|
|
|
|
|
if (!isbyte (offs (exp)))
|
|
|
|
|
as_warn (_("expression doesn't fit in BYTE"));
|
|
|
|
|
break;
|
|
|
|
|
case SIZE_WORD:
|
|
|
|
|
if (!isword (offs (exp)))
|
|
|
|
|
as_warn (_("expression doesn't fit in WORD"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return offs (exp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* These are the back-ends for the various machine dependent pseudo-ops. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_data1 (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
subseg_set (data_section, 1);
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_data2 (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
subseg_set (data_section, 2);
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_bss (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
/* We don't support putting frags in the BSS segment, we fake it
|
|
|
|
|
by marking in_bss, then looking at s_skip for clues. */
|
|
|
|
|
|
|
|
|
|
subseg_set (bss_section, 0);
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_even (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
register int temp;
|
|
|
|
|
register long temp_fill;
|
|
|
|
|
|
|
|
|
|
temp = 1; /* JF should be 2? */
|
|
|
|
|
temp_fill = get_absolute_expression ();
|
2000-09-12 03:49:46 +08:00
|
|
|
|
if (!need_pass_2) /* Never make frag if expect extra pass. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
frag_align (temp, (int) temp_fill, 0);
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
record_alignment (now_seg, temp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_proc (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pseudo-ops handled for MRI compatibility. */
|
|
|
|
|
|
|
|
|
|
/* This function returns non-zero if the argument is a conditional
|
|
|
|
|
pseudo-op. This is called when checking whether a pending
|
|
|
|
|
alignment is needed. */
|
|
|
|
|
|
|
|
|
|
int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_conditional_pseudoop (pseudo_typeS *pop)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
return (pop->poc_handler == s_mri_if
|
|
|
|
|
|| pop->poc_handler == s_mri_else);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle an MRI style chip specification. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
mri_chip (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
char c;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
s = input_line_pointer;
|
|
|
|
|
/* We can't use get_symbol_end since the processor names are not proper
|
|
|
|
|
symbols. */
|
|
|
|
|
while (is_part_of_name (c = *input_line_pointer++))
|
|
|
|
|
;
|
|
|
|
|
*--input_line_pointer = 0;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
for (i = 0; m68k_cpus[i].name; i++)
|
|
|
|
|
if (strcasecmp (s, m68k_cpus[i].name) == 0)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
break;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
if (!m68k_cpus[i].name)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
as_bad (_("%s: unrecognized processor name"), s);
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
|
|
|
|
|
if (*input_line_pointer == '/')
|
|
|
|
|
current_architecture = 0;
|
|
|
|
|
else
|
|
|
|
|
current_architecture &= m68881 | m68851;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
current_architecture |= m68k_cpus[i].arch & ~(m68881 | m68851);
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
control_regs = m68k_cpus[i].control_regs;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
while (*input_line_pointer == '/')
|
|
|
|
|
{
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
s = input_line_pointer;
|
|
|
|
|
/* We can't use get_symbol_end since the processor names are not
|
|
|
|
|
proper symbols. */
|
|
|
|
|
while (is_part_of_name (c = *input_line_pointer++))
|
|
|
|
|
;
|
|
|
|
|
*--input_line_pointer = 0;
|
|
|
|
|
if (strcmp (s, "68881") == 0)
|
|
|
|
|
current_architecture |= m68881;
|
|
|
|
|
else if (strcmp (s, "68851") == 0)
|
|
|
|
|
current_architecture |= m68851;
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The MRI CHIP pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_chip (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *stop = NULL;
|
|
|
|
|
char stopc;
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
stop = mri_comment_field (&stopc);
|
|
|
|
|
mri_chip ();
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
mri_comment_end (stop, stopc);
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The MRI FOPT pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_fopt (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
|
|
|
|
|
if (strncasecmp (input_line_pointer, "ID=", 3) == 0)
|
|
|
|
|
{
|
|
|
|
|
int temp;
|
|
|
|
|
|
|
|
|
|
input_line_pointer += 3;
|
|
|
|
|
temp = get_absolute_expression ();
|
|
|
|
|
if (temp < 0 || temp > 7)
|
|
|
|
|
as_bad (_("bad coprocessor id"));
|
|
|
|
|
else
|
|
|
|
|
m68k_float_copnum = COP0 + temp;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("unrecognized fopt option"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The structure used to handle the MRI OPT pseudo-op. */
|
|
|
|
|
|
|
|
|
|
struct opt_action
|
|
|
|
|
{
|
|
|
|
|
/* The name of the option. */
|
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
/* If this is not NULL, just call this function. The first argument
|
|
|
|
|
is the ARG field of this structure, the second argument is
|
|
|
|
|
whether the option was negated. */
|
2004-07-11 23:20:30 +08:00
|
|
|
|
void (*pfn) (int arg, int on);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* If this is not NULL, and the PFN field is NULL, set the variable
|
|
|
|
|
this points to. Set it to the ARG field if the option was not
|
|
|
|
|
negated, and the NOTARG field otherwise. */
|
|
|
|
|
int *pvar;
|
|
|
|
|
|
|
|
|
|
/* The value to pass to PFN or to assign to *PVAR. */
|
|
|
|
|
int arg;
|
|
|
|
|
|
|
|
|
|
/* The value to assign to *PVAR if the option is negated. If PFN is
|
|
|
|
|
NULL, and PVAR is not NULL, and ARG and NOTARG are the same, then
|
|
|
|
|
the option may not be negated. */
|
|
|
|
|
int notarg;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The table used to handle the MRI OPT pseudo-op. */
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
static void skip_to_comma (int, int);
|
|
|
|
|
static void opt_nest (int, int);
|
|
|
|
|
static void opt_chip (int, int);
|
|
|
|
|
static void opt_list (int, int);
|
|
|
|
|
static void opt_list_symbols (int, int);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static const struct opt_action opt_table[] =
|
|
|
|
|
{
|
|
|
|
|
{ "abspcadd", 0, &m68k_abspcadd, 1, 0 },
|
|
|
|
|
|
|
|
|
|
/* We do relaxing, so there is little use for these options. */
|
|
|
|
|
{ "b", 0, 0, 0, 0 },
|
|
|
|
|
{ "brs", 0, 0, 0, 0 },
|
|
|
|
|
{ "brb", 0, 0, 0, 0 },
|
|
|
|
|
{ "brl", 0, 0, 0, 0 },
|
|
|
|
|
{ "brw", 0, 0, 0, 0 },
|
|
|
|
|
|
|
|
|
|
{ "c", 0, 0, 0, 0 },
|
|
|
|
|
{ "cex", 0, 0, 0, 0 },
|
|
|
|
|
{ "case", 0, &symbols_case_sensitive, 1, 0 },
|
|
|
|
|
{ "cl", 0, 0, 0, 0 },
|
|
|
|
|
{ "cre", 0, 0, 0, 0 },
|
|
|
|
|
{ "d", 0, &flag_keep_locals, 1, 0 },
|
|
|
|
|
{ "e", 0, 0, 0, 0 },
|
|
|
|
|
{ "f", 0, &flag_short_refs, 1, 0 },
|
|
|
|
|
{ "frs", 0, &flag_short_refs, 1, 0 },
|
|
|
|
|
{ "frl", 0, &flag_short_refs, 0, 1 },
|
|
|
|
|
{ "g", 0, 0, 0, 0 },
|
|
|
|
|
{ "i", 0, 0, 0, 0 },
|
|
|
|
|
{ "m", 0, 0, 0, 0 },
|
|
|
|
|
{ "mex", 0, 0, 0, 0 },
|
|
|
|
|
{ "mc", 0, 0, 0, 0 },
|
|
|
|
|
{ "md", 0, 0, 0, 0 },
|
|
|
|
|
{ "nest", opt_nest, 0, 0, 0 },
|
|
|
|
|
{ "next", skip_to_comma, 0, 0, 0 },
|
|
|
|
|
{ "o", 0, 0, 0, 0 },
|
|
|
|
|
{ "old", 0, 0, 0, 0 },
|
|
|
|
|
{ "op", skip_to_comma, 0, 0, 0 },
|
|
|
|
|
{ "pco", 0, 0, 0, 0 },
|
|
|
|
|
{ "p", opt_chip, 0, 0, 0 },
|
|
|
|
|
{ "pcr", 0, 0, 0, 0 },
|
|
|
|
|
{ "pcs", 0, 0, 0, 0 },
|
|
|
|
|
{ "r", 0, 0, 0, 0 },
|
|
|
|
|
{ "quick", 0, &m68k_quick, 1, 0 },
|
|
|
|
|
{ "rel32", 0, &m68k_rel32, 1, 0 },
|
|
|
|
|
{ "s", opt_list, 0, 0, 0 },
|
|
|
|
|
{ "t", opt_list_symbols, 0, 0, 0 },
|
|
|
|
|
{ "w", 0, &flag_no_warnings, 0, 1 },
|
|
|
|
|
{ "x", 0, 0, 0, 0 }
|
|
|
|
|
};
|
|
|
|
|
|
2000-05-08 18:24:06 +08:00
|
|
|
|
#define OPTCOUNT ((int) (sizeof opt_table / sizeof opt_table[0]))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The MRI OPT pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_opt (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int t;
|
|
|
|
|
char *s;
|
|
|
|
|
char c;
|
|
|
|
|
int i;
|
|
|
|
|
const struct opt_action *o;
|
|
|
|
|
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
|
|
|
|
|
t = 1;
|
|
|
|
|
if (*input_line_pointer == '-')
|
|
|
|
|
{
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
t = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (strncasecmp (input_line_pointer, "NO", 2) == 0)
|
|
|
|
|
{
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
t = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = input_line_pointer;
|
|
|
|
|
c = get_symbol_end ();
|
|
|
|
|
|
|
|
|
|
for (i = 0, o = opt_table; i < OPTCOUNT; i++, o++)
|
|
|
|
|
{
|
|
|
|
|
if (strcasecmp (s, o->name) == 0)
|
|
|
|
|
{
|
|
|
|
|
if (o->pfn)
|
|
|
|
|
{
|
|
|
|
|
/* Restore input_line_pointer now in case the option
|
|
|
|
|
takes arguments. */
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
(*o->pfn) (o->arg, t);
|
|
|
|
|
}
|
|
|
|
|
else if (o->pvar != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (! t && o->arg == o->notarg)
|
|
|
|
|
as_bad (_("option `%s' may not be negated"), s);
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
*o->pvar = t ? o->arg : o->notarg;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i >= OPTCOUNT)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("option `%s' not recognized"), s);
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (*input_line_pointer++ == ',');
|
|
|
|
|
|
|
|
|
|
/* Move back to terminating character. */
|
|
|
|
|
--input_line_pointer;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Skip ahead to a comma. This is used for OPT options which we do
|
2003-11-22 10:35:31 +08:00
|
|
|
|
not support and which take arguments. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
skip_to_comma (int arg ATTRIBUTE_UNUSED, int on ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
while (*input_line_pointer != ','
|
|
|
|
|
&& ! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the OPT NEST=depth option. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
opt_nest (int arg ATTRIBUTE_UNUSED, int on ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (*input_line_pointer != '=')
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("bad format of OPT NEST=depth"));
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
max_macro_nest = get_absolute_expression ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the OPT P=chip option. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
opt_chip (int arg ATTRIBUTE_UNUSED, int on ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (*input_line_pointer != '=')
|
|
|
|
|
{
|
|
|
|
|
/* This is just OPT P, which we do not support. */
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
mri_chip ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the OPT S option. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
opt_list (int arg ATTRIBUTE_UNUSED, int on)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
listing_list (on);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the OPT T option. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
opt_list_symbols (int arg ATTRIBUTE_UNUSED, int on)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (on)
|
|
|
|
|
listing |= LISTING_SYMBOLS;
|
|
|
|
|
else
|
2002-05-08 09:54:04 +08:00
|
|
|
|
listing &= ~LISTING_SYMBOLS;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI REG pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_reg (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
int c;
|
|
|
|
|
struct m68k_op rop;
|
|
|
|
|
int mask;
|
|
|
|
|
char *stop = NULL;
|
|
|
|
|
char stopc;
|
|
|
|
|
|
|
|
|
|
if (line_label == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing label"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
stop = mri_comment_field (&stopc);
|
|
|
|
|
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
|
|
|
|
|
s = input_line_pointer;
|
2001-09-19 13:33:36 +08:00
|
|
|
|
while (ISALNUM (*input_line_pointer)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#ifdef REGISTER_PREFIX
|
|
|
|
|
|| *input_line_pointer == REGISTER_PREFIX
|
|
|
|
|
#endif
|
|
|
|
|
|| *input_line_pointer == '/'
|
|
|
|
|
|| *input_line_pointer == '-')
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
c = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = '\0';
|
|
|
|
|
|
|
|
|
|
if (m68k_ip_op (s, &rop) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (rop.error == NULL)
|
|
|
|
|
as_bad (_("bad register list"));
|
|
|
|
|
else
|
|
|
|
|
as_bad (_("bad register list: %s"), rop.error);
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
|
|
|
|
|
if (rop.mode == REGLST)
|
|
|
|
|
mask = rop.mask;
|
|
|
|
|
else if (rop.mode == DREG)
|
|
|
|
|
mask = 1 << (rop.reg - DATA0);
|
|
|
|
|
else if (rop.mode == AREG)
|
|
|
|
|
mask = 1 << (rop.reg - ADDR0 + 8);
|
|
|
|
|
else if (rop.mode == FPREG)
|
|
|
|
|
mask = 1 << (rop.reg - FP0 + 16);
|
|
|
|
|
else if (rop.mode == CONTROL
|
|
|
|
|
&& rop.reg == FPI)
|
|
|
|
|
mask = 1 << 24;
|
|
|
|
|
else if (rop.mode == CONTROL
|
|
|
|
|
&& rop.reg == FPS)
|
|
|
|
|
mask = 1 << 25;
|
|
|
|
|
else if (rop.mode == CONTROL
|
|
|
|
|
&& rop.reg == FPC)
|
|
|
|
|
mask = 1 << 26;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("bad register list"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
S_SET_SEGMENT (line_label, reg_section);
|
|
|
|
|
S_SET_VALUE (line_label, ~mask);
|
Add support for storing local symbols in a small structure to save
memory when assembling large files.
* as.h: Don't include struc-symbol.h.
(symbolS): Add typedef.
* symbols.c: Include struc-symbol.h.
(local_hash): New static variable.
(save_symbol_name): New static function, from symbol_create.
(symbol_create): Call save_symbol_name.
(local_symbol_count): New static variable.
(local_symbol_conversion_count): Likewise.
(LOCAL_SYMBOL_CHECK): Define.
(local_symbol_make): New static function.
(local_symbol_convert): New static function.
(colon): Handle local symbols. Create local symbol for local
label name.
(symbol_table_insert): Handle local symbols.
(symbol_find_or_make): Create local symbol for local label name.
(symbol_find_base): Check for local symbol.
(symbol_append, symbol_insert): Check for local symbols.
(symbol_clear_list_pointers, symbol_remove): Likewise.
(verify_symbol_chain): Likewise.
(copy_symbol_attributes): Likewise.
(resolve_symbol_value): Handle local symbols.
(resolve_local_symbol): New static function.
(resolve_local_symbol_values): New function.
(S_GET_VALUE, S_SET_VALUE): Handle local symbols.
(S_IS_FUNCTION, S_IS_EXTERNAL, S_IS_WEAK, S_IS_COMMON): Likewise.
(S_IS_DEFINED, S_IS_DEBUG, S_IS_LOCAL, S_GET_NAME): Likewise.
(S_GET_SEGMENT, S_SET_SEGMENT, S_SET_EXTERNAL): Likewise.
(S_CLEAR_EXTERNAL, S_SET_WEAK, S_SET_NAME): Likewise.
(symbol_previous, symbol_next): New functions.
(symbol_get_value_expression): Likewise.
(symbol_set_value_expression): Likewise.
(symbol_set_frag, symbol_get_frag): Likewise.
(symbol_mark_used, symbol_clear_used, symbol_used_p): Likewise.
(symbol_mark_used_in_reloc): Likewise.
(symbol_clear_used_in_reloc, symbol_used_in_reloc_p): Likewise.
(symbol_mark_mri_common, symbol_clear_mri_common): Likewise.
(symbol_mri_common_p): Likewise.
(symbol_mark_written, symbol_clear_written): Likewise.
(symbol_written_p): Likewise.
(symbol_mark_resolved, symbol_resolved_p): Likewise.
(symbol_section_p, symbol_equated_p): Likewise.
(symbol_constant_p): Likewise.
(symbol_get_bfdsym, symbol_set_bfdsym): Likewise.
(symbol_get_obj, symbol_set_obj): Likewise.
(symbol_get_tc, symbol_set_tc): Likewise.
(symbol_begin): Initialize local_hash.
(print_symbol_value_1): Handle local symbols.
(symbol_print_statistics): Print local symbol statistics.
* symbols.h: Include "struc-symbol.h" if not BFD_ASSEMBLER.
Declare new symbols.c functions. Move many declarations here from
struc-symbol.h.
(SYMBOLS_NEED_BACKPOINTERS): Define if needed.
* struc-symbol.h (SYMBOLS_NEED_BACKPOINTERS): Don't set.
(struct symbol): Move bsym to make it clearly the first field.
Remove TARGET_SYMBOL_FIELDS.
(symbolS): Don't typedef.
(struct broken_word): Remove.
(N_TYPE_seg, seg_N_TYPE): Move to symbol.h.
(SEGMENT_TO_SYMBOL_TYPE, N_REGISTER): Likewise.
(symbol_clear_list_pointers): Likewise.
(symbol_insert, symbol_remove): Likewise.
(symbol_previous, symbol_append): Likewise.
(verify_symbol_chain, verify_symbol_chain_2): Likewise.
(struct local_symbol): Define.
(local_symbol_converted_p, local_symbol_mark_converted): Define.
(local_symbol_resolved_p, local_symbol_mark_resolved): Define.
(local_symbol_get_frag, local_symbol_set_frag): Define.
(local_symbol_get_real_symbol): Define.
(local_symbol_set_real_symbol): Define.
Define.
* write.c (write_object_file): Call resolve_local_symbol_values.
* config/obj-ecoff.h (OBJ_SYMFIELD_TYPE): Define.
(TARGET_SYMBOL_FIELDS): Don't define.
* config/obj-elf.h (OBJ_SYMFIELD_TYPE): Add local field. If
ECOFF_DEBUGGING, add ECOFF fields.
(ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define.
* config/obj-multi.h (struct elf_obj_sy): Add local field. If
ECOFF_DEBUGGING, add ECOFF fields.
(ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define.
(ECOFF_DEBUG_TARGET_SYMBOL_FIELDS): Don't define.
* config/tc-mcore.h: Don't include struc-symbol.h.
(TARGET_SYMBOL_FIELDS): Don't define.
(struct mcore_tc_sy): Define.
(TC_SYMFIELD_TYPE): Define.
* Many files: Use symbolS instead of struct symbol. Use new
accessor functions rather than referring to symbolS fields
directly.
* read.c (s_mri_common): Don't add in value of line_label.
* config/tc-mips.c (md_apply_fix): Correct parenthesization when
checking for SEC_LINK_ONCE.
* config/tc-sh.h (sh_fix_adjustable): Declare.
1999-06-03 08:29:48 +08:00
|
|
|
|
symbol_set_frag (line_label, &zero_address_frag);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
mri_comment_end (stop, stopc);
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This structure is used for the MRI SAVE and RESTORE pseudo-ops. */
|
|
|
|
|
|
|
|
|
|
struct save_opts
|
|
|
|
|
{
|
|
|
|
|
struct save_opts *next;
|
|
|
|
|
int abspcadd;
|
|
|
|
|
int symbols_case_sensitive;
|
|
|
|
|
int keep_locals;
|
|
|
|
|
int short_refs;
|
|
|
|
|
int architecture;
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
const enum m68k_register *control_regs;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
int quick;
|
|
|
|
|
int rel32;
|
|
|
|
|
int listing;
|
|
|
|
|
int no_warnings;
|
|
|
|
|
/* FIXME: We don't save OPT S. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This variable holds the stack of saved options. */
|
|
|
|
|
|
|
|
|
|
static struct save_opts *save_stack;
|
|
|
|
|
|
|
|
|
|
/* The MRI SAVE pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_save (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct save_opts *s;
|
|
|
|
|
|
|
|
|
|
s = (struct save_opts *) xmalloc (sizeof (struct save_opts));
|
|
|
|
|
s->abspcadd = m68k_abspcadd;
|
|
|
|
|
s->symbols_case_sensitive = symbols_case_sensitive;
|
|
|
|
|
s->keep_locals = flag_keep_locals;
|
|
|
|
|
s->short_refs = flag_short_refs;
|
|
|
|
|
s->architecture = current_architecture;
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
s->control_regs = control_regs;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
s->quick = m68k_quick;
|
|
|
|
|
s->rel32 = m68k_rel32;
|
|
|
|
|
s->listing = listing;
|
|
|
|
|
s->no_warnings = flag_no_warnings;
|
|
|
|
|
|
|
|
|
|
s->next = save_stack;
|
|
|
|
|
save_stack = s;
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The MRI RESTORE pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_restore (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct save_opts *s;
|
|
|
|
|
|
|
|
|
|
if (save_stack == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("restore without save"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s = save_stack;
|
|
|
|
|
save_stack = s->next;
|
|
|
|
|
|
|
|
|
|
m68k_abspcadd = s->abspcadd;
|
|
|
|
|
symbols_case_sensitive = s->symbols_case_sensitive;
|
|
|
|
|
flag_keep_locals = s->keep_locals;
|
|
|
|
|
flag_short_refs = s->short_refs;
|
|
|
|
|
current_architecture = s->architecture;
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
control_regs = s->control_regs;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
m68k_quick = s->quick;
|
|
|
|
|
m68k_rel32 = s->rel32;
|
|
|
|
|
listing = s->listing;
|
|
|
|
|
flag_no_warnings = s->no_warnings;
|
|
|
|
|
|
|
|
|
|
free (s);
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Types of MRI structured control directives. */
|
|
|
|
|
|
|
|
|
|
enum mri_control_type
|
|
|
|
|
{
|
|
|
|
|
mri_for,
|
|
|
|
|
mri_if,
|
|
|
|
|
mri_repeat,
|
|
|
|
|
mri_while
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This structure is used to stack the MRI structured control
|
|
|
|
|
directives. */
|
|
|
|
|
|
|
|
|
|
struct mri_control_info
|
|
|
|
|
{
|
|
|
|
|
/* The directive within which this one is enclosed. */
|
|
|
|
|
struct mri_control_info *outer;
|
|
|
|
|
|
|
|
|
|
/* The type of directive. */
|
|
|
|
|
enum mri_control_type type;
|
|
|
|
|
|
|
|
|
|
/* Whether an ELSE has been in an IF. */
|
|
|
|
|
int else_seen;
|
|
|
|
|
|
|
|
|
|
/* The add or sub statement at the end of a FOR. */
|
|
|
|
|
char *incr;
|
|
|
|
|
|
|
|
|
|
/* The label of the top of a FOR or REPEAT loop. */
|
|
|
|
|
char *top;
|
|
|
|
|
|
|
|
|
|
/* The label to jump to for the next iteration, or the else
|
|
|
|
|
expression of a conditional. */
|
|
|
|
|
char *next;
|
|
|
|
|
|
|
|
|
|
/* The label to jump to to break out of the loop, or the label past
|
|
|
|
|
the end of a conditional. */
|
|
|
|
|
char *bottom;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* The stack of MRI structured control directives. */
|
|
|
|
|
|
|
|
|
|
static struct mri_control_info *mri_control_stack;
|
|
|
|
|
|
|
|
|
|
/* The current MRI structured control directive index number, used to
|
|
|
|
|
generate label names. */
|
|
|
|
|
|
|
|
|
|
static int mri_control_index;
|
|
|
|
|
|
|
|
|
|
/* Assemble an instruction for an MRI structured control directive. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
mri_assemble (char *str)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
/* md_assemble expects the opcode to be in lower case. */
|
|
|
|
|
for (s = str; *s != ' ' && *s != '\0'; s++)
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s = TOLOWER (*s);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
md_assemble (str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Generate a new MRI label structured control directive label name. */
|
|
|
|
|
|
|
|
|
|
static char *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
mri_control_label (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *n;
|
|
|
|
|
|
|
|
|
|
n = (char *) xmalloc (20);
|
|
|
|
|
sprintf (n, "%smc%d", FAKE_LABEL_NAME, mri_control_index);
|
|
|
|
|
++mri_control_index;
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Create a new MRI structured control directive. */
|
|
|
|
|
|
|
|
|
|
static struct mri_control_info *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
push_mri_control (enum mri_control_type type)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
|
|
|
|
|
n = (struct mri_control_info *) xmalloc (sizeof (struct mri_control_info));
|
|
|
|
|
|
|
|
|
|
n->type = type;
|
|
|
|
|
n->else_seen = 0;
|
|
|
|
|
if (type == mri_if || type == mri_while)
|
|
|
|
|
n->top = NULL;
|
|
|
|
|
else
|
|
|
|
|
n->top = mri_control_label ();
|
|
|
|
|
n->next = mri_control_label ();
|
|
|
|
|
n->bottom = mri_control_label ();
|
|
|
|
|
|
|
|
|
|
n->outer = mri_control_stack;
|
|
|
|
|
mri_control_stack = n;
|
|
|
|
|
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Pop off the stack of MRI structured control directives. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
pop_mri_control (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
|
|
|
|
|
n = mri_control_stack;
|
|
|
|
|
mri_control_stack = n->outer;
|
|
|
|
|
if (n->top != NULL)
|
|
|
|
|
free (n->top);
|
|
|
|
|
free (n->next);
|
|
|
|
|
free (n->bottom);
|
|
|
|
|
free (n);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Recognize a condition code in an MRI structured control expression. */
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
parse_mri_condition (int *pcc)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char c1, c2;
|
|
|
|
|
|
|
|
|
|
know (*input_line_pointer == '<');
|
|
|
|
|
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
c1 = *input_line_pointer++;
|
|
|
|
|
c2 = *input_line_pointer++;
|
|
|
|
|
|
|
|
|
|
if (*input_line_pointer != '>')
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("syntax error in structured control directive"));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
|
2001-09-19 13:33:36 +08:00
|
|
|
|
c1 = TOLOWER (c1);
|
|
|
|
|
c2 = TOLOWER (c2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
*pcc = (c1 << 8) | c2;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse a single operand in an MRI structured control expression. */
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
parse_mri_control_operand (int *pcc, char **leftstart, char **leftstop,
|
|
|
|
|
char **rightstart, char **rightstop)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
|
|
|
|
|
*pcc = -1;
|
|
|
|
|
*leftstart = NULL;
|
|
|
|
|
*leftstop = NULL;
|
|
|
|
|
*rightstart = NULL;
|
|
|
|
|
*rightstop = NULL;
|
|
|
|
|
|
|
|
|
|
if (*input_line_pointer == '<')
|
|
|
|
|
{
|
|
|
|
|
/* It's just a condition code. */
|
|
|
|
|
return parse_mri_condition (pcc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look ahead for the condition code. */
|
|
|
|
|
for (s = input_line_pointer; *s != '\0'; ++s)
|
|
|
|
|
{
|
|
|
|
|
if (*s == '<' && s[1] != '\0' && s[2] != '\0' && s[3] == '>')
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (*s == '\0')
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing condition code in structured control directive"));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*leftstart = input_line_pointer;
|
|
|
|
|
*leftstop = s;
|
|
|
|
|
if (*leftstop > *leftstart
|
|
|
|
|
&& ((*leftstop)[-1] == ' ' || (*leftstop)[-1] == '\t'))
|
|
|
|
|
--*leftstop;
|
|
|
|
|
|
|
|
|
|
input_line_pointer = s;
|
|
|
|
|
if (! parse_mri_condition (pcc))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Look ahead for AND or OR or end of line. */
|
|
|
|
|
for (s = input_line_pointer; *s != '\0'; ++s)
|
|
|
|
|
{
|
2001-06-12 18:35:24 +08:00
|
|
|
|
/* We must make sure we don't misinterpret AND/OR at the end of labels!
|
|
|
|
|
if d0 <eq> #FOOAND and d1 <ne> #BAROR then
|
|
|
|
|
^^^ ^^ */
|
2002-05-08 09:54:04 +08:00
|
|
|
|
if ((s == input_line_pointer
|
|
|
|
|
|| *(s-1) == ' '
|
|
|
|
|
|| *(s-1) == '\t')
|
|
|
|
|
&& ((strncasecmp (s, "AND", 3) == 0
|
|
|
|
|
&& (s[3] == '.' || ! is_part_of_name (s[3])))
|
|
|
|
|
|| (strncasecmp (s, "OR", 2) == 0
|
|
|
|
|
&& (s[2] == '.' || ! is_part_of_name (s[2])))))
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*rightstart = input_line_pointer;
|
|
|
|
|
*rightstop = s;
|
|
|
|
|
if (*rightstop > *rightstart
|
|
|
|
|
&& ((*rightstop)[-1] == ' ' || (*rightstop)[-1] == '\t'))
|
|
|
|
|
--*rightstop;
|
|
|
|
|
|
|
|
|
|
input_line_pointer = s;
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define MCC(b1, b2) (((b1) << 8) | (b2))
|
|
|
|
|
|
|
|
|
|
/* Swap the sense of a condition. This changes the condition so that
|
|
|
|
|
it generates the same result when the operands are swapped. */
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
swap_mri_condition (int cc)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (cc)
|
|
|
|
|
{
|
|
|
|
|
case MCC ('h', 'i'): return MCC ('c', 's');
|
|
|
|
|
case MCC ('l', 's'): return MCC ('c', 'c');
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* <HS> is an alias for <CC>. */
|
2001-06-12 18:35:24 +08:00
|
|
|
|
case MCC ('h', 's'):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case MCC ('c', 'c'): return MCC ('l', 's');
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* <LO> is an alias for <CS>. */
|
2001-06-12 18:35:24 +08:00
|
|
|
|
case MCC ('l', 'o'):
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case MCC ('c', 's'): return MCC ('h', 'i');
|
|
|
|
|
case MCC ('p', 'l'): return MCC ('m', 'i');
|
|
|
|
|
case MCC ('m', 'i'): return MCC ('p', 'l');
|
|
|
|
|
case MCC ('g', 'e'): return MCC ('l', 'e');
|
|
|
|
|
case MCC ('l', 't'): return MCC ('g', 't');
|
|
|
|
|
case MCC ('g', 't'): return MCC ('l', 't');
|
|
|
|
|
case MCC ('l', 'e'): return MCC ('g', 'e');
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Issue a warning for conditions we can not swap. */
|
2008-10-20 09:03:50 +08:00
|
|
|
|
case MCC ('n', 'e'): return MCC ('n', 'e'); /* no problem here */
|
|
|
|
|
case MCC ('e', 'q'): return MCC ('e', 'q'); /* also no problem */
|
2001-06-12 18:35:24 +08:00
|
|
|
|
case MCC ('v', 'c'):
|
|
|
|
|
case MCC ('v', 's'):
|
|
|
|
|
default :
|
|
|
|
|
as_warn (_("Condition <%c%c> in structured control directive can not be encoded correctly"),
|
|
|
|
|
(char) (cc >> 8), (char) (cc));
|
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
return cc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reverse the sense of a condition. */
|
|
|
|
|
|
|
|
|
|
static int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
reverse_mri_condition (int cc)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (cc)
|
|
|
|
|
{
|
|
|
|
|
case MCC ('h', 'i'): return MCC ('l', 's');
|
|
|
|
|
case MCC ('l', 's'): return MCC ('h', 'i');
|
2001-06-12 18:35:24 +08:00
|
|
|
|
/* <HS> is an alias for <CC> */
|
|
|
|
|
case MCC ('h', 's'): return MCC ('l', 'o');
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case MCC ('c', 'c'): return MCC ('c', 's');
|
2001-06-12 18:35:24 +08:00
|
|
|
|
/* <LO> is an alias for <CS> */
|
|
|
|
|
case MCC ('l', 'o'): return MCC ('h', 's');
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case MCC ('c', 's'): return MCC ('c', 'c');
|
|
|
|
|
case MCC ('n', 'e'): return MCC ('e', 'q');
|
|
|
|
|
case MCC ('e', 'q'): return MCC ('n', 'e');
|
|
|
|
|
case MCC ('v', 'c'): return MCC ('v', 's');
|
|
|
|
|
case MCC ('v', 's'): return MCC ('v', 'c');
|
|
|
|
|
case MCC ('p', 'l'): return MCC ('m', 'i');
|
|
|
|
|
case MCC ('m', 'i'): return MCC ('p', 'l');
|
|
|
|
|
case MCC ('g', 'e'): return MCC ('l', 't');
|
|
|
|
|
case MCC ('l', 't'): return MCC ('g', 'e');
|
|
|
|
|
case MCC ('g', 't'): return MCC ('l', 'e');
|
|
|
|
|
case MCC ('l', 'e'): return MCC ('g', 't');
|
|
|
|
|
}
|
|
|
|
|
return cc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Build an MRI structured control expression. This generates test
|
|
|
|
|
and branch instructions. It goes to TRUELAB if the condition is
|
|
|
|
|
true, and to FALSELAB if the condition is false. Exactly one of
|
|
|
|
|
TRUELAB and FALSELAB will be NULL, meaning to fall through. QUAL
|
|
|
|
|
is the size qualifier for the expression. EXTENT is the size to
|
|
|
|
|
use for the branch. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
build_mri_control_operand (int qual, int cc, char *leftstart, char *leftstop,
|
|
|
|
|
char *rightstart, char *rightstop,
|
|
|
|
|
const char *truelab, const char *falselab,
|
|
|
|
|
int extent)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *buf;
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
if (leftstart != NULL)
|
|
|
|
|
{
|
|
|
|
|
struct m68k_op leftop, rightop;
|
|
|
|
|
char c;
|
|
|
|
|
|
|
|
|
|
/* Swap the compare operands, if necessary, to produce a legal
|
|
|
|
|
m68k compare instruction. Comparing a register operand with
|
|
|
|
|
a non-register operand requires the register to be on the
|
|
|
|
|
right (cmp, cmpa). Comparing an immediate value with
|
|
|
|
|
anything requires the immediate value to be on the left
|
|
|
|
|
(cmpi). */
|
|
|
|
|
|
|
|
|
|
c = *leftstop;
|
|
|
|
|
*leftstop = '\0';
|
|
|
|
|
(void) m68k_ip_op (leftstart, &leftop);
|
|
|
|
|
*leftstop = c;
|
|
|
|
|
|
|
|
|
|
c = *rightstop;
|
|
|
|
|
*rightstop = '\0';
|
|
|
|
|
(void) m68k_ip_op (rightstart, &rightop);
|
|
|
|
|
*rightstop = c;
|
|
|
|
|
|
|
|
|
|
if (rightop.mode == IMMED
|
|
|
|
|
|| ((leftop.mode == DREG || leftop.mode == AREG)
|
|
|
|
|
&& (rightop.mode != DREG && rightop.mode != AREG)))
|
|
|
|
|
{
|
|
|
|
|
char *temp;
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
/* Correct conditional handling:
|
|
|
|
|
if #1 <lt> d0 then ;means if (1 < d0)
|
|
|
|
|
...
|
|
|
|
|
endi
|
2001-06-12 18:35:24 +08:00
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
should assemble to:
|
2001-06-12 18:35:24 +08:00
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
cmp #1,d0 if we do *not* swap the operands
|
|
|
|
|
bgt true we need the swapped condition!
|
|
|
|
|
ble false
|
|
|
|
|
true:
|
|
|
|
|
...
|
|
|
|
|
false:
|
|
|
|
|
*/
|
1999-05-03 15:29:11 +08:00
|
|
|
|
temp = leftstart;
|
|
|
|
|
leftstart = rightstart;
|
|
|
|
|
rightstart = temp;
|
|
|
|
|
temp = leftstop;
|
|
|
|
|
leftstop = rightstop;
|
|
|
|
|
rightstop = temp;
|
2002-05-08 09:54:04 +08:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2001-06-12 18:35:24 +08:00
|
|
|
|
cc = swap_mri_condition (cc);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (truelab == NULL)
|
|
|
|
|
{
|
|
|
|
|
cc = reverse_mri_condition (cc);
|
|
|
|
|
truelab = falselab;
|
|
|
|
|
}
|
2000-09-12 03:49:46 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (leftstart != NULL)
|
|
|
|
|
{
|
|
|
|
|
buf = (char *) xmalloc (20
|
|
|
|
|
+ (leftstop - leftstart)
|
|
|
|
|
+ (rightstop - rightstart));
|
|
|
|
|
s = buf;
|
|
|
|
|
*s++ = 'c';
|
|
|
|
|
*s++ = 'm';
|
|
|
|
|
*s++ = 'p';
|
|
|
|
|
if (qual != '\0')
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s++ = TOLOWER (qual);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s++ = ' ';
|
|
|
|
|
memcpy (s, leftstart, leftstop - leftstart);
|
|
|
|
|
s += leftstop - leftstart;
|
|
|
|
|
*s++ = ',';
|
|
|
|
|
memcpy (s, rightstart, rightstop - rightstart);
|
|
|
|
|
s += rightstop - rightstart;
|
|
|
|
|
*s = '\0';
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
}
|
2000-09-12 03:49:46 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
buf = (char *) xmalloc (20 + strlen (truelab));
|
|
|
|
|
s = buf;
|
|
|
|
|
*s++ = 'b';
|
|
|
|
|
*s++ = cc >> 8;
|
|
|
|
|
*s++ = cc & 0xff;
|
|
|
|
|
if (extent != '\0')
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s++ = TOLOWER (extent);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s++ = ' ';
|
|
|
|
|
strcpy (s, truelab);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse an MRI structured control expression. This generates test
|
|
|
|
|
and branch instructions. STOP is where the expression ends. It
|
|
|
|
|
goes to TRUELAB if the condition is true, and to FALSELAB if the
|
|
|
|
|
condition is false. Exactly one of TRUELAB and FALSELAB will be
|
|
|
|
|
NULL, meaning to fall through. QUAL is the size qualifier for the
|
|
|
|
|
expression. EXTENT is the size to use for the branch. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
parse_mri_control_expression (char *stop, int qual, const char *truelab,
|
|
|
|
|
const char *falselab, int extent)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
int cc;
|
|
|
|
|
char *leftstart;
|
|
|
|
|
char *leftstop;
|
|
|
|
|
char *rightstart;
|
|
|
|
|
char *rightstop;
|
|
|
|
|
|
|
|
|
|
c = *stop;
|
|
|
|
|
*stop = '\0';
|
|
|
|
|
|
|
|
|
|
if (! parse_mri_control_operand (&cc, &leftstart, &leftstop,
|
|
|
|
|
&rightstart, &rightstop))
|
|
|
|
|
{
|
|
|
|
|
*stop = c;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (strncasecmp (input_line_pointer, "AND", 3) == 0)
|
|
|
|
|
{
|
|
|
|
|
const char *flab;
|
|
|
|
|
|
|
|
|
|
if (falselab != NULL)
|
|
|
|
|
flab = falselab;
|
|
|
|
|
else
|
|
|
|
|
flab = mri_control_label ();
|
|
|
|
|
|
|
|
|
|
build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
|
|
|
|
|
rightstop, (const char *) NULL, flab, extent);
|
|
|
|
|
|
|
|
|
|
input_line_pointer += 3;
|
|
|
|
|
if (*input_line_pointer != '.'
|
|
|
|
|
|| input_line_pointer[1] == '\0')
|
|
|
|
|
qual = '\0';
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
qual = input_line_pointer[1];
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! parse_mri_control_operand (&cc, &leftstart, &leftstop,
|
|
|
|
|
&rightstart, &rightstop))
|
|
|
|
|
{
|
|
|
|
|
*stop = c;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
|
|
|
|
|
rightstop, truelab, falselab, extent);
|
|
|
|
|
|
|
|
|
|
if (falselab == NULL)
|
|
|
|
|
colon (flab);
|
|
|
|
|
}
|
|
|
|
|
else if (strncasecmp (input_line_pointer, "OR", 2) == 0)
|
|
|
|
|
{
|
|
|
|
|
const char *tlab;
|
|
|
|
|
|
|
|
|
|
if (truelab != NULL)
|
|
|
|
|
tlab = truelab;
|
|
|
|
|
else
|
|
|
|
|
tlab = mri_control_label ();
|
|
|
|
|
|
|
|
|
|
build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
|
|
|
|
|
rightstop, tlab, (const char *) NULL, extent);
|
|
|
|
|
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
if (*input_line_pointer != '.'
|
|
|
|
|
|| input_line_pointer[1] == '\0')
|
|
|
|
|
qual = '\0';
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
qual = input_line_pointer[1];
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! parse_mri_control_operand (&cc, &leftstart, &leftstop,
|
|
|
|
|
&rightstart, &rightstop))
|
|
|
|
|
{
|
|
|
|
|
*stop = c;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
|
|
|
|
|
rightstop, truelab, falselab, extent);
|
|
|
|
|
|
|
|
|
|
if (truelab == NULL)
|
|
|
|
|
colon (tlab);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
|
|
|
|
|
rightstop, truelab, falselab, extent);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*stop = c;
|
|
|
|
|
if (input_line_pointer != stop)
|
|
|
|
|
as_bad (_("syntax error in structured control directive"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI IF pseudo-op. This may be a structured control
|
|
|
|
|
directive, or it may be a regular assembler conditional, depending
|
|
|
|
|
on its operands. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_if (int qual)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
int c;
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
|
|
|
|
|
/* A structured control directive must end with THEN with an
|
|
|
|
|
optional qualifier. */
|
|
|
|
|
s = input_line_pointer;
|
2001-06-12 18:35:24 +08:00
|
|
|
|
/* We only accept '*' as introduction of comments if preceded by white space
|
|
|
|
|
or at first column of a line (I think this can't actually happen here?)
|
|
|
|
|
This is important when assembling:
|
|
|
|
|
if d0 <ne> 12(a0,d0*2) then
|
2003-10-17 18:50:27 +08:00
|
|
|
|
if d0 <ne> #CONST*20 then. */
|
2004-07-11 23:20:30 +08:00
|
|
|
|
while (! (is_end_of_line[(unsigned char) *s]
|
|
|
|
|
|| (flag_mri
|
|
|
|
|
&& *s == '*'
|
|
|
|
|
&& (s == input_line_pointer
|
|
|
|
|
|| *(s-1) == ' '
|
|
|
|
|
|| *(s-1) == '\t'))))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
++s;
|
|
|
|
|
--s;
|
|
|
|
|
while (s > input_line_pointer && (*s == ' ' || *s == '\t'))
|
|
|
|
|
--s;
|
|
|
|
|
|
|
|
|
|
if (s - input_line_pointer > 1
|
|
|
|
|
&& s[-1] == '.')
|
|
|
|
|
s -= 2;
|
|
|
|
|
|
|
|
|
|
if (s - input_line_pointer < 3
|
|
|
|
|
|| strncasecmp (s - 3, "THEN", 4) != 0)
|
|
|
|
|
{
|
|
|
|
|
if (qual != '\0')
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing then"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* It's a conditional. */
|
|
|
|
|
s_if (O_ne);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Since this might be a conditional if, this pseudo-op will be
|
|
|
|
|
called even if we are supported to be ignoring input. Double
|
|
|
|
|
check now. Clobber *input_line_pointer so that ignore_input
|
|
|
|
|
thinks that this is not a special pseudo-op. */
|
|
|
|
|
c = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = 0;
|
|
|
|
|
if (ignore_input ())
|
|
|
|
|
{
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
|
|
|
|
|
n = push_mri_control (mri_if);
|
|
|
|
|
|
|
|
|
|
parse_mri_control_expression (s - 3, qual, (const char *) NULL,
|
|
|
|
|
n->next, s[1] == '.' ? s[2] : '\0');
|
|
|
|
|
|
|
|
|
|
if (s[1] == '.')
|
|
|
|
|
input_line_pointer = s + 3;
|
|
|
|
|
else
|
|
|
|
|
input_line_pointer = s + 1;
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI else pseudo-op. If we are currently doing an MRI
|
|
|
|
|
structured IF, associate the ELSE with the IF. Otherwise, assume
|
|
|
|
|
it is a conditional else. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_else (int qual)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
char *buf;
|
|
|
|
|
char q[2];
|
|
|
|
|
|
|
|
|
|
if (qual == '\0'
|
|
|
|
|
&& (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_if
|
|
|
|
|
|| mri_control_stack->else_seen))
|
|
|
|
|
{
|
|
|
|
|
s_else (0);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = 0;
|
|
|
|
|
if (ignore_input ())
|
|
|
|
|
{
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
*input_line_pointer = c;
|
|
|
|
|
|
|
|
|
|
if (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_if
|
|
|
|
|
|| mri_control_stack->else_seen)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("else without matching if"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mri_control_stack->else_seen = 1;
|
|
|
|
|
|
|
|
|
|
buf = (char *) xmalloc (20 + strlen (mri_control_stack->bottom));
|
2001-09-19 13:33:36 +08:00
|
|
|
|
q[0] = TOLOWER (qual);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
q[1] = '\0';
|
|
|
|
|
sprintf (buf, "bra%s %s", q, mri_control_stack->bottom);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->next);
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI ENDI pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_endi (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_if)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("endi without matching if"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ignore_input will not return true for ENDI, so we don't need to
|
|
|
|
|
worry about checking it again here. */
|
|
|
|
|
|
|
|
|
|
if (! mri_control_stack->else_seen)
|
|
|
|
|
colon (mri_control_stack->next);
|
|
|
|
|
colon (mri_control_stack->bottom);
|
|
|
|
|
|
|
|
|
|
pop_mri_control ();
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI BREAK pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_break (int extent)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
char *buf;
|
|
|
|
|
char ex[2];
|
|
|
|
|
|
|
|
|
|
n = mri_control_stack;
|
|
|
|
|
while (n != NULL
|
|
|
|
|
&& n->type != mri_for
|
|
|
|
|
&& n->type != mri_repeat
|
|
|
|
|
&& n->type != mri_while)
|
|
|
|
|
n = n->outer;
|
|
|
|
|
if (n == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("break outside of structured loop"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buf = (char *) xmalloc (20 + strlen (n->bottom));
|
2001-09-19 13:33:36 +08:00
|
|
|
|
ex[0] = TOLOWER (extent);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
ex[1] = '\0';
|
|
|
|
|
sprintf (buf, "bra%s %s", ex, n->bottom);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI NEXT pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_next (int extent)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
char *buf;
|
|
|
|
|
char ex[2];
|
|
|
|
|
|
|
|
|
|
n = mri_control_stack;
|
|
|
|
|
while (n != NULL
|
|
|
|
|
&& n->type != mri_for
|
|
|
|
|
&& n->type != mri_repeat
|
|
|
|
|
&& n->type != mri_while)
|
|
|
|
|
n = n->outer;
|
|
|
|
|
if (n == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("next outside of structured loop"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buf = (char *) xmalloc (20 + strlen (n->next));
|
2001-09-19 13:33:36 +08:00
|
|
|
|
ex[0] = TOLOWER (extent);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
ex[1] = '\0';
|
|
|
|
|
sprintf (buf, "bra%s %s", ex, n->next);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI FOR pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_for (int qual)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
const char *varstart, *varstop;
|
|
|
|
|
const char *initstart, *initstop;
|
|
|
|
|
const char *endstart, *endstop;
|
|
|
|
|
const char *bystart, *bystop;
|
|
|
|
|
int up;
|
|
|
|
|
int by;
|
|
|
|
|
int extent;
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
char *buf;
|
|
|
|
|
char *s;
|
|
|
|
|
char ex[2];
|
|
|
|
|
|
|
|
|
|
/* The syntax is
|
|
|
|
|
FOR.q var = init { TO | DOWNTO } end [ BY by ] DO.e
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
varstart = input_line_pointer;
|
|
|
|
|
|
|
|
|
|
/* Look for the '='. */
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer]
|
|
|
|
|
&& *input_line_pointer != '=')
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
if (*input_line_pointer != '=')
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing ="));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
varstop = input_line_pointer;
|
|
|
|
|
if (varstop > varstart
|
|
|
|
|
&& (varstop[-1] == ' ' || varstop[-1] == '\t'))
|
|
|
|
|
--varstop;
|
|
|
|
|
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
|
|
|
|
|
initstart = input_line_pointer;
|
|
|
|
|
|
|
|
|
|
/* Look for TO or DOWNTO. */
|
|
|
|
|
up = 1;
|
|
|
|
|
initstop = NULL;
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
{
|
|
|
|
|
if (strncasecmp (input_line_pointer, "TO", 2) == 0
|
|
|
|
|
&& ! is_part_of_name (input_line_pointer[2]))
|
|
|
|
|
{
|
|
|
|
|
initstop = input_line_pointer;
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (strncasecmp (input_line_pointer, "DOWNTO", 6) == 0
|
|
|
|
|
&& ! is_part_of_name (input_line_pointer[6]))
|
|
|
|
|
{
|
|
|
|
|
initstop = input_line_pointer;
|
|
|
|
|
up = 0;
|
|
|
|
|
input_line_pointer += 6;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
if (initstop == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing to or downto"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (initstop > initstart
|
|
|
|
|
&& (initstop[-1] == ' ' || initstop[-1] == '\t'))
|
|
|
|
|
--initstop;
|
|
|
|
|
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
endstart = input_line_pointer;
|
|
|
|
|
|
|
|
|
|
/* Look for BY or DO. */
|
|
|
|
|
by = 0;
|
|
|
|
|
endstop = NULL;
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
{
|
|
|
|
|
if (strncasecmp (input_line_pointer, "BY", 2) == 0
|
|
|
|
|
&& ! is_part_of_name (input_line_pointer[2]))
|
|
|
|
|
{
|
|
|
|
|
endstop = input_line_pointer;
|
|
|
|
|
by = 1;
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (strncasecmp (input_line_pointer, "DO", 2) == 0
|
|
|
|
|
&& (input_line_pointer[2] == '.'
|
|
|
|
|
|| ! is_part_of_name (input_line_pointer[2])))
|
|
|
|
|
{
|
|
|
|
|
endstop = input_line_pointer;
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
if (endstop == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing do"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (endstop > endstart
|
|
|
|
|
&& (endstop[-1] == ' ' || endstop[-1] == '\t'))
|
|
|
|
|
--endstop;
|
|
|
|
|
|
|
|
|
|
if (! by)
|
|
|
|
|
{
|
|
|
|
|
bystart = "#1";
|
|
|
|
|
bystop = bystart + 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SKIP_WHITESPACE ();
|
|
|
|
|
bystart = input_line_pointer;
|
|
|
|
|
|
|
|
|
|
/* Look for DO. */
|
|
|
|
|
bystop = NULL;
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
{
|
|
|
|
|
if (strncasecmp (input_line_pointer, "DO", 2) == 0
|
|
|
|
|
&& (input_line_pointer[2] == '.'
|
|
|
|
|
|| ! is_part_of_name (input_line_pointer[2])))
|
|
|
|
|
{
|
|
|
|
|
bystop = input_line_pointer;
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
if (bystop == NULL)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing do"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (bystop > bystart
|
|
|
|
|
&& (bystop[-1] == ' ' || bystop[-1] == '\t'))
|
|
|
|
|
--bystop;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*input_line_pointer != '.')
|
|
|
|
|
extent = '\0';
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
extent = input_line_pointer[1];
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* We have fully parsed the FOR operands. Now build the loop. */
|
|
|
|
|
n = push_mri_control (mri_for);
|
|
|
|
|
|
|
|
|
|
buf = (char *) xmalloc (50 + (input_line_pointer - varstart));
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Move init,var. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
s = buf;
|
|
|
|
|
*s++ = 'm';
|
|
|
|
|
*s++ = 'o';
|
|
|
|
|
*s++ = 'v';
|
|
|
|
|
*s++ = 'e';
|
|
|
|
|
if (qual != '\0')
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s++ = TOLOWER (qual);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s++ = ' ';
|
|
|
|
|
memcpy (s, initstart, initstop - initstart);
|
|
|
|
|
s += initstop - initstart;
|
|
|
|
|
*s++ = ',';
|
|
|
|
|
memcpy (s, varstart, varstop - varstart);
|
|
|
|
|
s += varstop - varstart;
|
|
|
|
|
*s = '\0';
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
|
|
|
|
|
colon (n->top);
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* cmp end,var. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
s = buf;
|
|
|
|
|
*s++ = 'c';
|
|
|
|
|
*s++ = 'm';
|
|
|
|
|
*s++ = 'p';
|
|
|
|
|
if (qual != '\0')
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s++ = TOLOWER (qual);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s++ = ' ';
|
|
|
|
|
memcpy (s, endstart, endstop - endstart);
|
|
|
|
|
s += endstop - endstart;
|
|
|
|
|
*s++ = ',';
|
|
|
|
|
memcpy (s, varstart, varstop - varstart);
|
|
|
|
|
s += varstop - varstart;
|
|
|
|
|
*s = '\0';
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* bcc bottom. */
|
2001-09-19 13:33:36 +08:00
|
|
|
|
ex[0] = TOLOWER (extent);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
ex[1] = '\0';
|
|
|
|
|
if (up)
|
|
|
|
|
sprintf (buf, "blt%s %s", ex, n->bottom);
|
|
|
|
|
else
|
|
|
|
|
sprintf (buf, "bgt%s %s", ex, n->bottom);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
|
|
|
|
|
/* Put together the add or sub instruction used by ENDF. */
|
|
|
|
|
s = buf;
|
|
|
|
|
if (up)
|
|
|
|
|
strcpy (s, "add");
|
|
|
|
|
else
|
|
|
|
|
strcpy (s, "sub");
|
|
|
|
|
s += 3;
|
|
|
|
|
if (qual != '\0')
|
2001-09-19 13:33:36 +08:00
|
|
|
|
*s++ = TOLOWER (qual);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
*s++ = ' ';
|
|
|
|
|
memcpy (s, bystart, bystop - bystart);
|
|
|
|
|
s += bystop - bystart;
|
|
|
|
|
*s++ = ',';
|
|
|
|
|
memcpy (s, varstart, varstop - varstart);
|
|
|
|
|
s += varstop - varstart;
|
|
|
|
|
*s = '\0';
|
|
|
|
|
n->incr = buf;
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI ENDF pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_endf (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_for)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("endf without for"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->next);
|
|
|
|
|
|
|
|
|
|
mri_assemble (mri_control_stack->incr);
|
|
|
|
|
|
|
|
|
|
sprintf (mri_control_stack->incr, "bra %s", mri_control_stack->top);
|
|
|
|
|
mri_assemble (mri_control_stack->incr);
|
|
|
|
|
|
|
|
|
|
free (mri_control_stack->incr);
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->bottom);
|
|
|
|
|
|
|
|
|
|
pop_mri_control ();
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI REPEAT pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_repeat (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
|
|
|
|
|
n = push_mri_control (mri_repeat);
|
|
|
|
|
colon (n->top);
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI UNTIL pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_until (int qual)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
if (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_repeat)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("until without repeat"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->next);
|
|
|
|
|
|
|
|
|
|
for (s = input_line_pointer; ! is_end_of_line[(unsigned char) *s]; s++)
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
parse_mri_control_expression (s, qual, (const char *) NULL,
|
|
|
|
|
mri_control_stack->top, '\0');
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->bottom);
|
|
|
|
|
|
|
|
|
|
input_line_pointer = s;
|
|
|
|
|
|
|
|
|
|
pop_mri_control ();
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI WHILE pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_while (int qual)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
struct mri_control_info *n;
|
|
|
|
|
|
|
|
|
|
s = input_line_pointer;
|
2001-06-12 18:35:24 +08:00
|
|
|
|
/* We only accept '*' as introduction of comments if preceded by white space
|
|
|
|
|
or at first column of a line (I think this can't actually happen here?)
|
|
|
|
|
This is important when assembling:
|
|
|
|
|
while d0 <ne> 12(a0,d0*2) do
|
2003-10-17 18:50:27 +08:00
|
|
|
|
while d0 <ne> #CONST*20 do. */
|
2002-05-08 09:54:04 +08:00
|
|
|
|
while (! (is_end_of_line[(unsigned char) *s]
|
|
|
|
|
|| (flag_mri
|
|
|
|
|
&& *s == '*'
|
|
|
|
|
&& (s == input_line_pointer
|
|
|
|
|
|| *(s-1) == ' '
|
|
|
|
|
|| *(s-1) == '\t'))))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
s++;
|
|
|
|
|
--s;
|
|
|
|
|
while (*s == ' ' || *s == '\t')
|
|
|
|
|
--s;
|
|
|
|
|
if (s - input_line_pointer > 1
|
|
|
|
|
&& s[-1] == '.')
|
|
|
|
|
s -= 2;
|
|
|
|
|
if (s - input_line_pointer < 2
|
|
|
|
|
|| strncasecmp (s - 1, "DO", 2) != 0)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("missing do"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = push_mri_control (mri_while);
|
|
|
|
|
|
|
|
|
|
colon (n->next);
|
|
|
|
|
|
|
|
|
|
parse_mri_control_expression (s - 1, qual, (const char *) NULL, n->bottom,
|
|
|
|
|
s[1] == '.' ? s[2] : '\0');
|
|
|
|
|
|
|
|
|
|
input_line_pointer = s + 1;
|
|
|
|
|
if (*input_line_pointer == '.')
|
|
|
|
|
input_line_pointer += 2;
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle the MRI ENDW pseudo-op. */
|
|
|
|
|
|
|
|
|
|
static void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
s_mri_endw (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *buf;
|
|
|
|
|
|
|
|
|
|
if (mri_control_stack == NULL
|
|
|
|
|
|| mri_control_stack->type != mri_while)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("endw without while"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
buf = (char *) xmalloc (20 + strlen (mri_control_stack->next));
|
|
|
|
|
sprintf (buf, "bra %s", mri_control_stack->next);
|
|
|
|
|
mri_assemble (buf);
|
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
|
|
colon (mri_control_stack->bottom);
|
|
|
|
|
|
|
|
|
|
pop_mri_control ();
|
|
|
|
|
|
|
|
|
|
if (flag_mri)
|
|
|
|
|
{
|
|
|
|
|
while (! is_end_of_line[(unsigned char) *input_line_pointer])
|
|
|
|
|
++input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
/* Parse a .cpu directive. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
s_m68k_cpu (int ignored ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
char saved_char;
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
if (initialized)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("already assembled instructions"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
name = input_line_pointer;
|
|
|
|
|
while (*input_line_pointer && !ISSPACE(*input_line_pointer))
|
|
|
|
|
input_line_pointer++;
|
|
|
|
|
saved_char = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = 0;
|
|
|
|
|
|
|
|
|
|
m68k_set_cpu (name, 1, 0);
|
|
|
|
|
|
|
|
|
|
*input_line_pointer = saved_char;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse a .arch directive. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
s_m68k_arch (int ignored ATTRIBUTE_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
char saved_char;
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
if (initialized)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("already assembled instructions"));
|
|
|
|
|
ignore_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
name = input_line_pointer;
|
|
|
|
|
while (*input_line_pointer && *input_line_pointer != ','
|
|
|
|
|
&& !ISSPACE (*input_line_pointer))
|
|
|
|
|
input_line_pointer++;
|
|
|
|
|
saved_char = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = 0;
|
|
|
|
|
|
|
|
|
|
if (m68k_set_arch (name, 1, 0))
|
|
|
|
|
{
|
|
|
|
|
/* Scan extensions. */
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
*input_line_pointer++ = saved_char;
|
|
|
|
|
if (!*input_line_pointer || ISSPACE (*input_line_pointer))
|
|
|
|
|
break;
|
|
|
|
|
name = input_line_pointer;
|
|
|
|
|
while (*input_line_pointer && *input_line_pointer != ','
|
|
|
|
|
&& !ISSPACE (*input_line_pointer))
|
|
|
|
|
input_line_pointer++;
|
|
|
|
|
saved_char = *input_line_pointer;
|
|
|
|
|
*input_line_pointer = 0;
|
|
|
|
|
}
|
|
|
|
|
while (m68k_set_extension (name, 1, 0));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*input_line_pointer = saved_char;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Lookup a cpu name in TABLE and return the slot found. Return NULL
|
|
|
|
|
if none is found, the caller is responsible for emitting an error
|
|
|
|
|
message. If ALLOW_M is non-zero, we allow an initial 'm' on the
|
|
|
|
|
cpu name, if it begins with a '6' (possibly skipping an intervening
|
|
|
|
|
'c'. We also allow a 'c' in the same place. if NEGATED is
|
|
|
|
|
non-zero, we accept a leading 'no-' and *NEGATED is set to true, if
|
|
|
|
|
the option is indeed negated. */
|
|
|
|
|
|
|
|
|
|
static const struct m68k_cpu *
|
|
|
|
|
m68k_lookup_cpu (const char *arg, const struct m68k_cpu *table,
|
|
|
|
|
int allow_m, int *negated)
|
|
|
|
|
{
|
|
|
|
|
/* allow negated value? */
|
|
|
|
|
if (negated)
|
|
|
|
|
{
|
|
|
|
|
*negated = 0;
|
|
|
|
|
|
|
|
|
|
if (arg[0] == 'n' && arg[1] == 'o' && arg[2] == '-')
|
|
|
|
|
{
|
|
|
|
|
arg += 3;
|
|
|
|
|
*negated = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Remove 'm' or 'mc' prefix from 68k variants. */
|
|
|
|
|
if (allow_m)
|
|
|
|
|
{
|
|
|
|
|
if (arg[0] == 'm')
|
|
|
|
|
{
|
|
|
|
|
if (arg[1] == '6')
|
|
|
|
|
arg += 1;
|
|
|
|
|
else if (arg[1] == 'c' && arg[2] == '6')
|
|
|
|
|
arg += 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (arg[0] == 'c' && arg[1] == '6')
|
|
|
|
|
arg += 1;
|
|
|
|
|
|
|
|
|
|
for (; table->name; table++)
|
|
|
|
|
if (!strcmp (arg, table->name))
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{
|
|
|
|
|
if (table->alias < -1 || table->alias > 1)
|
|
|
|
|
as_bad (_("`%s' is deprecated, use `%s'"),
|
|
|
|
|
table->name, table[table->alias < 0 ? 1 : -1].name);
|
|
|
|
|
return table;
|
|
|
|
|
}
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-08 14:33:41 +08:00
|
|
|
|
/* Set the cpu, issuing errors if it is unrecognized. */
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
m68k_set_cpu (char const *name, int allow_m, int silent)
|
|
|
|
|
{
|
|
|
|
|
const struct m68k_cpu *cpu;
|
|
|
|
|
|
|
|
|
|
cpu = m68k_lookup_cpu (name, m68k_cpus, allow_m, NULL);
|
|
|
|
|
|
|
|
|
|
if (!cpu)
|
|
|
|
|
{
|
|
|
|
|
if (!silent)
|
|
|
|
|
as_bad (_("cpu `%s' unrecognized"), name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
selected_cpu = cpu;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-08 14:33:41 +08:00
|
|
|
|
/* Set the architecture, issuing errors if it is unrecognized. */
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
m68k_set_arch (char const *name, int allow_m, int silent)
|
|
|
|
|
{
|
|
|
|
|
const struct m68k_cpu *arch;
|
|
|
|
|
|
|
|
|
|
arch = m68k_lookup_cpu (name, m68k_archs, allow_m, NULL);
|
|
|
|
|
|
|
|
|
|
if (!arch)
|
|
|
|
|
{
|
|
|
|
|
if (!silent)
|
|
|
|
|
as_bad (_("architecture `%s' unrecognized"), name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
selected_arch = arch;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set the architecture extension, issuing errors if it is
|
|
|
|
|
unrecognized, or invalid */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
m68k_set_extension (char const *name, int allow_m, int silent)
|
|
|
|
|
{
|
|
|
|
|
int negated;
|
|
|
|
|
const struct m68k_cpu *ext;
|
|
|
|
|
|
|
|
|
|
ext = m68k_lookup_cpu (name, m68k_extensions, allow_m, &negated);
|
|
|
|
|
|
|
|
|
|
if (!ext)
|
|
|
|
|
{
|
|
|
|
|
if (!silent)
|
|
|
|
|
as_bad (_("extension `%s' unrecognized"), name);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (negated)
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
not_current_architecture |= (ext->control_regs
|
|
|
|
|
? *(unsigned *)ext->control_regs: ext->arch);
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
else
|
|
|
|
|
current_architecture |= ext->arch;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
/* md_parse_option
|
|
|
|
|
Invocation line includes a switch not recognized by the base assembler.
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
*/
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#ifdef OBJ_ELF
|
2002-06-08 15:37:16 +08:00
|
|
|
|
const char *md_shortopts = "lSA:m:kQ:V";
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#else
|
2002-06-08 15:37:16 +08:00
|
|
|
|
const char *md_shortopts = "lSA:m:k";
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
struct option md_longopts[] = {
|
|
|
|
|
#define OPTION_PIC (OPTION_MD_BASE)
|
|
|
|
|
{"pic", no_argument, NULL, OPTION_PIC},
|
|
|
|
|
#define OPTION_REGISTER_PREFIX_OPTIONAL (OPTION_MD_BASE + 1)
|
|
|
|
|
{"register-prefix-optional", no_argument, NULL,
|
|
|
|
|
OPTION_REGISTER_PREFIX_OPTIONAL},
|
|
|
|
|
#define OPTION_BITWISE_OR (OPTION_MD_BASE + 2)
|
|
|
|
|
{"bitwise-or", no_argument, NULL, OPTION_BITWISE_OR},
|
|
|
|
|
#define OPTION_BASE_SIZE_DEFAULT_16 (OPTION_MD_BASE + 3)
|
|
|
|
|
{"base-size-default-16", no_argument, NULL, OPTION_BASE_SIZE_DEFAULT_16},
|
|
|
|
|
#define OPTION_BASE_SIZE_DEFAULT_32 (OPTION_MD_BASE + 4)
|
|
|
|
|
{"base-size-default-32", no_argument, NULL, OPTION_BASE_SIZE_DEFAULT_32},
|
|
|
|
|
#define OPTION_DISP_SIZE_DEFAULT_16 (OPTION_MD_BASE + 5)
|
|
|
|
|
{"disp-size-default-16", no_argument, NULL, OPTION_DISP_SIZE_DEFAULT_16},
|
|
|
|
|
#define OPTION_DISP_SIZE_DEFAULT_32 (OPTION_MD_BASE + 6)
|
|
|
|
|
{"disp-size-default-32", no_argument, NULL, OPTION_DISP_SIZE_DEFAULT_32},
|
2000-08-01 06:08:14 +08:00
|
|
|
|
#define OPTION_PCREL (OPTION_MD_BASE + 7)
|
|
|
|
|
{"pcrel", no_argument, NULL, OPTION_PCREL},
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{NULL, no_argument, NULL, 0}
|
|
|
|
|
};
|
2000-12-03 14:49:23 +08:00
|
|
|
|
size_t md_longopts_size = sizeof (md_longopts);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_parse_option (int c, char *arg)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
switch (c)
|
|
|
|
|
{
|
|
|
|
|
case 'l': /* -l means keep external to 2 bit offset
|
2003-10-17 18:50:27 +08:00
|
|
|
|
rather than 16 bit one. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
flag_short_refs = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'S': /* -S means that jbsr's always turn into
|
|
|
|
|
jsr's. */
|
|
|
|
|
flag_long_jumps = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2000-08-01 06:08:14 +08:00
|
|
|
|
case OPTION_PCREL: /* --pcrel means never turn PC-relative
|
|
|
|
|
branches into absolute jumps. */
|
|
|
|
|
flag_keep_pcrel = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case OPTION_PIC:
|
|
|
|
|
case 'k':
|
|
|
|
|
flag_want_pic = 1;
|
2003-10-17 18:50:27 +08:00
|
|
|
|
break; /* -pic, Position Independent Code. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
case OPTION_REGISTER_PREFIX_OPTIONAL:
|
|
|
|
|
flag_reg_prefix_optional = 1;
|
|
|
|
|
reg_prefix_optional_seen = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* -V: SVR4 argument to print version ID. */
|
|
|
|
|
case 'V':
|
|
|
|
|
print_version_id ();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* -Qy, -Qn: SVR4 arguments controlling whether a .comment section
|
|
|
|
|
should be emitted or not. FIXME: Not implemented. */
|
|
|
|
|
case 'Q':
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_BITWISE_OR:
|
|
|
|
|
{
|
|
|
|
|
char *n, *t;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
n = (char *) xmalloc (strlen (m68k_comment_chars) + 1);
|
|
|
|
|
t = n;
|
|
|
|
|
for (s = m68k_comment_chars; *s != '\0'; s++)
|
|
|
|
|
if (*s != '|')
|
|
|
|
|
*t++ = *s;
|
|
|
|
|
*t = '\0';
|
|
|
|
|
m68k_comment_chars = n;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_BASE_SIZE_DEFAULT_16:
|
|
|
|
|
m68k_index_width_default = SIZE_WORD;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_BASE_SIZE_DEFAULT_32:
|
|
|
|
|
m68k_index_width_default = SIZE_LONG;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_DISP_SIZE_DEFAULT_16:
|
|
|
|
|
m68k_rel32 = 0;
|
|
|
|
|
m68k_rel32_from_cmdline = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OPTION_DISP_SIZE_DEFAULT_32:
|
|
|
|
|
m68k_rel32 = 1;
|
|
|
|
|
m68k_rel32_from_cmdline = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
case 'A':
|
|
|
|
|
#if WARN_DEPRECATED
|
|
|
|
|
as_tsktsk (_ ("option `-A%s' is deprecated: use `-%s'",
|
|
|
|
|
arg, arg));
|
|
|
|
|
#endif
|
|
|
|
|
/* Intentional fall-through. */
|
|
|
|
|
case 'm':
|
|
|
|
|
if (!strncmp (arg, "arch=", 5))
|
|
|
|
|
m68k_set_arch (arg + 5, 1, 0);
|
|
|
|
|
else if (!strncmp (arg, "cpu=", 4))
|
|
|
|
|
m68k_set_cpu (arg + 4, 1, 0);
|
|
|
|
|
else if (m68k_set_extension (arg, 0, 1))
|
|
|
|
|
;
|
2006-03-06 21:42:05 +08:00
|
|
|
|
else if (m68k_set_arch (arg, 0, 1))
|
|
|
|
|
;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
else if (m68k_set_cpu (arg, 0, 1))
|
|
|
|
|
;
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
break;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
/* Setup tables from the selected arch and/or cpu */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
m68k_init_arch (void)
|
|
|
|
|
{
|
|
|
|
|
if (not_current_architecture & current_architecture)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("architecture features both enabled and disabled"));
|
|
|
|
|
not_current_architecture &= ~current_architecture;
|
|
|
|
|
}
|
|
|
|
|
if (selected_arch)
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
{
|
|
|
|
|
current_architecture |= selected_arch->arch;
|
|
|
|
|
control_regs = selected_arch->control_regs;
|
|
|
|
|
}
|
2006-03-06 21:42:05 +08:00
|
|
|
|
else
|
|
|
|
|
current_architecture |= selected_cpu->arch;
|
|
|
|
|
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
current_architecture &= ~not_current_architecture;
|
|
|
|
|
|
2006-05-19 18:18:02 +08:00
|
|
|
|
if ((current_architecture & (cfloat | m68881)) == (cfloat | m68881))
|
|
|
|
|
{
|
|
|
|
|
/* Determine which float is really meant. */
|
|
|
|
|
if (current_architecture & (m68k_mask & ~m68881))
|
|
|
|
|
current_architecture ^= cfloat;
|
|
|
|
|
else
|
|
|
|
|
current_architecture ^= m68881;
|
|
|
|
|
}
|
|
|
|
|
|
2006-03-06 21:42:05 +08:00
|
|
|
|
if (selected_cpu)
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
{
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
control_regs = selected_cpu->control_regs;
|
2006-03-06 21:42:05 +08:00
|
|
|
|
if (current_architecture & ~selected_cpu->arch)
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
{
|
2006-03-06 21:42:05 +08:00
|
|
|
|
as_bad (_("selected processor does not have all features of selected architecture"));
|
|
|
|
|
current_architecture
|
|
|
|
|
= selected_cpu->arch & ~not_current_architecture;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((current_architecture & m68k_mask)
|
|
|
|
|
&& (current_architecture & ~m68k_mask))
|
|
|
|
|
{
|
|
|
|
|
as_bad (_ ("m68k and cf features both selected"));
|
2006-03-06 21:42:05 +08:00
|
|
|
|
if (current_architecture & m68k_mask)
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
current_architecture &= m68k_mask;
|
|
|
|
|
else
|
|
|
|
|
current_architecture &= ~m68k_mask;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Permit m68881 specification with all cpus; those that can't work
|
|
|
|
|
with a coprocessor could be doing emulation. */
|
|
|
|
|
if (current_architecture & m68851)
|
|
|
|
|
{
|
|
|
|
|
if (current_architecture & m68040)
|
|
|
|
|
as_warn (_("68040 and 68851 specified; mmu instructions may assemble incorrectly"));
|
|
|
|
|
}
|
|
|
|
|
/* What other incompatibilities could we check for? */
|
|
|
|
|
|
|
|
|
|
if (cpu_of_arch (current_architecture) < m68020
|
|
|
|
|
|| arch_coldfire_p (current_architecture))
|
|
|
|
|
md_relax_table[TAB (PCINDEX, BYTE)].rlx_more = 0;
|
|
|
|
|
|
|
|
|
|
initialized = 1;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_show_usage (FILE *stream)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2002-02-14 02:14:48 +08:00
|
|
|
|
const char *default_cpu = TARGET_CPU;
|
2002-12-13 06:16:16 +08:00
|
|
|
|
int i;
|
|
|
|
|
unsigned int default_arch;
|
2002-02-14 02:14:48 +08:00
|
|
|
|
|
2002-05-08 09:54:04 +08:00
|
|
|
|
/* Get the canonical name for the default target CPU. */
|
2002-02-14 02:14:48 +08:00
|
|
|
|
if (*default_cpu == 'm')
|
|
|
|
|
default_cpu++;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
for (i = 0; m68k_cpus[i].name; i++)
|
2002-02-14 02:14:48 +08:00
|
|
|
|
{
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
if (strcasecmp (default_cpu, m68k_cpus[i].name) == 0)
|
2002-02-14 02:14:48 +08:00
|
|
|
|
{
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
default_arch = m68k_cpus[i].arch;
|
gas:
* config/tc-m68k.c (m68000_control_regs, m68010_control_regs,
m68020_control_regs, m68040_control_regs, m68060_control_regs,
mcf_control_regs, mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs, mcf5249_control_regs, mcf528x_control_regs,
mcfv4e_control_regs, m68010_control_regs): Rename and reorder to ...
(m68000_ctrl, m68010_ctrl, m68020_ctrl, m68040_ctrl, m68060_ctrl,
mcf_ctrl, mcf5208_ctrl, mcf5213_ctrl, mcf5235_ctrl, mcf5249_ctrl,
mcf5216_ctrl, mcf5250_ctrl, mcf5271_ctrl, mcf5272_ctrl,
mcf5282_ctrl, mcfv4e_ctrl): ... these.
(mcf5275_ctrl, mcf5329_ctrl, mcf5373_ctrl): New.
(struct m68k_cpu): Change chip field to control_regs.
(current_chip): Remove.
(control_regs): New.
(m68k_archs, m68k_extensions): Adjust.
(m68k_cpus): Reorder to be in cpu number order. Adjust.
(CPU_ALLOW_MC, CPU_ALLOW_NEGATION): Remove.
(find_cf_chip): Reimplement for new organization of cpu table.
(select_control_regs): Remove.
(mri_chip): Adjust.
(struct save_opts): Save control regs, not chip.
(s_save, s_restore): Adjust.
(m68k_lookup_cpu): Give deprecated warning when necessary.
(m68k_init_arch): Adjust.
(md_show_usage): Adjust for new cpu table organization.
include/opcodes:
* m68k.h (cpu_m68k, cpu_cf, cpu_m68000, cpu_m68008, cpu_m68010,
cpu_m68020, cpu_m68ec030, cpu_m68040, cpu_m68060, cpu_m68851,
cpu_m68881, cpu_m68882, cpu_cpu32, cpu_cf5200, cpu_cf5206e,
cpu_cf5208, cpu_cf521x, cpu_cf5213, cpu_cf5249, cpu_cf528x,
cpu_cf5307, cpu_cf5329, cpu_cf5407, cpu_cf547x, cpu_cf548x): Remove.
2006-03-28 15:19:16 +08:00
|
|
|
|
while (m68k_cpus[i].alias > 0)
|
|
|
|
|
i--;
|
|
|
|
|
while (m68k_cpus[i].alias < 0)
|
|
|
|
|
i++;
|
|
|
|
|
default_cpu = m68k_cpus[i].name;
|
2002-02-14 02:14:48 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-12-03 14:49:23 +08:00
|
|
|
|
fprintf (stream, _("\
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
-march=<arch> set architecture\n\
|
|
|
|
|
-mcpu=<cpu> set cpu [default %s]\n\
|
|
|
|
|
"), default_cpu);
|
|
|
|
|
for (i = 0; m68k_extensions[i].name; i++)
|
|
|
|
|
fprintf (stream, _("\
|
2006-03-06 21:42:05 +08:00
|
|
|
|
-m[no-]%-16s enable/disable%s architecture extension\n\
|
|
|
|
|
"), m68k_extensions[i].name,
|
|
|
|
|
m68k_extensions[i].alias > 0 ? " ColdFire"
|
|
|
|
|
: m68k_extensions[i].alias < 0 ? " m68k" : "");
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
|
2000-12-03 14:49:23 +08:00
|
|
|
|
fprintf (stream, _("\
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
-l use 1 word for refs to undefined symbols [default 2]\n\
|
1999-05-03 15:29:11 +08:00
|
|
|
|
-pic, -k generate position independent code\n\
|
|
|
|
|
-S turn jbsr into jsr\n\
|
2000-08-01 06:08:14 +08:00
|
|
|
|
--pcrel never turn PC-relative branches into absolute jumps\n\
|
1999-05-03 15:29:11 +08:00
|
|
|
|
--register-prefix-optional\n\
|
|
|
|
|
recognize register names without prefix character\n\
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
--bitwise-or do not treat `|' as a comment character\n\
|
1999-05-03 15:29:11 +08:00
|
|
|
|
--base-size-default-16 base reg without size is 16 bits\n\
|
|
|
|
|
--base-size-default-32 base reg without size is 32 bits (default)\n\
|
|
|
|
|
--disp-size-default-16 displacement with unknown size is 16 bits\n\
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
--disp-size-default-32 displacement with unknown size is 32 bits (default)\n\
|
|
|
|
|
"));
|
|
|
|
|
|
|
|
|
|
fprintf (stream, _("Architecture variants are: "));
|
|
|
|
|
for (i = 0; m68k_archs[i].name; i++)
|
|
|
|
|
{
|
|
|
|
|
if (i)
|
|
|
|
|
fprintf (stream, " | ");
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
fprintf (stream, "%s", m68k_archs[i].name);
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
}
|
|
|
|
|
fprintf (stream, "\n");
|
|
|
|
|
|
|
|
|
|
fprintf (stream, _("Processor variants are: "));
|
|
|
|
|
for (i = 0; m68k_cpus[i].name; i++)
|
|
|
|
|
{
|
|
|
|
|
if (i)
|
|
|
|
|
fprintf (stream, " | ");
|
gas/
* config/tc-m68k.c (mcf51qe_ctrl): Add CPUCR.
(mcf52259_ctrl, mcf52277_ctrl, mcf53017_ctrl): New.
(mcf5307_ctrl): Add VBR.
(no_mac): New variable.
(m68k_extensions): Refer to no_mac mask.
(m68k_cpus): Add 51, 51ac, 51cn, 51em, 51jm, 52274, 52277,
52252..52259, 53011..53017.
(m68k_ip): Process CPUCR.
(init_table): Add cpucr entry.
(m68k_set_extension): Allow negated mask to refer to a variable.
(md_show_usage): Use '%s' to silence fprintf warning.
* config/m68k-parse.h (CPUCR): New control register.
gas/testsuite/
* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
opcodes/
* m68k-opc.c (m68k_opcodes): Add stldsr instruction.
2009-02-12 16:31:03 +08:00
|
|
|
|
fprintf (stream, "%s", m68k_cpus[i].name);
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
}
|
|
|
|
|
fprintf (stream, _("\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef TEST2
|
|
|
|
|
|
|
|
|
|
/* TEST2: Test md_assemble() */
|
2003-10-17 18:50:27 +08:00
|
|
|
|
/* Warning, this routine probably doesn't work anymore. */
|
|
|
|
|
int
|
2004-07-11 23:20:30 +08:00
|
|
|
|
main (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
struct m68k_it the_ins;
|
|
|
|
|
char buf[120];
|
|
|
|
|
char *cp;
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
m68k_ip_begin ();
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
if (!gets (buf) || !*buf)
|
|
|
|
|
break;
|
|
|
|
|
if (buf[0] == '|' || buf[1] == '.')
|
|
|
|
|
continue;
|
|
|
|
|
for (cp = buf; *cp; cp++)
|
|
|
|
|
if (*cp == '\t')
|
|
|
|
|
*cp = ' ';
|
|
|
|
|
if (is_label (buf))
|
|
|
|
|
continue;
|
|
|
|
|
memset (&the_ins, '\0', sizeof (the_ins));
|
|
|
|
|
m68k_ip (&the_ins, buf);
|
|
|
|
|
if (the_ins.error)
|
|
|
|
|
{
|
|
|
|
|
printf (_("Error %s in %s\n"), the_ins.error, buf);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
printf (_("Opcode(%d.%s): "), the_ins.numo, the_ins.args);
|
|
|
|
|
for (n = 0; n < the_ins.numo; n++)
|
|
|
|
|
printf (" 0x%x", the_ins.opcode[n] & 0xffff);
|
|
|
|
|
printf (" ");
|
|
|
|
|
print_the_insn (&the_ins.opcode[0], stdout);
|
|
|
|
|
(void) putchar ('\n');
|
|
|
|
|
}
|
|
|
|
|
for (n = 0; n < strlen (the_ins.args) / 2; n++)
|
|
|
|
|
{
|
|
|
|
|
if (the_ins.operands[n].error)
|
|
|
|
|
{
|
|
|
|
|
printf ("op%d Error %s in %s\n", n, the_ins.operands[n].error, buf);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2004-07-11 23:20:30 +08:00
|
|
|
|
printf ("mode %d, reg %d, ", the_ins.operands[n].mode,
|
|
|
|
|
the_ins.operands[n].reg);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (the_ins.operands[n].b_const)
|
2004-07-11 23:20:30 +08:00
|
|
|
|
printf ("Constant: '%.*s', ",
|
|
|
|
|
1 + the_ins.operands[n].e_const - the_ins.operands[n].b_const,
|
|
|
|
|
the_ins.operands[n].b_const);
|
|
|
|
|
printf ("ireg %d, isiz %d, imul %d, ", the_ins.operands[n].ireg,
|
|
|
|
|
the_ins.operands[n].isiz, the_ins.operands[n].imul);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (the_ins.operands[n].b_iadd)
|
2004-07-11 23:20:30 +08:00
|
|
|
|
printf ("Iadd: '%.*s',",
|
|
|
|
|
1 + the_ins.operands[n].e_iadd - the_ins.operands[n].b_iadd,
|
|
|
|
|
the_ins.operands[n].b_iadd);
|
|
|
|
|
putchar ('\n');
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
m68k_ip_end ();
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-07-11 23:20:30 +08:00
|
|
|
|
int
|
|
|
|
|
is_label (char *str)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
while (*str == ' ')
|
|
|
|
|
str++;
|
|
|
|
|
while (*str && *str != ' ')
|
|
|
|
|
str++;
|
|
|
|
|
if (str[-1] == ':' || str[1] == '=')
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Possible states for relaxation:
|
|
|
|
|
|
|
|
|
|
0 0 branch offset byte (bra, etc)
|
|
|
|
|
0 1 word
|
|
|
|
|
0 2 long
|
|
|
|
|
|
|
|
|
|
1 0 indexed offsets byte a0@(32,d4:w:1) etc
|
|
|
|
|
1 1 word
|
|
|
|
|
1 2 long
|
|
|
|
|
|
|
|
|
|
2 0 two-offset index word-word a0@(32,d4)@(45) etc
|
|
|
|
|
2 1 word-long
|
|
|
|
|
2 2 long-word
|
|
|
|
|
2 3 long-long
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* We have no need to default values of symbols. */
|
|
|
|
|
|
|
|
|
|
symbolS *
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Round up a section size to the appropriate boundary. */
|
|
|
|
|
valueT
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
#ifdef OBJ_AOUT
|
|
|
|
|
/* For a.out, force the section size to be aligned. If we don't do
|
|
|
|
|
this, BFD will align it for us, but it will not write out the
|
|
|
|
|
final bytes of the section. This may be a bug in BFD, but it is
|
|
|
|
|
easier to fix it here since that is how the other a.out targets
|
|
|
|
|
work. */
|
|
|
|
|
int align;
|
|
|
|
|
|
|
|
|
|
align = bfd_get_section_alignment (stdoutput, segment);
|
|
|
|
|
size = ((size + (1 << align) - 1) & ((valueT) -1 << align));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return size;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Exactly what point is a PC-relative offset relative TO?
|
|
|
|
|
On the 68k, it is relative to the address of the first extension
|
|
|
|
|
word. The difference between the addresses of the offset and the
|
2000-09-12 03:49:46 +08:00
|
|
|
|
first extension word is stored in fx_pcrel_adjust. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
long
|
2004-07-11 23:20:30 +08:00
|
|
|
|
md_pcrel_from (fixS *fixP)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int adjust;
|
|
|
|
|
|
2001-05-09 02:03:27 +08:00
|
|
|
|
/* Because fx_pcrel_adjust is a char, and may be unsigned, we explicitly
|
|
|
|
|
sign extend the value here. */
|
|
|
|
|
adjust = ((fixP->fx_pcrel_adjust & 0xff) ^ 0x80) - 0x80;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (adjust == 64)
|
|
|
|
|
adjust = -1;
|
|
|
|
|
return fixP->fx_where + fixP->fx_frag->fr_address - adjust;
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-05 18:58:59 +08:00
|
|
|
|
#ifdef OBJ_ELF
|
2002-05-08 09:54:04 +08:00
|
|
|
|
void
|
2004-07-11 23:20:30 +08:00
|
|
|
|
m68k_elf_final_processing (void)
|
1999-05-05 18:58:59 +08:00
|
|
|
|
{
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
unsigned flags = 0;
|
|
|
|
|
|
2005-03-19 01:20:33 +08:00
|
|
|
|
if (arch_coldfire_fpu (current_architecture))
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
flags |= EF_M68K_CFV4E;
|
|
|
|
|
/* Set file-specific flags if this is a cpu32 processor. */
|
2002-05-08 09:54:04 +08:00
|
|
|
|
if (cpu_of_arch (current_architecture) & cpu32)
|
2007-01-09 02:42:37 +08:00
|
|
|
|
flags |= EF_M68K_CPU32;
|
|
|
|
|
else if (cpu_of_arch (current_architecture) & fido_a)
|
|
|
|
|
flags |= EF_M68K_FIDO;
|
2002-05-08 09:54:04 +08:00
|
|
|
|
else if ((cpu_of_arch (current_architecture) & m68000up)
|
|
|
|
|
&& !(cpu_of_arch (current_architecture) & m68020up))
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
flags |= EF_M68K_M68000;
|
|
|
|
|
|
|
|
|
|
if (current_architecture & mcfisa_a)
|
|
|
|
|
{
|
2006-03-06 21:42:05 +08:00
|
|
|
|
static const unsigned isa_features[][2] =
|
|
|
|
|
{
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
{EF_M68K_CF_ISA_A_NODIV,mcfisa_a},
|
bfd/
* elf32-m68k.c: Update uses of EF_M68K_*.
binutils/
* readelf.c: Update uses of EF_M68K_*.
gas/
* config/tc-m68k.c: Update uses of EF_M68K_*.
include/elf
* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV,
EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP,
EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to
EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A,
EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP,
EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK,
EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B,
EF_M68K_CF_FLOAT, respectively.
2006-12-07 23:39:02 +08:00
|
|
|
|
{EF_M68K_CF_ISA_A, mcfisa_a|mcfhwdiv},
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
{EF_M68K_CF_ISA_A_PLUS, mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp},
|
bfd/
* elf32-m68k.c: Update uses of EF_M68K_*.
binutils/
* readelf.c: Update uses of EF_M68K_*.
gas/
* config/tc-m68k.c: Update uses of EF_M68K_*.
include/elf
* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV,
EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP,
EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to
EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A,
EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP,
EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK,
EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B,
EF_M68K_CF_FLOAT, respectively.
2006-12-07 23:39:02 +08:00
|
|
|
|
{EF_M68K_CF_ISA_B_NOUSP,mcfisa_a|mcfisa_b|mcfhwdiv},
|
|
|
|
|
{EF_M68K_CF_ISA_B, mcfisa_a|mcfisa_b|mcfhwdiv|mcfusp},
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
{EF_M68K_CF_ISA_C, mcfisa_a|mcfisa_c|mcfhwdiv|mcfusp},
|
2007-09-12 00:07:50 +08:00
|
|
|
|
{EF_M68K_CF_ISA_C_NODIV,mcfisa_a|mcfisa_c|mcfusp},
|
2006-03-06 21:42:05 +08:00
|
|
|
|
{0,0},
|
|
|
|
|
};
|
|
|
|
|
static const unsigned mac_features[][2] =
|
|
|
|
|
{
|
bfd/
* elf32-m68k.c: Update uses of EF_M68K_*.
binutils/
* readelf.c: Update uses of EF_M68K_*.
gas/
* config/tc-m68k.c: Update uses of EF_M68K_*.
include/elf
* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV,
EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP,
EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to
EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A,
EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP,
EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK,
EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B,
EF_M68K_CF_FLOAT, respectively.
2006-12-07 23:39:02 +08:00
|
|
|
|
{EF_M68K_CF_MAC, mcfmac},
|
|
|
|
|
{EF_M68K_CF_EMAC, mcfemac},
|
2006-03-06 21:42:05 +08:00
|
|
|
|
{0,0},
|
|
|
|
|
};
|
|
|
|
|
unsigned ix;
|
|
|
|
|
unsigned pattern;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
|
2006-03-06 21:42:05 +08:00
|
|
|
|
pattern = (current_architecture
|
gas/testsuite/
* gas/m68k/br-isaa.s: New.
* gas/m68k/br-isaa.d: New.
* gas/m68k/br-isab.s: New.
* gas/m68k/br-isab.d: New.
* gas/m68k/br-isac.s: New.
* gas/m68k/br-isac.d: New.
* gas/m68k/all.exp: Adjust.
gas/
* config/tc-m68k.c (mcf54455_ctrl): New.
(HAVE_LONG_DISP, HAVE_LONG_CALL, HAVE_LONG_COND): New.
(m68k_archs): Add isac.
(m68k_cpus): Add 54455 family.
(m68k_ip): Split Bg into Bb, Bs, Bg.
(m68k_elf_final_processing): Add ISA_C.
* doc/c-m68k.texi (M680x0 Options): Add isac.
include/opcode/
* m68k.h (mcfisa_c): New.
(mcfusp, mcf_mask): Adjust.
bfd/
* archures.c (bfd_mach_mcf_isa_c, bfd_mach_mcf_isa_c_mac,
bfd_mach_mcf_isa_c_emac): New.
* elf32-m68k.c (ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry,
elf_isac_plt_entry, elf_isac_plt_info): New.
(elf32_m68k_object_p): Add ISA_C.
(elf32_m68k_print_private_bfd_data): Print ISA_C.
(elf32_m68k_get_plt_info): Detect ISA_C.
* cpu-m68k.c (arch_info): Add ISAC.
(m68k_arch_features): Likewise,
(bfd_m68k_compatible): ISAs B & C are not compatible.
opcodes/
* m68k-opc.c: Mark mcfisa_c instructions.
2007-04-23 15:51:33 +08:00
|
|
|
|
& (mcfisa_a|mcfisa_aa|mcfisa_b|mcfisa_c|mcfhwdiv|mcfusp));
|
2006-03-06 21:42:05 +08:00
|
|
|
|
for (ix = 0; isa_features[ix][1]; ix++)
|
|
|
|
|
{
|
|
|
|
|
if (pattern == isa_features[ix][1])
|
|
|
|
|
{
|
|
|
|
|
flags |= isa_features[ix][0];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!isa_features[ix][1])
|
|
|
|
|
{
|
|
|
|
|
cf_bad:
|
|
|
|
|
as_warn (_("Not a defined coldfire architecture"));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (current_architecture & cfloat)
|
bfd/
* elf32-m68k.c: Update uses of EF_M68K_*.
binutils/
* readelf.c: Update uses of EF_M68K_*.
gas/
* config/tc-m68k.c: Update uses of EF_M68K_*.
include/elf
* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A_NODIV,
EF_M68K_ISA_A, EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B_NOUSP,
EF_M68K_ISA_B, EF_M68K_ISA_C, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_EMAC_B, EF_M68K_FLOAT): Rename to
EF_M68K_CF_ISA_MASK, EF_M68K_CF_ISA_A_NODIV, EF_M68K_CF_ISA_A,
EF_M68K_CF_ISA_A_PLUS, EF_M68K_CF_ISA_B_NOUSP,
EF_M68K_CF_ISA_B, EF_M68K_CF_ISA_C, EF_M68K_CF_MAC_MASK,
EF_M68K_CF_MAC, EF_M68K_CF_EMAC, EF_M68K_CF_EMAC_B,
EF_M68K_CF_FLOAT, respectively.
2006-12-07 23:39:02 +08:00
|
|
|
|
flags |= EF_M68K_CF_FLOAT | EF_M68K_CFV4E;
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
|
2006-03-06 21:42:05 +08:00
|
|
|
|
pattern = current_architecture & (mcfmac|mcfemac);
|
|
|
|
|
if (pattern)
|
|
|
|
|
{
|
|
|
|
|
for (ix = 0; mac_features[ix][1]; ix++)
|
|
|
|
|
{
|
|
|
|
|
if (pattern == mac_features[ix][1])
|
|
|
|
|
{
|
|
|
|
|
flags |= mac_features[ix][0];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!mac_features[ix][1])
|
|
|
|
|
goto cf_bad;
|
|
|
|
|
}
|
|
|
|
|
}
|
* bfd/archures.c (bfd_mach_mcf5200, bfd_mach_mcf5206e,
bfd_mach_mcf5307, bfd_mach_mcf5407, bfd_mach_mcf528x,
bfd_mach_mcfv4e, bfd_mach_mcf521x, bfd_mach_mcf5249,
bfd_mach_mcf547x, bfd_mach_mcf548x): Remove.
(bfd_mach_mcf_isa_a, bfd_mach_mcf_isa_a_div,
bfd_mach_mcf_isa_a_div_mac, bfd_mach_mcf_isa_a_div_emac,
bfd_mach_mcf_isa_aplus, bfd_mach_mcf_isa_aplus_mac,
bfd_mach_mcf_isa_aplus_emac, bfd_mach_mcf_isa_aplus_usp,
bfd_mach_mcf_isa_aplus_usp_mac, bfd_mach_mcf_isa_aplus_usp_emac,
bfd_mach_mcf_isa_b, bfd_mach_mcf_isa_b_mac, bfd_mach_mcf_isa_b_emac,
bfd_mach_mcf_isa_b_usp_float, bfd_mach_mcf_isa_b_usp_float_mac,
bfd_mach_mcf_isa_b_usp_float_emac): New.
(bfd_default_scan): Update coldfire mapping.
* bfd/bfd-in.h (bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Declare.
* bfd/bfd-in2.h: Rebuilt.
* bfd/cpu-m68k.c (arch_info_struct): Add new coldfire machines,
adjust legacy names.
(m68k_arch_features): New.
(bfd_m68k_mach_to_features,
bfd_m68k_features_to_mach): Define.
* bfd/elf32-m68k.c (elf32_m68k_object_p): New.
(elf32_m68k_merge_private_bfd_data): Merge the CF EF flags.
(elf32_m68k_print_private_bfd_data): Print the CF EF flags.
(elf_backend_object_p): Define.
* bfd/ieee.c (ieee_write_processor): Update coldfire machines.
* bfd/libbfd.h: Rebuilt.
* gas/config/tc-m68k.c (mcf5208_control_regs, mcf5213_control_regs,
mcf5329_control_regs): New.
(not_current_architecture, selected_arch, selected_cpu): New.
(m68k_archs, m68k_extensions): New.
(archs): Renamed to ...
(m68k_cpus): ... here. Adjust.
(n_arches): Remove.
(md_pseudo_table): Add arch and cpu directives.
(find_cf_chip, m68k_ip): Adjust table scanning.
(no_68851, no_68881): Remove.
(md_assemble): Lazily initialize.
(select_control_regs): Adjust cpu names. Add 5208, 5213, 5329.
(md_init_after_args): Move functionality to m68k_init_arch.
(mri_chip): Adjust table scanning.
(md_parse_option): Reimplement 'm' processing to add -march & -mcpu
options with saner parsing.
(m68k_lookup_cpu, m68k_set_arch, m68k_set_cpu, m68k_set_extension,
m68k_init_arch): New.
(s_m68k_cpu, s_m68k_arch): New.
(md_show_usage): Adjust.
(m68k_elf_final_processing): Set CF EF flags.
* gas/config/tc-m68k.h (m68k_init_after_args): Remove.
(tc_init_after_args): Remove.
* gas/doc/c-m68k.texi (M68K-Opts): Document -march, -mcpu options.
(M68k-Directives): Document .arch and .cpu directives.
* gas/testsuite/gas/m68k/all.exp: Add arch-cpu-1 test.
* gas/testsuite/gas/m68k/arch-cpu-1.[sd]: New.
* include/elf/m68k.h (EF_CPU32, EF_M68000, EF_CFV4E): Rename to ...
(EF_M68K_CPU32, EF_M68K_M68000, EF_M68K_CFV4E): ... here.
(EF_M68K_ISA_MASK, EF_M68K_ISA_A, EF_M68K_M68K_ISA_A_PLUS,
EF_M68K_ISA_B, EF_M68K_HW_DIV, EF_M68K_MAC_MASK, EF_M68K_MAC,
EF_M68K_EMAC, EF_M68K_USP, EF_M68K_FLOAT): New.
* include/opcode/m68k.h (m68008, m68ec030, m68882): Remove.
(m68k_mask): New.
(cpu_m68k, cpu_cf): New.
(mcf5200, mcf5206e, mcf521x, mcf5249, mcf528x, mcf5307, mcf5407,
mcf5470, mcf5480): Rename to cpu_<foo>. Add m680x0 variants.
* opcodes/m68k-dis.c (print_insn_m68k): Use
bfd_m68k_mach_to_features.
* binutils/readelf.c (get_machine_flags): Add logic for EF_M68K flags.
2006-02-08 03:01:10 +08:00
|
|
|
|
}
|
|
|
|
|
elf_elfheader (stdoutput)->e_flags |= flags;
|
1999-05-05 18:58:59 +08:00
|
|
|
|
}
|
M68K TLS support.
ld/testsuite/
* ld-m68k/got-multigot-12-13-14-34-35-ok.d: Update.
* ld-m68k/got-multigot-14-ok.d: Update.
* ld-m68k/m68k-got.exp: Update.
* ld-m68k/got-negative-12-13-14-34-ok.d: Update.
* ld-m68k/got-negative-14-ok.d: Update.
* ld-m68k/tls-gd-1.d, ld-m68k/tls-gd-2.d: New tests.
* ld-m68k/tls-gd-ie-1.d, ld-m68k/tls-ie-1.d: New tests.
* ld-m68k/tls-ld-1.d, ld-m68k/tls-ld-2.d: New tests.
* ld-m68k/tls-ld-1.s, ld-m68k/tls-ld-2.s, ld-m68k/tls-le-1.s:
New test sources.
* ld-m68k/tls-no-1.s, ld-m68k/tls-gd-ie-1.s, ld-m68k/tls-gd-1.s:
New test sources.
* ld-m68k/tls-gd-2.s, ld-m68k/tls-ie-1.s: New test sources.
* ld-m68k/m68k.exp: Run new tests.
(merge isa-a isa-a:nodiv): Fix.
gas/testsuite/
* gas/m68k/tls-gd-3.d, gas/m68k/tls-gd-3.s: New test.
* gas/m68k/all.exp: Run it.
gas/
* config/m68k-parse.h (enum pic_relocation): Add values for TLS
relocations.
* config/m68k-parse.y (yylex): Parse TLS relocations.
* config/tc-m68k.c (m68k_elf_cons): New static function.
(md_pseudo_table): Use it.
(get_reloc_code, tc_m68k_fix_adjustable, tc_gen_reloc): Handle TLS
relocations.
(md_apply_fix): Fix to set thread local flag.
(m68k_elf_suffix): New static function; helper for m68k_elf_cons.
include/elf/
* m68k.h: Map TLS relocations to numbers.
bfd/
* bfd-in2.h: Regenerate.
* elf32-m68k.c: Handle 2-slot GOT entries. Rename variables and
fields from n_entries to n_slots where appropriate, update comments.
(HOWTO): Add TLS relocations.
(reloc_map): Map BFD_RELOC_68K_TLS_* to R_68K_TLS_*.
(enum elf_m68k_got_offset_size): New enum.
(struct elf_m68k_got_entry.type): Move field to ...
(struct elf_m68k_got_entry_key): ... here. Update all uses.
(elf_m68k_reloc_got_type, elf_m68k_reloc_got_offset_size): New static
functions.
(elf_m68k_reloc_got_n_entries, elf_m68k_reloc_tls_p): New static
functions.
(struct elf_m68k_got): merge rel_8o_n_entries and rel_8o_16o_n_entries
fields into n_entries array. Update comments.
(elf_m68k_init_got): Simplify, update all uses.
(elf_m68k_init_got_entry_key): Handle R_68K_TLS_LDM32 reloc, update.
(ELF_M68K_REL_8O_MAX_N_ENTRIES_IN_GOT): Adjust to handle 2-slot
GOT entries; update name, update all uses.
(ELF_M68K_REL_8O_16O_MAX_N_ENTRIES_IN_GOT): Ditto.
(elf_m68k_get_got_entry): Update.
(elf_m68k_update_got_entry_type): Rewrite to handle TLS GOT entries,
simplify.
(elf_m68k_remove_got_entry_type): Simplify.
(elf_m68k_add_entry_to_got, elf_m68k_can_merge_gots_1): Update.
(elf_m68k_can_merge_gots): Update.
(elf_m68k_merge_gots_1, elf_m68k_merge_gots): Update.
(struct elf_m68k_finalize_got_offsets_arg): Rewrite to handle 2-slot
GOT entries, simplify.
(elf_m68k_finalize_got_offsets_1, elf_m68k_finalize_got_offsets): Same.
(struct elf_m68k_partition_multi_got_arg): Add slots_relas_diff
field, remove obsoleted local_n_entries field.
(elf_m68k_partition_multi_got_2): New static function.
(elf_m68k_partition_multi_got_1, elf_m68k_partition_multi_got): Use it;
update.
(elf_m68k_remove_got_entry_type): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_check_relocs): Handle TLS relocations. Remove unnecessary
update of sgot->size and srelgot->size.
(elf_m68k_gc_sweep_hook): Update.
(elf_m68k_install_rela, dtpoff_base, tpoff): New static functions.
(elf_m68k_relocate_section, elf_m68k_finish_dynamic_symbol): Handle
TLS relocations.
* reloc.c (BFD_RELOC_68K_TLS_*): Declare TLS relocations.
* libbfd.h (bfd_reloc_code_real_names): Add BFD_RELOC_68K_TLS_*.
2009-02-03 22:36:47 +08:00
|
|
|
|
|
|
|
|
|
/* Parse @TLSLDO and return the desired relocation. */
|
|
|
|
|
static bfd_reloc_code_real_type
|
|
|
|
|
m68k_elf_suffix (char **str_p, expressionS *exp_p)
|
|
|
|
|
{
|
|
|
|
|
char ident[20];
|
|
|
|
|
char *str = *str_p;
|
|
|
|
|
char *str2;
|
|
|
|
|
int ch;
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
if (*str++ != '@')
|
|
|
|
|
return BFD_RELOC_UNUSED;
|
|
|
|
|
|
|
|
|
|
for (ch = *str, str2 = ident;
|
|
|
|
|
(str2 < ident + sizeof (ident) - 1
|
|
|
|
|
&& (ISALNUM (ch) || ch == '@'));
|
|
|
|
|
ch = *++str)
|
|
|
|
|
{
|
|
|
|
|
*str2++ = ch;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*str2 = '\0';
|
|
|
|
|
len = str2 - ident;
|
|
|
|
|
|
|
|
|
|
if (strncmp (ident, "TLSLDO", 6) == 0
|
|
|
|
|
&& len == 6)
|
|
|
|
|
{
|
|
|
|
|
/* Now check for identifier@suffix+constant. */
|
|
|
|
|
if (*str == '-' || *str == '+')
|
|
|
|
|
{
|
|
|
|
|
char *orig_line = input_line_pointer;
|
|
|
|
|
expressionS new_exp;
|
|
|
|
|
|
|
|
|
|
input_line_pointer = str;
|
|
|
|
|
expression (&new_exp);
|
|
|
|
|
if (new_exp.X_op == O_constant)
|
|
|
|
|
{
|
|
|
|
|
exp_p->X_add_number += new_exp.X_add_number;
|
|
|
|
|
str = input_line_pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (&input_line_pointer != str_p)
|
|
|
|
|
input_line_pointer = orig_line;
|
|
|
|
|
}
|
|
|
|
|
*str_p = str;
|
|
|
|
|
|
|
|
|
|
return BFD_RELOC_68K_TLS_LDO32;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return BFD_RELOC_UNUSED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handles .long <tls_symbol>+0x8000 debug info.
|
|
|
|
|
Clobbers input_line_pointer, checks end-of-line.
|
|
|
|
|
Adapted from tc-ppc.c:ppc_elf_cons. */
|
|
|
|
|
static void
|
|
|
|
|
m68k_elf_cons (int nbytes /* 4=.long */)
|
|
|
|
|
{
|
|
|
|
|
if (is_it_end_of_statement ())
|
|
|
|
|
{
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
expressionS exp;
|
|
|
|
|
bfd_reloc_code_real_type reloc;
|
|
|
|
|
|
|
|
|
|
expression (&exp);
|
|
|
|
|
if (exp.X_op == O_symbol
|
|
|
|
|
&& *input_line_pointer == '@'
|
|
|
|
|
&& (reloc = m68k_elf_suffix (&input_line_pointer,
|
|
|
|
|
&exp)) != BFD_RELOC_UNUSED)
|
|
|
|
|
{
|
|
|
|
|
reloc_howto_type *reloc_howto;
|
|
|
|
|
int size;
|
|
|
|
|
|
|
|
|
|
reloc_howto = bfd_reloc_type_lookup (stdoutput, reloc);
|
|
|
|
|
size = bfd_get_reloc_size (reloc_howto);
|
|
|
|
|
|
|
|
|
|
if (size > nbytes)
|
|
|
|
|
{
|
|
|
|
|
as_bad (_("%s relocations do not fit in %d bytes\n"),
|
|
|
|
|
reloc_howto->name, nbytes);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *p;
|
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
|
|
p = frag_more (nbytes);
|
|
|
|
|
offset = 0;
|
|
|
|
|
if (target_big_endian)
|
|
|
|
|
offset = nbytes - size;
|
|
|
|
|
fix_new_exp (frag_now, p - frag_now->fr_literal + offset, size,
|
|
|
|
|
&exp, 0, reloc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
emit_expr (&exp, (unsigned int) nbytes);
|
|
|
|
|
}
|
|
|
|
|
while (*input_line_pointer++ == ',');
|
|
|
|
|
|
|
|
|
|
/* Put terminator back into stream. */
|
|
|
|
|
input_line_pointer--;
|
|
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
|
}
|
1999-05-05 18:58:59 +08:00
|
|
|
|
#endif
|
2003-08-08 22:46:41 +08:00
|
|
|
|
|
|
|
|
|
int
|
2006-05-19 19:26:11 +08:00
|
|
|
|
tc_m68k_regname_to_dw2regnum (char *regname)
|
2003-08-08 22:46:41 +08:00
|
|
|
|
{
|
|
|
|
|
unsigned int regnum;
|
|
|
|
|
static const char *const regnames[] =
|
|
|
|
|
{
|
|
|
|
|
"d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
|
|
|
|
|
"a0", "a1", "a2", "a3", "a4", "a5", "a6", "sp",
|
|
|
|
|
"fp0", "fp1", "fp2", "fp3", "fp4", "fp5", "fp6", "fp7",
|
|
|
|
|
"pc"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
for (regnum = 0; regnum < ARRAY_SIZE (regnames); regnum++)
|
|
|
|
|
if (strcmp (regname, regnames[regnum]) == 0)
|
|
|
|
|
return regnum;
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
tc_m68k_frame_initial_instructions (void)
|
|
|
|
|
{
|
|
|
|
|
static int sp_regno = -1;
|
|
|
|
|
|
|
|
|
|
if (sp_regno < 0)
|
|
|
|
|
sp_regno = tc_m68k_regname_to_dw2regnum ("sp");
|
|
|
|
|
|
|
|
|
|
cfi_add_CFA_def_cfa (sp_regno, -DWARF2_CIE_DATA_ALIGNMENT);
|
|
|
|
|
cfi_add_CFA_offset (DWARF2_DEFAULT_RETURN_COLUMN, DWARF2_CIE_DATA_ALIGNMENT);
|
|
|
|
|
}
|