Merge GDB 7.5.1

opcodes/cr16-dis.c

 /* Disassembler code for CR16.
-   Copyright 2007, 2008, 2009  Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009, 2012  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.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful, but WITHOUT
    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
    more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#include "sysdep.h"
 #include "dis-asm.h"
-#include "sysdep.h"
 #include "opcode/cr16.h"
 #include "libiberty.h"
 
 /* String to print when opcode was not matched.  */
 #define ILLEGAL  "illegal"
   /* Escape to 16-bit immediate.  */
 #define ESCAPE_16_BIT  0xB
 
 /* Extract 'n_bits' from 'a' starting from offset 'offs'.  */
 #define EXTRACT(a, offs, n_bits)                    \
@@ skipping 639 matching lines @@
           a->constant = (unsigned long int) (longdisp & mask);
         }
       /* For branch Neq instruction it is 2*offset + 2.  */
       else if (IS_INSN_TYPE (BRANCH_NEQ_INS))
         a->constant = 2 * a->constant + 2;
 
       if ((!IS_INSN_TYPE (CSTBIT_INS)) && (!IS_INSN_TYPE (LD_STOR_INS)))
         (sign_flag) ? func (stream, "%s", "*-"): func (stream, "%s","*+");
 
       /* PR 10173: Avoid printing the 0x prefix twice.  */
-      if (info->num_symbols > 0)
+      if (info->symtab_size > 0)
         func (stream, "%s", "0x");
       number = ((relative ? memaddr : 0) +
                 (sign_flag ? ((- a->constant) & 0xffffffe) : a->constant));
 
       (*info->print_address_func) ((number & ((1 << 24) - 1)), info);
 
       func (stream, "%s", print_exp_len (instruction->size * 16));
       break;
 
     default:
@@ skipping 129 matching lines @@
       if ((INST_HAS_REG_LIST) && ((words[0] >> 7) & 0x1))
         currInsn.nargs +=1;
       print_arguments (&currInsn, memaddr, info);
       return currInsn.size;
     }
 
   /* No match found.  */
   info->fprintf_func (info->stream,"%s ",ILLEGAL);
   return 2;
 }