1999-05-03 07:29:11 +00:00
|
|
|
/* Disassemble SH instructions.
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
Copyright (C) 1993, 94, 95, 96, 97, 1998, 2000 Free Software Foundation, Inc.
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
#include <stdio.h>
|
2000-04-14 04:16:58 +00:00
|
|
|
#include "sysdep.h"
|
1999-05-03 07:29:11 +00:00
|
|
|
#define STATIC_TABLE
|
|
|
|
#define DEFINE_TABLE
|
|
|
|
|
|
|
|
#include "sh-opc.h"
|
|
|
|
#include "dis-asm.h"
|
|
|
|
|
|
|
|
#define LITTLE_BIT 2
|
|
|
|
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
static void
|
|
|
|
print_movxy (op, rn, rm, fprintf_fn, stream)
|
|
|
|
sh_opcode_info *op;
|
|
|
|
int rn, rm;
|
|
|
|
fprintf_ftype fprintf_fn;
|
|
|
|
void *stream;
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
fprintf_fn (stream,"%s\t", op->name);
|
|
|
|
for (n = 0; n < 2; n++)
|
|
|
|
{
|
|
|
|
switch (op->arg[n])
|
|
|
|
{
|
|
|
|
case A_IND_N:
|
|
|
|
fprintf_fn (stream, "@r%d", rn);
|
|
|
|
break;
|
|
|
|
case A_INC_N:
|
|
|
|
fprintf_fn (stream, "@r%d+", rn);
|
|
|
|
break;
|
|
|
|
case A_PMOD_N:
|
|
|
|
fprintf_fn (stream, "@r%d+r8", rn);
|
|
|
|
break;
|
|
|
|
case A_PMODY_N:
|
|
|
|
fprintf_fn (stream, "@r%d+r9", rn);
|
|
|
|
break;
|
|
|
|
case DSP_REG_M:
|
|
|
|
fprintf_fn (stream, "a%c", '0' + rm);
|
|
|
|
break;
|
|
|
|
case DSP_REG_X:
|
|
|
|
fprintf_fn (stream, "x%c", '0' + rm);
|
|
|
|
break;
|
|
|
|
case DSP_REG_Y:
|
|
|
|
fprintf_fn (stream, "y%c", '0' + rm);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
fprintf_fn (stream, ",");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print a double data transfer insn. INSN is just the lower three
|
|
|
|
nibbles of the insn, i.e. field a and the bit that indicates if
|
|
|
|
a parallel processing insn follows.
|
|
|
|
Return nonzero if a field b of a parallel processing insns follows. */
|
|
|
|
static void
|
|
|
|
print_insn_ddt (insn, info)
|
|
|
|
int insn;
|
|
|
|
struct disassemble_info *info;
|
|
|
|
{
|
|
|
|
fprintf_ftype fprintf_fn = info->fprintf_func;
|
|
|
|
void *stream = info->stream;
|
|
|
|
|
|
|
|
/* If this is just a nop, make sure to emit something. */
|
|
|
|
if (insn == 0x000)
|
|
|
|
fprintf_fn (stream, "nopx\tnopy");
|
|
|
|
|
|
|
|
/* If a parallel processing insn was printed before,
|
|
|
|
and we got a non-nop, emit a tab. */
|
|
|
|
if ((insn & 0x800) && (insn & 0x3ff))
|
|
|
|
fprintf_fn (stream, "\t");
|
|
|
|
|
|
|
|
/* Check if either the x or y part is invalid. */
|
|
|
|
if (((insn & 0xc) == 0 && (insn & 0x2a0))
|
|
|
|
|| ((insn & 3) == 0 && (insn & 0x150)))
|
|
|
|
fprintf_fn (stream, ".word 0x%x", insn);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
static sh_opcode_info *first_movx, *first_movy;
|
|
|
|
sh_opcode_info *opx, *opy;
|
|
|
|
int insn_x, insn_y;
|
|
|
|
|
|
|
|
if (! first_movx)
|
|
|
|
{
|
|
|
|
for (first_movx = sh_table; first_movx->nibbles[1] != MOVX; )
|
|
|
|
first_movx++;
|
|
|
|
for (first_movy = first_movx; first_movy->nibbles[1] != MOVY; )
|
|
|
|
first_movy++;
|
|
|
|
}
|
|
|
|
insn_x = (insn >> 2) & 0xb;
|
|
|
|
if (insn_x)
|
|
|
|
{
|
|
|
|
for (opx = first_movx; opx->nibbles[2] != insn_x; ) opx++;
|
|
|
|
print_movxy (opx, ((insn >> 9) & 1) + 4, (insn >> 7) & 1,
|
|
|
|
fprintf_fn, stream);
|
|
|
|
}
|
|
|
|
insn_y = (insn & 3) | ((insn >> 1) & 8);
|
|
|
|
if (insn_y)
|
|
|
|
{
|
|
|
|
if (insn_x)
|
|
|
|
fprintf_fn (stream, "\t");
|
|
|
|
for (opy = first_movy; opy->nibbles[2] != insn_y; ) opy++;
|
|
|
|
print_movxy (opy, ((insn >> 8) & 1) + 6, (insn >> 6) & 1,
|
|
|
|
fprintf_fn, stream);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_dsp_reg (rm, fprintf_fn, stream)
|
|
|
|
int rm;
|
|
|
|
fprintf_ftype fprintf_fn;
|
|
|
|
void *stream;
|
|
|
|
{
|
|
|
|
switch (rm)
|
|
|
|
{
|
|
|
|
case A_A1_NUM:
|
|
|
|
fprintf_fn (stream, "a1");
|
|
|
|
break;
|
|
|
|
case A_A0_NUM:
|
|
|
|
fprintf_fn (stream, "a0");
|
|
|
|
break;
|
|
|
|
case A_X0_NUM:
|
|
|
|
fprintf_fn (stream, "x0");
|
|
|
|
break;
|
|
|
|
case A_X1_NUM:
|
|
|
|
fprintf_fn (stream, "x1");
|
|
|
|
break;
|
|
|
|
case A_Y0_NUM:
|
|
|
|
fprintf_fn (stream, "y0");
|
|
|
|
break;
|
|
|
|
case A_Y1_NUM:
|
|
|
|
fprintf_fn (stream, "y1");
|
|
|
|
break;
|
|
|
|
case A_M0_NUM:
|
|
|
|
fprintf_fn (stream, "m0");
|
|
|
|
break;
|
|
|
|
case A_A1G_NUM:
|
|
|
|
fprintf_fn (stream, "a1g");
|
|
|
|
break;
|
|
|
|
case A_M1_NUM:
|
|
|
|
fprintf_fn (stream, "m1");
|
|
|
|
break;
|
|
|
|
case A_A0G_NUM:
|
|
|
|
fprintf_fn (stream, "a0g");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fprintf_fn (stream, "0x%x", rm);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_insn_ppi (field_b, info)
|
|
|
|
int field_b;
|
|
|
|
struct disassemble_info *info;
|
|
|
|
{
|
|
|
|
static char *sx_tab[] = {"x0","x1","a0","a1"};
|
|
|
|
static char *sy_tab[] = {"y0","y1","m0","m1"};
|
|
|
|
fprintf_ftype fprintf_fn = info->fprintf_func;
|
|
|
|
void *stream = info->stream;
|
|
|
|
int nib1, nib2, nib3;
|
|
|
|
char *dc;
|
|
|
|
sh_opcode_info *op;
|
|
|
|
|
|
|
|
if ((field_b & 0xe800) == 0)
|
|
|
|
{
|
|
|
|
fprintf_fn (stream, "psh%c\t#%d,",
|
|
|
|
field_b & 0x1000 ? 'a' : 'l',
|
|
|
|
(field_b >> 4) & 127);
|
|
|
|
print_dsp_reg (field_b & 0xf, fprintf_fn, stream);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ((field_b & 0xc000) == 0x4000 && (field_b & 0x3000) != 0x1000)
|
|
|
|
{
|
|
|
|
static char *du_tab[] = {"x0","y0","a0","a1"};
|
|
|
|
static char *se_tab[] = {"x0","x1","y0","a1"};
|
|
|
|
static char *sf_tab[] = {"y0","y1","x0","a1"};
|
|
|
|
static char *sg_tab[] = {"m0","m1","a0","a1"};
|
|
|
|
|
|
|
|
if (field_b & 0x2000)
|
|
|
|
{
|
|
|
|
fprintf_fn (stream, "p%s %s,%s,%s\t",
|
|
|
|
(field_b & 0x1000) ? "add" : "sub",
|
|
|
|
sx_tab[(field_b >> 6) & 3],
|
|
|
|
sy_tab[(field_b >> 4) & 3],
|
|
|
|
du_tab[(field_b >> 0) & 3]);
|
|
|
|
}
|
|
|
|
fprintf_fn (stream, "pmuls%c%s,%s,%s",
|
|
|
|
field_b & 0x2000 ? ' ' : '\t',
|
|
|
|
se_tab[(field_b >> 10) & 3],
|
|
|
|
sf_tab[(field_b >> 8) & 3],
|
|
|
|
sg_tab[(field_b >> 2) & 3]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
nib1 = PPIC;
|
|
|
|
nib2 = field_b >> 12 & 0xf;
|
|
|
|
nib3 = field_b >> 8 & 0xf;
|
|
|
|
switch (nib3 & 0x3)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
dc = "";
|
|
|
|
nib1 = PPI3;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
dc = "";
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
dc = "dct ";
|
|
|
|
nib3 -= 1;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
dc = "dcf ";
|
|
|
|
nib3 -= 2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
for (op = sh_table; op->name; op++)
|
|
|
|
{
|
|
|
|
if (op->nibbles[1] == nib1
|
|
|
|
&& op->nibbles[2] == nib2
|
|
|
|
&& op->nibbles[3] == nib3)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
|
|
|
|
fprintf_fn (stream, "%s%s\t", dc, op->name);
|
|
|
|
for (n = 0; n < 3 && op->arg[n] != A_END; n++)
|
|
|
|
{
|
|
|
|
if (n && op->arg[1] != A_END)
|
|
|
|
fprintf_fn (stream, ",");
|
|
|
|
switch (op->arg[n])
|
|
|
|
{
|
|
|
|
case DSP_REG_N:
|
|
|
|
print_dsp_reg (field_b & 0xf, fprintf_fn, stream);
|
|
|
|
break;
|
|
|
|
case DSP_REG_X:
|
|
|
|
fprintf_fn (stream, sx_tab[(field_b >> 6) & 3]);
|
|
|
|
break;
|
|
|
|
case DSP_REG_Y:
|
|
|
|
fprintf_fn (stream, sy_tab[(field_b >> 4) & 3]);
|
|
|
|
break;
|
|
|
|
case A_MACH:
|
|
|
|
fprintf_fn (stream, "mach");
|
|
|
|
break;
|
|
|
|
case A_MACL:
|
|
|
|
fprintf_fn (stream ,"macl");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Not found. */
|
|
|
|
fprintf_fn (stream, ".word 0x%x", field_b);
|
|
|
|
}
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static int
|
|
|
|
print_insn_shx (memaddr, info)
|
|
|
|
bfd_vma memaddr;
|
|
|
|
struct disassemble_info *info;
|
|
|
|
{
|
|
|
|
fprintf_ftype fprintf_fn = info->fprintf_func;
|
|
|
|
void *stream = info->stream;
|
|
|
|
unsigned char insn[2];
|
|
|
|
unsigned char nibs[4];
|
|
|
|
int status;
|
|
|
|
bfd_vma relmask = ~ (bfd_vma) 0;
|
|
|
|
sh_opcode_info *op;
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
int target_arch;
|
|
|
|
|
|
|
|
switch (info->mach)
|
|
|
|
{
|
|
|
|
case bfd_mach_sh:
|
|
|
|
target_arch = arch_sh1;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh2:
|
|
|
|
target_arch = arch_sh2;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh_dsp:
|
|
|
|
target_arch = arch_sh_dsp;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh3:
|
|
|
|
target_arch = arch_sh3;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh3_dsp:
|
|
|
|
target_arch = arch_sh3_dsp;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh3e:
|
|
|
|
target_arch = arch_sh3e;
|
|
|
|
break;
|
|
|
|
case bfd_mach_sh4:
|
|
|
|
target_arch = arch_sh4;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort ();
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
status = info->read_memory_func (memaddr, insn, 2, info);
|
|
|
|
|
|
|
|
if (status != 0)
|
|
|
|
{
|
|
|
|
info->memory_error_func (status, memaddr, info);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info->flags & LITTLE_BIT)
|
|
|
|
{
|
|
|
|
nibs[0] = (insn[1] >> 4) & 0xf;
|
|
|
|
nibs[1] = insn[1] & 0xf;
|
|
|
|
|
|
|
|
nibs[2] = (insn[0] >> 4) & 0xf;
|
|
|
|
nibs[3] = insn[0] & 0xf;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nibs[0] = (insn[0] >> 4) & 0xf;
|
|
|
|
nibs[1] = insn[0] & 0xf;
|
|
|
|
|
|
|
|
nibs[2] = (insn[1] >> 4) & 0xf;
|
|
|
|
nibs[3] = insn[1] & 0xf;
|
|
|
|
}
|
|
|
|
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
if (nibs[0] == 0xf && (nibs[1] & 4) == 0 && target_arch & arch_sh_dsp_up)
|
|
|
|
{
|
|
|
|
if (nibs[1] & 8)
|
|
|
|
{
|
|
|
|
int field_b;
|
|
|
|
|
|
|
|
status = info->read_memory_func (memaddr + 2, insn, 2, info);
|
|
|
|
|
|
|
|
if (status != 0)
|
|
|
|
{
|
|
|
|
info->memory_error_func (status, memaddr + 2, info);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info->flags & LITTLE_BIT)
|
|
|
|
field_b = insn[1] << 8 | insn[0];
|
|
|
|
else
|
|
|
|
field_b = insn[0] << 8 | insn[1];
|
|
|
|
|
|
|
|
print_insn_ppi (field_b, info);
|
|
|
|
print_insn_ddt ((nibs[1] << 8) | (nibs[2] << 4) | nibs[3], info);
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
print_insn_ddt ((nibs[1] << 8) | (nibs[2] << 4) | nibs[3], info);
|
|
|
|
return 2;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
for (op = sh_table; op->name; op++)
|
|
|
|
{
|
|
|
|
int n;
|
|
|
|
int imm = 0;
|
|
|
|
int rn = 0;
|
|
|
|
int rm = 0;
|
|
|
|
int rb = 0;
|
|
|
|
int disp_pc;
|
|
|
|
bfd_vma disp_pc_addr = 0;
|
|
|
|
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
if ((op->arch & target_arch) == 0)
|
|
|
|
goto fail;
|
1999-05-03 07:29:11 +00:00
|
|
|
for (n = 0; n < 4; n++)
|
|
|
|
{
|
|
|
|
int i = op->nibbles[n];
|
|
|
|
|
|
|
|
if (i < 16)
|
|
|
|
{
|
|
|
|
if (nibs[n] == i)
|
|
|
|
continue;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case BRANCH_8:
|
|
|
|
imm = (nibs[2] << 4) | (nibs[3]);
|
|
|
|
if (imm & 0x80)
|
|
|
|
imm |= ~0xff;
|
|
|
|
imm = ((char)imm) * 2 + 4 ;
|
|
|
|
goto ok;
|
|
|
|
case BRANCH_12:
|
|
|
|
imm = ((nibs[1]) << 8) | (nibs[2] << 4) | (nibs[3]);
|
|
|
|
if (imm & 0x800)
|
|
|
|
imm |= ~0xfff;
|
|
|
|
imm = imm * 2 + 4;
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_4:
|
|
|
|
case IMM1_4:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = nibs[3];
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_4BY2:
|
|
|
|
case IMM1_4BY2:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = nibs[3] <<1;
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_4BY4:
|
|
|
|
case IMM1_4BY4:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = nibs[3] <<2;
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_8:
|
|
|
|
case IMM1_8:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = (nibs[2] << 4) | nibs[3];
|
|
|
|
goto ok;
|
|
|
|
case PCRELIMM_8BY2:
|
|
|
|
imm = ((nibs[2] << 4) | nibs[3]) <<1;
|
|
|
|
relmask = ~ (bfd_vma) 1;
|
|
|
|
goto ok;
|
|
|
|
case PCRELIMM_8BY4:
|
|
|
|
imm = ((nibs[2] << 4) | nibs[3]) <<2;
|
|
|
|
relmask = ~ (bfd_vma) 3;
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_8BY2:
|
|
|
|
case IMM1_8BY2:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = ((nibs[2] << 4) | nibs[3]) <<1;
|
|
|
|
goto ok;
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case IMM0_8BY4:
|
|
|
|
case IMM1_8BY4:
|
1999-05-03 07:29:11 +00:00
|
|
|
imm = ((nibs[2] << 4) | nibs[3]) <<2;
|
|
|
|
goto ok;
|
|
|
|
case REG_N:
|
|
|
|
rn = nibs[n];
|
|
|
|
break;
|
|
|
|
case REG_M:
|
|
|
|
rm = nibs[n];
|
|
|
|
break;
|
|
|
|
case REG_NM:
|
|
|
|
rn = (nibs[n] & 0xc) >> 2;
|
|
|
|
rm = (nibs[n] & 0x3);
|
|
|
|
break;
|
|
|
|
case REG_B:
|
|
|
|
rb = nibs[n] & 0x07;
|
|
|
|
break;
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
case SDT_REG_N:
|
|
|
|
/* sh-dsp: single data transfer. */
|
|
|
|
rn = nibs[n];
|
|
|
|
if ((rn & 0xc) != 4)
|
|
|
|
goto fail;
|
|
|
|
rn = rn & 0x3;
|
|
|
|
rn |= (rn & 2) << 1;
|
|
|
|
break;
|
|
|
|
case PPI:
|
sh-dsp REPEAT support:
opcodes:
* sh-opc.h (sh_nibble_type): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(sh_arg_type): Add A_PC.
(sh_table): Update entries using immediates. Add repeat.
* sh-dis.c (print_insn_shx): Remove DISP_8 and DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
gas:
* config/tc-sh.c (immediate): Delete.
(sh_operand_info): Add immediate member.
(parse_reg): Use A_PC for pc.
(parse_exp): Add second argument 'op'. All callers changed.
(parse_at): Expect pc to be coded as A_PC.
Use immediate field in *op.
(insert): Add fourth argument 'op'. All callers changed.
(build_relax): Add second argument 'op'. All callers changed.
(insert_loop_bounds): New function.
(build_Mytes): Remove DISP_4.
Split IMM_[48]{,BY[24]} into IMM[01]_[48]{,BY[24]}. Add REPEAT.
(assemble_ppi): Use immediate field in *operand.
(sh_force_relocation): Handle BFD_RELOC_SH_LOOP_{START,END}.
(md_apply_fix): Likewise.
(tc_gen_reloc): Likewise. Check for a pcrel BFD_RELOC_SH_LABEL.
include/coff:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): Define.
include/elf:
* sh.h (R_SH_LOOP_START, R_SH_LOOP_END): New RELOC_NUMBERs.
bfd:
* reloc.c (_bfd_relocate_contents): Add BFD_RELOC_SH_LOOP_START and
BFD_RELOC_SH_LOOP_END.
* elf32-sh.c (sh_elf_howto_tab): Change special_func to
sh_elf_ignore_reloc for all entries that sh_elf_reloc used to ignore.
Add entries for R_SH_LOOP_START and R_SH_LOOP_END.
(sh_elf_reloc_loop): New function.
(sh_elf_reloc): No need to test for always-to-be-ignored relocs
any more.
(sh_rel): Add entries for BFD_RELOC_SH_LOOP_{START,END}.
(sh_elf_relocate_section): Handle BFD_RELOC_SH_LOOP_{START,END}.
* bfd-in2.h, libbfd.h: Regenerate.
2000-04-05 21:23:05 +00:00
|
|
|
case REPEAT:
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
goto fail;
|
1999-05-03 07:29:11 +00:00
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ok:
|
|
|
|
fprintf_fn (stream,"%s\t", op->name);
|
|
|
|
disp_pc = 0;
|
|
|
|
for (n = 0; n < 3 && op->arg[n] != A_END; n++)
|
|
|
|
{
|
|
|
|
if (n && op->arg[1] != A_END)
|
|
|
|
fprintf_fn (stream, ",");
|
|
|
|
switch (op->arg[n])
|
|
|
|
{
|
|
|
|
case A_IMM:
|
|
|
|
fprintf_fn (stream, "#%d", (char)(imm));
|
|
|
|
break;
|
|
|
|
case A_R0:
|
|
|
|
fprintf_fn (stream, "r0");
|
|
|
|
break;
|
|
|
|
case A_REG_N:
|
|
|
|
fprintf_fn (stream, "r%d", rn);
|
|
|
|
break;
|
|
|
|
case A_INC_N:
|
|
|
|
fprintf_fn (stream, "@r%d+", rn);
|
|
|
|
break;
|
|
|
|
case A_DEC_N:
|
|
|
|
fprintf_fn (stream, "@-r%d", rn);
|
|
|
|
break;
|
|
|
|
case A_IND_N:
|
|
|
|
fprintf_fn (stream, "@r%d", rn);
|
|
|
|
break;
|
|
|
|
case A_DISP_REG_N:
|
|
|
|
fprintf_fn (stream, "@(%d,r%d)", imm, rn);
|
|
|
|
break;
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
case A_PMOD_N:
|
|
|
|
fprintf_fn (stream, "@r%d+r8", rn);
|
|
|
|
break;
|
1999-05-03 07:29:11 +00:00
|
|
|
case A_REG_M:
|
|
|
|
fprintf_fn (stream, "r%d", rm);
|
|
|
|
break;
|
|
|
|
case A_INC_M:
|
|
|
|
fprintf_fn (stream, "@r%d+", rm);
|
|
|
|
break;
|
|
|
|
case A_DEC_M:
|
|
|
|
fprintf_fn (stream, "@-r%d", rm);
|
|
|
|
break;
|
|
|
|
case A_IND_M:
|
|
|
|
fprintf_fn (stream, "@r%d", rm);
|
|
|
|
break;
|
|
|
|
case A_DISP_REG_M:
|
|
|
|
fprintf_fn (stream, "@(%d,r%d)", imm, rm);
|
|
|
|
break;
|
|
|
|
case A_REG_B:
|
|
|
|
fprintf_fn (stream, "r%d_bank", rb);
|
|
|
|
break;
|
|
|
|
case A_DISP_PC:
|
|
|
|
disp_pc = 1;
|
|
|
|
disp_pc_addr = imm + 4 + (memaddr & relmask);
|
|
|
|
(*info->print_address_func) (disp_pc_addr, info);
|
|
|
|
break;
|
|
|
|
case A_IND_R0_REG_N:
|
|
|
|
fprintf_fn (stream, "@(r0,r%d)", rn);
|
|
|
|
break;
|
|
|
|
case A_IND_R0_REG_M:
|
|
|
|
fprintf_fn (stream, "@(r0,r%d)", rm);
|
|
|
|
break;
|
|
|
|
case A_DISP_GBR:
|
|
|
|
fprintf_fn (stream, "@(%d,gbr)",imm);
|
|
|
|
break;
|
|
|
|
case A_R0_GBR:
|
|
|
|
fprintf_fn (stream, "@(r0,gbr)");
|
|
|
|
break;
|
|
|
|
case A_BDISP12:
|
|
|
|
case A_BDISP8:
|
|
|
|
(*info->print_address_func) (imm + memaddr, info);
|
|
|
|
break;
|
|
|
|
case A_SR:
|
|
|
|
fprintf_fn (stream, "sr");
|
|
|
|
break;
|
|
|
|
case A_GBR:
|
|
|
|
fprintf_fn (stream, "gbr");
|
|
|
|
break;
|
|
|
|
case A_VBR:
|
|
|
|
fprintf_fn (stream, "vbr");
|
|
|
|
break;
|
bfd:
Reinstate bits of sh4 support that got accidentally deleted.
Add sh-dsp support.
bfd:
* archures.c (bfd_mach_sh2, bfd_mach_sh_dsp): New macros.
(bfd_mach_sh3_dsp): Likewise.
(bfd_mach_sh4): Reinstate.
(bfd_default_scan): Recognize 7410, 7708, 7729 and 7750.
* bfd-in2.h: Regenerate.
* coff-sh.c (struct sh_opcode): flags is no longer short.
(USESAS, USESAS_REG, USESR8, SETSAS, SETSAS_REG): New macros.
(sh_opcode41, sh_opcode42): Integrate as sh_opcode41.
(sh_opcode01, sh_opcode02, sh_opcode40): Add sh-dsp opcodes.
(sh_opcode41, sh_opcode4, sh_opcode80): Likewise.
(sh_opcodes): No longer const.
(sh_dsp_opcodef0, sh_dsp_opcodef): New arrays.
(sh_insn_uses_reg): Check for USESAS and USESR8.
(sh_insn_sets_reg, sh_insns_conflict): Check for SETSAS.
(_bfd_sh_align_load_span): Return early for SH4.
Modify sh_opcodes lookup table for sh-dsp / sh3-dsp.
Take into account that field b of a parallel processing insn
could be mistaken for a separate insn.
* cpu-sh.c (arch_info_struct): New array elements for
sh2, sh-dsp and sh3-dsp.
Reinstate element for sh4.
(SH2_NEXT, SH_DSP_NEXT, SH3_DSP_NEXT): New macros.
(SH4_NEXT): Reinstate.
(SH3_NEXT, SH3E_NEXT): Adjust.
* elf-bfd.h (_sh_elf_set_mach_from_flags): Declare.
* elf32-sh.c (sh_elf_set_private_flags): New function.
(sh_elf_copy_private_data, sh_elf_set_mach_from_flags): Likewise.
(sh_elf_merge_private_data): New function.
(elf_backend_object_p, bfd_elf32_bfd_set_private_bfd_flags): Define.
(bfd_elf32_bfd_copy_private_bfd_data): Define.
(bfd_elf32_bfd_merge_private_bfd_data): Change to
sh_elf_merge_private_data.
gas:
* config/tc-sh.c ("elf/sh.h"): Include.
(sh_dsp, valid_arch, reg_x, reg_y, reg_efg): New static variables.
(md.begin): Initialize target_arch.
Only include opcodes in has table that match selected architecture.
(parse_reg): Recognize register names for sh-dsp.
(parse_at): Recognize post-modify addressing.
(get_operands): The leading space is now optional.
(get_specific): Remove FDREG_N support. Add support for sh-dsp
arguments. Update valid_arch.
(build_Mytes): Add support for SDT_REG_N.
(find_cooked_opcode): New function, broken out of md_assemble.
(assemble_ppi, sh_elf_final_processing): New functions.
(md_assemble): Use find_cooked_opcode and assemble_ppi.
(md_longopts, md_parse_option): New option: -dsp.
* config/tc-sh.h (elf_tc_final_processing): Define.
(sh_elf_final_processing): Declare.
include/elf:
* sh.h: (EF_SH_MACH_MASK, EF_SH_UNKNOWN, EF_SH1, EF_SH2): New macros.
(EF_SH3, EF_SH_HAS_DSP, EF_SH_DSP, EF_SH3_DSP): Likewise.
(EF_SH_HAS_FP, EF_SH3E, EF_SH4, EF_SH_MERGE_MACH): Likewise.
opcodes:
* sh-dis.c (print_movxy, print_insn_ddt, print_dsp_reg): New functions.
(print_insn_ppi): Likewise.
(print_insn_shx): Use info->mach to select appropriate insn set.
Add support for sh-dsp. Remove FD_REG_N support.
* sh-opc.h (sh_nibble_type): Add new values for sh-dsp support.
(sh_arg_type): Likewise. Remove FD_REG_N.
(sh_dsp_reg_nums): New enum.
(arch_sh1, arch_sh2, arch_sh3, arch_sh3e, arch_sh4): New macros.
(arch_sh_dsp, arch_sh3_dsp, arch_sh1_up, arch_sh2_up): Likewise.
(arch_sh3_up, arch_sh3e_up, arch_sh4_up, arch_sh_dsp_up): Likewise.
(arch_sh3_dsp_up): Likewise.
(sh_opcode_info): New field: arch.
(sh_table): Split up insn with FD_REG_N into ones with F_REG_N and
D_REG_N. Fill in arch field. Add sh-dsp insns.
2000-02-17 00:33:36 +00:00
|
|
|
case A_DSR:
|
|
|
|
fprintf_fn (stream, "dsr");
|
|
|
|
break;
|
|
|
|
case A_MOD:
|
|
|
|
fprintf_fn (stream, "mod");
|
|
|
|
break;
|
|
|
|
case A_RE:
|
|
|
|
fprintf_fn (stream, "re");
|
|
|
|
break;
|
|
|
|
case A_RS:
|
|
|
|
fprintf_fn (stream, "rs");
|
|
|
|
break;
|
|
|
|
case A_A0:
|
|
|
|
fprintf_fn (stream, "a0");
|
|
|
|
break;
|
|
|
|
case A_X0:
|
|
|
|
fprintf_fn (stream, "x0");
|
|
|
|
break;
|
|
|
|
case A_X1:
|
|
|
|
fprintf_fn (stream, "x1");
|
|
|
|
break;
|
|
|
|
case A_Y0:
|
|
|
|
fprintf_fn (stream, "y0");
|
|
|
|
break;
|
|
|
|
case A_Y1:
|
|
|
|
fprintf_fn (stream, "y1");
|
|
|
|
break;
|
|
|
|
case DSP_REG_M:
|
|
|
|
print_dsp_reg (rm, fprintf_fn, stream);
|
|
|
|
break;
|
1999-05-03 07:29:11 +00:00
|
|
|
case A_SSR:
|
|
|
|
fprintf_fn (stream, "ssr");
|
|
|
|
break;
|
|
|
|
case A_SPC:
|
|
|
|
fprintf_fn (stream, "spc");
|
|
|
|
break;
|
|
|
|
case A_MACH:
|
|
|
|
fprintf_fn (stream, "mach");
|
|
|
|
break;
|
|
|
|
case A_MACL:
|
|
|
|
fprintf_fn (stream ,"macl");
|
|
|
|
break;
|
|
|
|
case A_PR:
|
|
|
|
fprintf_fn (stream, "pr");
|
|
|
|
break;
|
|
|
|
case A_SGR:
|
|
|
|
fprintf_fn (stream, "sgr");
|
|
|
|
break;
|
|
|
|
case A_DBR:
|
|
|
|
fprintf_fn (stream, "dbr");
|
|
|
|
break;
|
|
|
|
case F_REG_N:
|
|
|
|
fprintf_fn (stream, "fr%d", rn);
|
|
|
|
break;
|
|
|
|
case F_REG_M:
|
|
|
|
fprintf_fn (stream, "fr%d", rm);
|
|
|
|
break;
|
|
|
|
case DX_REG_N:
|
|
|
|
if (rn & 1)
|
|
|
|
{
|
|
|
|
fprintf_fn (stream, "xd%d", rn & ~1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
d_reg_n:
|
|
|
|
case D_REG_N:
|
|
|
|
fprintf_fn (stream, "dr%d", rn);
|
|
|
|
break;
|
|
|
|
case DX_REG_M:
|
|
|
|
if (rm & 1)
|
|
|
|
{
|
|
|
|
fprintf_fn (stream, "xd%d", rm & ~1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case D_REG_M:
|
|
|
|
fprintf_fn (stream, "dr%d", rm);
|
|
|
|
break;
|
|
|
|
case FPSCR_M:
|
|
|
|
case FPSCR_N:
|
|
|
|
fprintf_fn (stream, "fpscr");
|
|
|
|
break;
|
|
|
|
case FPUL_M:
|
|
|
|
case FPUL_N:
|
|
|
|
fprintf_fn (stream, "fpul");
|
|
|
|
break;
|
|
|
|
case F_FR0:
|
|
|
|
fprintf_fn (stream, "fr0");
|
|
|
|
break;
|
|
|
|
case V_REG_N:
|
|
|
|
fprintf_fn (stream, "fv%d", rn*4);
|
|
|
|
break;
|
|
|
|
case V_REG_M:
|
|
|
|
fprintf_fn (stream, "fv%d", rm*4);
|
|
|
|
break;
|
|
|
|
case XMTRX_M4:
|
|
|
|
fprintf_fn (stream, "xmtrx");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* This code prints instructions in delay slots on the same line
|
|
|
|
as the instruction which needs the delay slots. This can be
|
|
|
|
confusing, since other disassembler don't work this way, and
|
|
|
|
it means that the instructions are not all in a line. So I
|
|
|
|
disabled it. Ian. */
|
|
|
|
if (!(info->flags & 1)
|
|
|
|
&& (op->name[0] == 'j'
|
|
|
|
|| (op->name[0] == 'b'
|
|
|
|
&& (op->name[1] == 'r'
|
|
|
|
|| op->name[1] == 's'))
|
|
|
|
|| (op->name[0] == 'r' && op->name[1] == 't')
|
|
|
|
|| (op->name[0] == 'b' && op->name[2] == '.')))
|
|
|
|
{
|
|
|
|
info->flags |= 1;
|
|
|
|
fprintf_fn (stream, "\t(slot ");
|
|
|
|
print_insn_shx (memaddr + 2, info);
|
|
|
|
info->flags &= ~1;
|
|
|
|
fprintf_fn (stream, ")");
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (disp_pc && strcmp (op->name, "mova") != 0)
|
|
|
|
{
|
|
|
|
int size;
|
|
|
|
bfd_byte bytes[4];
|
|
|
|
|
|
|
|
if (relmask == ~ (bfd_vma) 1)
|
|
|
|
size = 2;
|
|
|
|
else
|
|
|
|
size = 4;
|
|
|
|
status = info->read_memory_func (disp_pc_addr, bytes, size, info);
|
|
|
|
if (status == 0)
|
|
|
|
{
|
|
|
|
unsigned int val;
|
|
|
|
|
|
|
|
if (size == 2)
|
|
|
|
{
|
|
|
|
if ((info->flags & LITTLE_BIT) != 0)
|
|
|
|
val = bfd_getl16 (bytes);
|
|
|
|
else
|
|
|
|
val = bfd_getb16 (bytes);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ((info->flags & LITTLE_BIT) != 0)
|
|
|
|
val = bfd_getl32 (bytes);
|
|
|
|
else
|
|
|
|
val = bfd_getb32 (bytes);
|
|
|
|
}
|
|
|
|
fprintf_fn (stream, "\t! 0x%x", val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 2;
|
|
|
|
fail:
|
|
|
|
;
|
|
|
|
|
|
|
|
}
|
|
|
|
fprintf_fn (stream, ".word 0x%x%x%x%x", nibs[0], nibs[1], nibs[2], nibs[3]);
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
print_insn_shl (memaddr, info)
|
|
|
|
bfd_vma memaddr;
|
|
|
|
struct disassemble_info *info;
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
info->flags = LITTLE_BIT;
|
|
|
|
r = print_insn_shx (memaddr, info);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
print_insn_sh (memaddr, info)
|
|
|
|
bfd_vma memaddr;
|
|
|
|
struct disassemble_info *info;
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
|
|
|
|
info->flags = 0;
|
|
|
|
r = print_insn_shx (memaddr, info);
|
|
|
|
return r;
|
|
|
|
}
|