diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 7 | ||||
| -rw-r--r-- | opcodes/ia64-dis.c | 2 | ||||
| -rw-r--r-- | opcodes/m88k-dis.c | 10 | ||||
| -rw-r--r-- | opcodes/tic80-opc.c | 16 |
4 files changed, 21 insertions, 14 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index e36675a..b7603b4 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2009-09-05 Martin Thuresson <martin@mtme.org> + + * ia64-dis.c (print_insn_ia64): Update code to use renamed member. + * m88k-dis.c (m88kdis): Rename variable class to in_class. + * tic80-opc.c (tic80_symbol_to_value, tic80_value_to_symbol): + Rename argument class to symbol_class. + 2009-09-04 Jie Zhang <jie.zhang@analog.com> * bfin-dis.c (decode_pseudodbg_assert_0): Change according diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c index 4c1c7f8..13ee194 100644 --- a/opcodes/ia64-dis.c +++ b/opcodes/ia64-dis.c @@ -183,7 +183,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info) } } - switch (odesc->class) + switch (odesc->op_class) { case IA64_OPND_CLASS_CST: (*info->fprintf_func) (info->stream, "%s", odesc->str); diff --git a/opcodes/m88k-dis.c b/opcodes/m88k-dis.c index 73fc62f..181ae30 100644 --- a/opcodes/m88k-dis.c +++ b/opcodes/m88k-dis.c @@ -696,7 +696,7 @@ m88kdis (bfd_vma pc, unsigned int opcode; const HASHTAB *entry_ptr; int opmask; - unsigned int class; + unsigned int in_class; if (! ihashtab_initialized) { @@ -706,17 +706,17 @@ m88kdis (bfd_vma pc, /* Create the appropriate mask to isolate the opcode. */ opmask = DEFMASK; - class = instruction & DEFMASK; - if ((class >= SFU0) && (class <= SFU7)) + in_class = instruction & DEFMASK; + if ((in_class >= SFU0) && (in_class <= SFU7)) { if (instruction < SFU1) opmask = CTRLMASK; else opmask = SFUMASK; } - else if (class == RRR) + else if (in_class == RRR) opmask = RRRMASK; - else if (class == RRI10) + else if (in_class == RRI10) opmask = RRI10MASK; /* Isolate the opcode. */ diff --git a/opcodes/tic80-opc.c b/opcodes/tic80-opc.c index 86b1254..70e38ec 100644 --- a/opcodes/tic80-opc.c +++ b/opcodes/tic80-opc.c @@ -219,7 +219,7 @@ const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / siz in CLASS, and translates it to a numeric value, which it returns. If CLASS is zero, any symbol that matches NAME is translated. If - CLASS is non-zero, then only a symbol that has class CLASS is + CLASS is non-zero, then only a symbol that has symbol_class CLASS is matched. If no translation is possible, it returns -1, a value not used by @@ -233,9 +233,9 @@ const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / siz */ int -tic80_symbol_to_value (name, class) +tic80_symbol_to_value (name, symbol_class) char *name; - int class; + int symbol_class; { const struct predefined_symbol *pdsp; int low = 0; @@ -259,7 +259,7 @@ tic80_symbol_to_value (name, class) else { pdsp = &tic80_predefined_symbols[middle]; - if ((class == 0) || (class & PDS_VALUE (pdsp))) + if ((symbol_class == 0) || (symbol_class & PDS_VALUE (pdsp))) { rtnval = PDS_VALUE (pdsp); } @@ -271,13 +271,13 @@ tic80_symbol_to_value (name, class) } /* This function takes a value VAL and finds a matching predefined - symbol that is in the operand class specified by CLASS. If CLASS + symbol that is in the operand symbol_class specified by CLASS. If CLASS is zero, the first matching symbol is returned. */ const char * -tic80_value_to_symbol (val, class) +tic80_value_to_symbol (val, symbol_class) int val; - int class; + int symbol_class; { const struct predefined_symbol *pdsp; int ival; @@ -291,7 +291,7 @@ tic80_value_to_symbol (val, class) ival = PDS_VALUE (pdsp) & ~TIC80_OPERAND_MASK; if (ival == val) { - if ((class == 0) || (class & PDS_VALUE (pdsp))) + if ((symbol_class == 0) || (symbol_class & PDS_VALUE (pdsp))) { /* Found the desired match */ name = PDS_NAME (pdsp); |