Merge GDB 7.5.1

opcodes/crx-dis.c

 /* Disassembler code for CRX.
-   Copyright 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright 2004, 2005, 2006, 2007, 2012 Free Software Foundation, Inc.
    Contributed by Tomer Levi, NSC, Israel.
    Written by Tomer Levi.
 
    This file is part of the GNU opcodes library.
 
    This library 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.
 
    It 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/crx.h"
 
 /* String to print when opcode was not matched.  */
 #define ILLEGAL "illegal"
   /* Escape to 16-bit immediate.  */
 #define ESCAPE_16_BIT  0xE
 
 /* Extract 'n_bits' from 'a' starting from offset 'offs'.  */
 #define EXTRACT(a, offs, n_bits)            \
   (n_bits == 32 ? (((a) >> (offs)) & 0xffffffffL)   \
@@ skipping 506 matching lines @@
 
           if ((reg_arg_type == COP_ARG) || (reg_arg_type == COPS_ARG))
             {
                 /*  Check for proper argument number.  */
                 if (processing_argument_number == 2)
                   {
                     getregliststring (a->constant, string, reg_arg_type);
                     func (stream, "%s", string);
                   }
                 else
-                  func (stream, "$0x%lx", a->constant);
+                  func (stream, "$0x%lx", a->constant & 0xffffffff);
             }
           else
             {
               getregliststring (a->constant, string, reg_arg_type);
               func (stream, "%s", string);
             }
         }
       else
-        func (stream, "$0x%lx", a->constant);
+        func (stream, "$0x%lx", a->constant & 0xffffffff);
       break;
 
     case arg_idxr:
-      func (stream, "0x%lx(%s,%s,%d)", a->constant, getregname (a->r),
-            getregname (a->i_r), powerof2 (a->scale));
+      func (stream, "0x%lx(%s,%s,%d)", a->constant & 0xffffffff,
+            getregname (a->r), getregname (a->i_r), powerof2 (a->scale));
       break;
 
     case arg_rbase:
       func (stream, "(%s)", getregname (a->r));
       break;
 
     case arg_cr:
-      func (stream, "0x%lx(%s)", a->constant, getregname (a->r));
+      func (stream, "0x%lx(%s)", a->constant & 0xffffffff, getregname (a->r));
 
       if (IS_INSN_TYPE (LD_STOR_INS_INC))
         func (stream, "+");
       break;
 
     case arg_c:
       /* Removed the *2 part as because implicit zeros are no more required.
          Have to fix this as this needs a bit of extension in terms of branchins.
          Have to add support for cmp and branch instructions.  */
       if (IS_INSN_TYPE (BRANCH_INS) || IS_INSN_MNEMONIC ("bal")
@@ skipping 152 matching lines @@
         info->fprintf_func (info->stream, "\t");
       make_instruction ();
       print_arguments (&currInsn, memaddr, info);
       return currInsn.size;
     }
 
   /* No match found.  */
   info->fprintf_func (info->stream,"%s ",ILLEGAL);
   return 2;
 }