aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/dlx-dis.c22
2 files changed, 16 insertions, 11 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f6dae2f..5e522c6 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10 Pierre Muller <muller@ics.u-strasbg.fr>
+
+ * src/opcodes/dlx-dis.c (print_insn_dlx): Use dlx_insn type for
+ dlx_insn_type array.
+
2010-08-31 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/11960
diff --git a/opcodes/dlx-dis.c b/opcodes/dlx-dis.c
index f055c4d..aca9db4 100644
--- a/opcodes/dlx-dis.c
+++ b/opcodes/dlx-dis.c
@@ -437,18 +437,18 @@ print_insn_dlx (bfd_vma memaddr, struct disassemble_info* info)
bfd_byte buffer[4];
int insn_idx;
unsigned long insn_word;
- unsigned long dlx_insn_type[] =
+ dlx_insn dlx_insn_type[] =
{
- (unsigned long) dlx_r_type,
- (unsigned long) dlx_load_type,
- (unsigned long) dlx_store_type,
- (unsigned long) dlx_aluI_type,
- (unsigned long) dlx_br_type,
- (unsigned long) dlx_jmp_type,
- (unsigned long) dlx_jr_type,
- (unsigned long) NULL
+ dlx_r_type,
+ dlx_load_type,
+ dlx_store_type,
+ dlx_aluI_type,
+ dlx_br_type,
+ dlx_jmp_type,
+ dlx_jr_type,
+ (dlx_insn) NULL
};
- int dlx_insn_type_num = ((sizeof dlx_insn_type) / (sizeof (unsigned long))) - 1;
+ int dlx_insn_type_num = ((sizeof dlx_insn_type) / (sizeof (dlx_insn))) - 1;
int status =
(*info->read_memory_func) (memaddr, (bfd_byte *) &buffer[0], 4, info);
@@ -483,7 +483,7 @@ print_insn_dlx (bfd_vma memaddr, struct disassemble_info* info)
current_insn_addr = (unsigned long) memaddr;
for (insn_idx = 0; dlx_insn_type[insn_idx] != 0x0; insn_idx++)
- switch (((dlx_insn) (dlx_insn_type[insn_idx])) (info))
+ switch ((dlx_insn_type[insn_idx]) (info))
{
/* Found the correct opcode */
case R_TYPE: