projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arc: Don't generate dynamic relocation for non SEC_ALLOC sections
[deliverable/binutils-gdb.git]
/
opcodes
/
sh-dis.c
diff --git
a/opcodes/sh-dis.c
b/opcodes/sh-dis.c
index 381fa4da8d995322ab3855df25bdbb310c32d0df..00bcffa7c712be4573470e94f1b11969738622b6 100644
(file)
--- a/
opcodes/sh-dis.c
+++ b/
opcodes/sh-dis.c
@@
-1,33
+1,31
@@
/* Disassemble SH instructions.
/* Disassemble SH instructions.
- Copyright 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1993-2020 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This file is part of the GNU opcodes library.
+
+ This library is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.
+ the Free Software Foundation; either version
3, 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.
+ It 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
You should have received a copy of the GNU General Public License
- along with this
program; if not, write to the Free Softwar
e
- F
oundation, Inc.
, 51 Franklin Street - Fifth Floor, Boston,
+ along with this
file; see the file COPYING. If not, write to th
e
+ F
ree Software Foundation
, 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
MA 02110-1301, USA. */
-#include <stdio.h>
#include "sysdep.h"
#include "sysdep.h"
+#include <stdio.h>
+
#define STATIC_TABLE
#define DEFINE_TABLE
#include "sh-opc.h"
#define STATIC_TABLE
#define DEFINE_TABLE
#include "sh-opc.h"
-#include "dis-asm.h"
-
-#ifdef ARCH_all
-#define INCLUDE_SHMEDIA
-#endif
+#include "disassemble.h"
static void
print_movxy (const sh_opcode_info *op,
static void
print_movxy (const sh_opcode_info *op,
@@
-104,8
+102,7
@@
print_movxy (const sh_opcode_info *op,
/* 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
/* 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. */
+ a parallel processing insn follows. */
static void
print_insn_ddt (int insn, struct disassemble_info *info)
static void
print_insn_ddt (int insn, struct disassemble_info *info)
@@
-115,7
+112,10
@@
print_insn_ddt (int insn, struct disassemble_info *info)
/* If this is just a nop, make sure to emit something. */
if (insn == 0x000)
/* If this is just a nop, make sure to emit something. */
if (insn == 0x000)
- fprintf_fn (stream, "nopx\tnopy");
+ {
+ fprintf_fn (stream, "nopx\tnopy");
+ return;
+ }
/* If a parallel processing insn was printed before,
and we got a non-nop, emit a tab. */
/* If a parallel processing insn was printed before,
and we got a non-nop, emit a tab. */
@@
-123,8
+123,8
@@
print_insn_ddt (int insn, struct disassemble_info *info)
fprintf_fn (stream, "\t");
/* Check if either the x or y part is invalid. */
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)))
+ if (((insn &
3) != 0 && (insn &
0xc) == 0 && (insn & 0x2a0))
+ || ((insn & 3) == 0 && (insn & 0x
c) != 0 && (insn & 0x
150)))
if (info->mach != bfd_mach_sh_dsp
&& info->mach != bfd_mach_sh3_dsp)
{
if (info->mach != bfd_mach_sh_dsp
&& info->mach != bfd_mach_sh3_dsp)
{
@@
-150,7
+150,7
@@
print_insn_ddt (int insn, struct disassemble_info *info)
while (op->nibbles[2] != (unsigned) ((insn >> 4) & 3)
|| op->nibbles[3] != (unsigned) (insn & 0xf))
op++;
while (op->nibbles[2] != (unsigned) ((insn >> 4) & 3)
|| op->nibbles[3] != (unsigned) (insn & 0xf))
op++;
-
+
print_movxy (op,
(4 * ((insn & (is_movy ? 0x200 : 0x100)) == 0)
+ 2 * is_movy
print_movxy (op,
(4 * ((insn & (is_movy ? 0x200 : 0x100)) == 0)
+ 2 * is_movy
@@
-159,7
+159,7
@@
print_insn_ddt (int insn, struct disassemble_info *info)
fprintf_fn, stream);
}
else
fprintf_fn, stream);
}
else
- fprintf_fn (stream, ".word 0x%x", insn);
+ fprintf_fn (stream, ".word 0x%x", insn
| 0xf000
);
else
{
static const sh_opcode_info *first_movx, *first_movy;
else
{
static const sh_opcode_info *first_movx, *first_movy;
@@
-191,6
+191,8
@@
print_insn_ddt (int insn, struct disassemble_info *info)
print_movxy (opy, ((insn >> 8) & 1) + 6, (insn >> 6) & 1,
fprintf_fn, stream);
}
print_movxy (opy, ((insn >> 8) & 1) + 6, (insn >> 6) & 1,
fprintf_fn, stream);
}
+ if (!insn_x && !insn_y && ((insn & 0x3ff) != 0 || (insn & 0x800) == 0))
+ fprintf_fn (stream, ".word 0x%x", insn | 0xf000);
}
}
}
}
@@
-353,10
+355,10
@@
print_insn_ppi (int field_b, struct disassemble_info *info)
print_dsp_reg (field_b & 0xf, fprintf_fn, stream);
break;
case DSP_REG_X:
print_dsp_reg (field_b & 0xf, fprintf_fn, stream);
break;
case DSP_REG_X:
- fprintf_fn (stream, sx_tab[(field_b >> 6) & 3]);
+ fprintf_fn (stream,
"%s",
sx_tab[(field_b >> 6) & 3]);
break;
case DSP_REG_Y:
break;
case DSP_REG_Y:
- fprintf_fn (stream, sy_tab[(field_b >> 4) & 3]);
+ fprintf_fn (stream,
"%s",
sy_tab[(field_b >> 4) & 3]);
break;
case A_MACH:
fprintf_fn (stream, "mach");
break;
case A_MACH:
fprintf_fn (stream, "mach");
@@
-402,16
+404,6
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
&& bfd_asymbol_flavour(*info->symbols) == bfd_target_coff_flavour)
target_arch = arch_sh4;
break;
&& bfd_asymbol_flavour(*info->symbols) == bfd_target_coff_flavour)
target_arch = arch_sh4;
break;
- case bfd_mach_sh5:
-#ifdef INCLUDE_SHMEDIA
- status = print_insn_sh64 (memaddr, info);
- if (status != -2)
- return status;
-#endif
- /* When we get here for sh64, it's because we want to disassemble
- SHcompact, i.e. arch_sh4. */
- target_arch = arch_sh4;
- break;
default:
target_arch = sh_get_arch_from_bfd_mach (info->mach);
}
default:
target_arch = sh_get_arch_from_bfd_mach (info->mach);
}
@@
-605,7
+597,7
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
case IMM1_4BY4:
imm = nibs[3] << 2;
goto ok;
case IMM1_4BY4:
imm = nibs[3] << 2;
goto ok;
- case IMM0_8:
+ case IMM0_8
S
:
case IMM1_8:
imm = (nibs[2] << 4) | nibs[3];
disp = imm;
case IMM1_8:
imm = (nibs[2] << 4) | nibs[3];
disp = imm;
@@
-613,6
+605,10
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
if (imm & 0x80)
imm -= 0x100;
goto ok;
if (imm & 0x80)
imm -= 0x100;
goto ok;
+ case IMM0_8U:
+ disp = imm = (nibs[2] << 4) | nibs[3];
+ has_disp = 1;
+ goto ok;
case PCRELIMM_8BY2:
imm = ((nibs[2] << 4) | nibs[3]) << 1;
relmask = ~(bfd_vma) 1;
case PCRELIMM_8BY2:
imm = ((nibs[2] << 4) | nibs[3]) << 1;
relmask = ~(bfd_vma) 1;
@@
-834,6
+830,7
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
fprintf_fn (stream, "xd%d", rn & ~1);
break;
}
fprintf_fn (stream, "xd%d", rn & ~1);
break;
}
+ /* Fall through. */
case D_REG_N:
fprintf_fn (stream, "dr%d", rn);
break;
case D_REG_N:
fprintf_fn (stream, "dr%d", rn);
break;
@@
-843,6
+840,7
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
fprintf_fn (stream, "xd%d", rm & ~1);
break;
}
fprintf_fn (stream, "xd%d", rm & ~1);
break;
}
+ /* Fall through. */
case D_REG_M:
fprintf_fn (stream, "dr%d", rm);
break;
case D_REG_M:
fprintf_fn (stream, "dr%d", rm);
break;
@@
-903,6
+901,8
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
size = 2;
else
size = 4;
size = 2;
else
size = 4;
+ /* Not reading an instruction - disable stop_vma. */
+ info->stop_vma = 0;
status = info->read_memory_func (disp_pc_addr, bytes, size, info);
if (status == 0)
{
status = info->read_memory_func (disp_pc_addr, bytes, size, info);
if (status == 0)
{
@@
-924,11
+924,11
@@
print_insn_sh (bfd_vma memaddr, struct disassemble_info *info)
}
if ((*info->symbol_at_address_func) (val, info))
{
}
if ((*info->symbol_at_address_func) (val, info))
{
- fprintf_fn (stream, "\t!
0x
");
+ fprintf_fn (stream, "\t! ");
(*info->print_address_func) (val, info);
}
else
(*info->print_address_func) (val, info);
}
else
- fprintf_fn (stream, "\t!
0x
%x", val);
+ fprintf_fn (stream, "\t! %x", val);
}
}
}
}
This page took
0.029193 seconds
and
4
git commands to generate.