diff options
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-nios2.c | 2 | ||||
| -rw-r--r-- | include/opcode/ChangeLog | 5 | ||||
| -rw-r--r-- | include/opcode/nios2.h | 6 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/nios2-dis.c | 7 |
6 files changed, 23 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 0d6ef3b..dc11a68 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2014-11-06 Sandra Loosemore <sandra@codesourcery.com> + + * config/tc-nios2.c (nios2_diagnose_overflow): Adjust call to + nios2_find_opcode_hash. + 2014-11-05 Matthew Fortune <matthew.fortune@imgtec.com> * config/tc-mips.c (mips_elf_final_processing): Add INSN_ISA32R6 diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c index 3ed7a9e..7691fd1 100644 --- a/gas/config/tc-nios2.c +++ b/gas/config/tc-nios2.c @@ -1033,7 +1033,7 @@ nios2_diagnose_overflow (valueT fixup, reloc_howto_type *howto, unsigned int range_max; unsigned int address; - opcode = nios2_find_opcode_hash (value); + opcode = nios2_find_opcode_hash (value, bfd_get_mach (stdoutput)); gas_assert (opcode); gas_assert (fixP->fx_size == opcode->size); overflow_msg_type = opcode->overflow_msg; diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index be122b6..d40c9fd 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,8 @@ +2014-11-06 Sandra Loosemore <sandra@codesourcery.com> + + * nios2.h (nios2_find_opcode_hash): Add mach parameter to + declaration. Fix obsolete comment. + 2014-10-23 Sandra Loosemore <sandra@codesourcery.com> * nios2.h (enum iw_format_type): New. diff --git a/include/opcode/nios2.h b/include/opcode/nios2.h index dc0e058..6b4c2f5 100644 --- a/include/opcode/nios2.h +++ b/include/opcode/nios2.h @@ -154,8 +154,8 @@ extern struct nios2_reg *nios2_regs; extern const int nios2_num_builtin_regs; extern int nios2_num_regs; -/* This is made extern so that the assembler can use it to find out - what instruction caused an error. */ -extern const struct nios2_opcode *nios2_find_opcode_hash (unsigned long); +/* Return the opcode descriptor for a single instruction. */ +extern const struct nios2_opcode * +nios2_find_opcode_hash (unsigned long, unsigned long); #endif /* _NIOS2_H */ 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) { |