/* Table of opcodes for the OpenRISC 1000 ISA.
- Copyright 2002, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+ Copyright 2002, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
Contributed by Damjan Lampret (lampret@opencores.org).
This file is part of the GNU opcodes library.
/* Calculates instruction length in bytes. Always 4 for OR32. */
int
-insn_len (int insn_index ATTRIBUTE_UNUSED)
+insn_len (int i_index ATTRIBUTE_UNUSED)
{
return 4;
}
}
const char *
-insn_name (int index)
+insn_name (int op_index)
{
- if (index >= 0 && index < (int) or32_num_opcodes)
- return or32_opcodes[index].name;
+ if (op_index >= 0 && op_index < (int) or32_num_opcodes)
+ return or32_opcodes[op_index].name;
else
return "???";
}
{
unsigned long tmp = strtol (enc, NULL, 16);
#if DEBUG
- printf (" enc=%s, tmp=%x ", enc, tmp);
+ printf (" enc=%s, tmp=%lx ", enc, tmp);
#endif
if (param_ch == '0')
tmp = 15 - tmp;
opc_pos--;
param_pos--;
#if DEBUG
- printf ("\n ret=%x opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
+ printf ("\n ret=%lx opc_pos=%x, param_pos=%x\n", ret, opc_pos, param_pos);
#endif
if (ISLOWER (param_ch))
ret -= ((insn >> opc_pos) & 0x1) << param_pos;
enc++;
#if DEBUG
- printf ("ret=%x\n", ret);
+ printf ("ret=%lx\n", ret);
#endif
return ret;
}
or32_print_register (char param_ch, char *encoding, unsigned long insn)
{
int regnum = or32_extract(param_ch, encoding, insn);
-
- sprintf (disassembled, "%sr%d", disassembled, regnum);
+ char s_regnum[20];
+
+ sprintf (s_regnum, "r%d", regnum);
+ strcat (disassembled, s_regnum);
}
/* Print immediate. Used only by print_insn. */
or32_print_immediate (char param_ch, char *encoding, unsigned long insn)
{
int imm = or32_extract (param_ch, encoding, insn);
+ char s_imm[20];
imm = extend_imm (imm, param_ch);
-
+
if (letter_signed (param_ch))
{
if (imm < 0)
- sprintf (disassembled, "%s%d", disassembled, imm);
+ sprintf (s_imm, "%d", imm);
else
- sprintf (disassembled, "%s0x%x", disassembled, imm);
+ sprintf (s_imm, "0x%x", imm);
}
else
- sprintf (disassembled, "%s%#x", disassembled, imm);
+ sprintf (s_imm, "%#x", imm);
+ strcat (disassembled, s_imm);
}
/* Disassemble one instruction from insn to disassemble.
int
disassemble_insn (unsigned long insn)
{
- int index;
- index = insn_decode (insn);
+ int op_index;
+ op_index = insn_decode (insn);
- if (index >= 0)
+ if (op_index >= 0)
{
- struct or32_opcode const *opcode = &or32_opcodes[index];
+ struct or32_opcode const *opcode = &or32_opcodes[op_index];
char *s;
sprintf (disassembled, "%s ", opcode->name);
if (strchr (opcode->encoding, *s))
or32_print_immediate (*s, opcode->encoding, insn);
else
- sprintf (disassembled, "%s%c", disassembled, *s);
+ {
+ char s_encoding[2] = { *s, '\0' };
+
+ strcat (disassembled, s_encoding);
+ }
+
}
}
}
else
{
+ char s_insn[20];
+
/* This used to be %8x for binutils. */
- sprintf (disassembled, "%s.word 0x%08lx", disassembled, insn);
+ sprintf (s_insn, ".word 0x%08lx", insn);
+ strcat (disassembled, s_insn);
}
return insn_len (insn);