From 73335eaedfb1e1129d76e7b2a6ecea6984ac6aa9 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 7 Jan 2013 15:09:07 +0000 Subject: [PATCH] (make_instruction): Rename to cr16_make_instruction. (match_opcode): Rename to cr16_match_opcode. --- include/opcode/ChangeLog | 5 +++++ include/opcode/cr16.h | 4 ++-- opcodes/ChangeLog | 5 +++++ opcodes/cr16-dis.c | 8 ++++---- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 90c313ab460..64c931aa499 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,8 @@ +2013-01-07 Kaushik Phatak + + * cr16.h (make_instruction): Rename to cr16_make_instruction. + (match_opcode): Rename to cr16_match_opcode. + 2013-01-04 Juergen Urban * mips.h: Add support for r5900 instructions including lq and sq. diff --git a/include/opcode/cr16.h b/include/opcode/cr16.h index 76ac3a6bc19..1f1191dc664 100644 --- a/include/opcode/cr16.h +++ b/include/opcode/cr16.h @@ -445,7 +445,7 @@ extern ULONGLONG cr16_allWords; extern ins cr16_currInsn; /* Prototypes for function in cr16-dis.c. */ -extern void make_instruction (void); -extern int match_opcode (void); +extern void cr16_make_instruction (void); +extern int cr16_match_opcode (void); #endif /* _CR16_H_ */ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index ed0f903d0df..b8c2246ae28 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2013-01-07 Kaushik Phatak + + * cr16-dis.c (make_instruction): Rename to cr16_make_instruction. + (match_opcode): Rename to cr16_match_opcode. + 2013-01-04 Juergen Urban * mips-dis.c: Add names for CP0 registers of r5900. diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c index 9fbdf00a5a9..c8cf3a397cc 100644 --- a/opcodes/cr16-dis.c +++ b/opcodes/cr16-dis.c @@ -315,7 +315,7 @@ build_mask (void) /* Search for a matching opcode. Return 1 for success, 0 for failure. */ int -match_opcode (void) +cr16_match_opcode (void) { unsigned long mask; /* The instruction 'constant' opcode doewsn't exceed 32 bits. */ @@ -743,7 +743,7 @@ print_arguments (ins *currentInsn, bfd_vma memaddr, struct disassemble_info *inf /* Build the instruction's arguments. */ void -make_instruction (void) +cr16_make_instruction (void) { int i; unsigned int shift; @@ -813,7 +813,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info) /* Retrieve the encoding from current memory location. */ get_words_at_PC (memaddr, info); /* Find a matching opcode in table. */ - is_decoded = match_opcode (); + is_decoded = cr16_match_opcode (); /* If found, print the instruction's mnemonic and arguments. */ if (is_decoded > 0 && (cr16_words[0] << 16 || cr16_words[1]) != 0) { @@ -825,7 +825,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info) if (((cr16_currInsn.nargs = get_number_of_operands ()) != 0) && ! (IS_INSN_MNEMONIC ("b"))) info->fprintf_func (info->stream, "\t"); - make_instruction (); + cr16_make_instruction (); /* For push/pop/pushrtn with RA instructions. */ if ((INST_HAS_REG_LIST) && ((cr16_words[0] >> 7) & 0x1)) cr16_currInsn.nargs +=1; -- 2.30.2