[AArch64] Add ARMv8.3 pointer authentication key registers

[deliverable/binutils-gdb.git] / opcodes / cr16-dis.c

diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index 9fbdf00a5a954a5572d3abf236e90857d00899a8..1d7054aff3f2f1ff7f931b991a5e1b5272f01217 100644 (file)
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler code for CR16.
-   Copyright 2007, 2008, 2009, 2012, 2013  Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
    Contributed by M R Swami Reddy (MR.Swami.Reddy@nsc.com).
 
    This file is part of GAS, GDB and the GNU binutils.
@@ -315,10 +315,10 @@ 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.  */
+  /* The instruction 'constant' opcode doesn't exceed 32 bits.  */
   unsigned long doubleWord = (cr16_words[1]
                             + (cr16_words[0] << 16)) & 0xffffffff;
 
@@ -358,7 +358,7 @@ make_argument (argument * a, int start_bits)
   switch (a->type)
     {
     case arg_r:
-      p = makelongparameter (cr16_allWords, 
+      p = makelongparameter (cr16_allWords,
                             inst_bit_size - (start_bits + a->size),
                             inst_bit_size - start_bits);
       a->r = p.val;
@@ -386,7 +386,7 @@ make_argument (argument * a, int start_bits)
       break;
 
     case arg_ic:
-      p = makelongparameter (cr16_allWords, 
+      p = makelongparameter (cr16_allWords,
                             inst_bit_size - (start_bits + a->size),
                             inst_bit_size - start_bits);
       a->constant = p.val;
@@ -466,7 +466,7 @@ make_argument (argument * a, int start_bits)
        }
       else if (instruction->size == 2)
        {
-         p = makelongparameter (cr16_allWords, inst_bit_size - 16, 
+         p = makelongparameter (cr16_allWords, inst_bit_size - 16,
                                 inst_bit_size);
          a->constant = p.val;
        }
@@ -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;
@@ -795,7 +795,7 @@ get_words_at_PC (bfd_vma memaddr, struct disassemble_info *info)
   for (i = 0, mem = memaddr; i < 3; i++, mem += 2)
     cr16_words[i] = get_word_at_PC (mem, info);
 
-  cr16_allWords =  ((ULONGLONG) cr16_words[0] << 32) 
+  cr16_allWords =  ((ULONGLONG) cr16_words[0] << 32)
                   + ((unsigned long) cr16_words[1] << 16) + cr16_words[2];
 }
 
@@ -813,9 +813,9 @@ 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)
+  if (is_decoded > 0 && (cr16_words[0] != 0 || cr16_words[1] != 0))
     {
       if (strneq (instruction->mnemonic, "cinv", 4))
         info->fprintf_func (info->stream,"%s", getcinvstring (instruction->mnemonic));
@@ -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;