aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/nios2-dis.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index dcacde2..fb8a642 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-06 Sandra Loosemore <sandra@codesourcery.com>
+
+ * nios2-dis.c (nios2_find_opcode_hash): Add mach parameter.
+ (nios2_disassemble): Adjust call to nios2_find_opcode_hash.
+
2014-11-03 Nick Clifton <nickc@redhat.com>
* po/fi.po: Updated Finnish translation.
diff --git a/opcodes/nios2-dis.c b/opcodes/nios2-dis.c
index 00ee342..7243fa9 100644
--- a/opcodes/nios2-dis.c
+++ b/opcodes/nios2-dis.c
@@ -153,9 +153,10 @@ nios2_init_opcode_hash (nios2_disassembler_state *state)
}
/* Return a pointer to an nios2_opcode struct for a given instruction
- opcode, or NULL if there is an error. */
+ word OPCODE for bfd machine MACH, or NULL if there is an error. */
const struct nios2_opcode *
-nios2_find_opcode_hash (unsigned long opcode)
+nios2_find_opcode_hash (unsigned long opcode,
+ unsigned long mach ATTRIBUTE_UNUSED)
{
nios2_opcode_hash *entry;
nios2_disassembler_state *state;
@@ -459,7 +460,7 @@ nios2_disassemble (bfd_vma address, unsigned long opcode,
/* Find the major opcode and use this to disassemble
the instruction and its arguments. */
- op = nios2_find_opcode_hash (opcode);
+ op = nios2_find_opcode_hash (opcode, info->mach);
if (op != NULL)
{