espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 14:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

* cris-dis.c (bytes_to_skip): Handle new parameter prefix_matchedp.

Browse Source 
(print_with_operands): Check for prefix when [PC+] is seen.
This commit is contained in:
Hans-Peter Nilsson
2005-12-05 23:27:01 +00:00
parent 63e199b91a
commit cdedc9f07f
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-06 Hans-Peter Nilsson <hp@axis.com>
* cris-dis.c (bytes_to_skip): Handle new parameter prefix_matchedp.
(print_with_operands): Check for prefix when [PC+] is seen.
2005-12-02 Dave Brolley <brolley@redhat.com> 2005-12-02 Dave Brolley <brolley@redhat.com>
* configure.in (cgen_files): Add cgen-bitset.lo. * configure.in (cgen_files): Add cgen-bitset.lo.

14
opcodes/cris-dis.c
View File

@ -651,7 +651,8 @@ format_sup_reg (unsigned int regno,
static unsigned static unsigned
bytes_to_skip (unsigned int insn, bytes_to_skip (unsigned int insn,
const struct cris_opcode *matchedp, const struct cris_opcode *matchedp,
enum cris_disass_family distype) enum cris_disass_family distype,
const struct cris_opcode *prefix_matchedp)
{ {
/* Each insn is a word plus "immediate" operands. */ /* Each insn is a word plus "immediate" operands. */
unsigned to_skip = 2; unsigned to_skip = 2;
@ -660,7 +661,8 @@ bytes_to_skip (unsigned int insn,
for (s = template; *s; s++) for (s = template; *s; s++)
if ((*s == 's' || *s == 'N' || *s == 'Y') if ((*s == 's' || *s == 'N' || *s == 'Y')
&& (insn & 0x400) && (insn & 15) == 15) && (insn & 0x400) && (insn & 15) == 15
&& prefix_matchedp == NULL)
{ {
/* Immediate via [pc+], so we have to check the size of the /* Immediate via [pc+], so we have to check the size of the
operand. */ operand. */
@ -880,7 +882,7 @@ print_with_operands (const struct cris_opcode *opcodep,
case 'S': case 'S':
case 's': case 's':
/* Any "normal" memory operand. */ /* Any "normal" memory operand. */
if ((insn & 0x400) && (insn & 15) == 15) if ((insn & 0x400) && (insn & 15) == 15 && prefix_opcodep == NULL)
{ {
/* We're looking at [pc+], i.e. we need to output an immediate /* We're looking at [pc+], i.e. we need to output an immediate
number, where the size can depend on different things. */ number, where the size can depend on different things. */
@ -1495,7 +1497,7 @@ print_insn_cris_generic (bfd_vma memaddr,
/* If it's a prefix, put it into the prefix vars and get the /* If it's a prefix, put it into the prefix vars and get the
main insn. */ main insn. */
prefix_size = bytes_to_skip (prefix_insn, matchedp, prefix_size = bytes_to_skip (prefix_insn, matchedp,
disdata->distype); disdata->distype, NULL);
prefix_opcodep = matchedp; prefix_opcodep = matchedp;
insn = bufp[prefix_size] + bufp[prefix_size + 1] * 256; insn = bufp[prefix_size] + bufp[prefix_size + 1] * 256;
@ -1527,7 +1529,9 @@ print_insn_cris_generic (bfd_vma memaddr,
} }
else else
{ {
advance += bytes_to_skip (insn, matchedp, disdata->distype); advance
+= bytes_to_skip (insn, matchedp, disdata->distype,
prefix_opcodep);
/* The info_type and assorted fields will be set according /* The info_type and assorted fields will be set according
to the operands. */ to the operands. */