X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Falpha-dis.c;h=b702776371f52bd8804b0dfa37b05464c967a2c1;hb=331699936dd23746a7a079c63548c0ff25018320;hp=ce770bb41c880e6913a8aab0ffece0a09fbb8756;hpb=27e232885db363fb545fd2f450e72d929e59b8f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/alpha-dis.c b/opcodes/alpha-dis.c
index ce770bb41c..b702776371 100644
--- a/opcodes/alpha-dis.c
+++ b/opcodes/alpha-dis.c
@@ -1,24 +1,25 @@
 /* alpha-dis.c -- Disassemble Alpha AXP instructions
-   Copyright 1996, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2007
+   Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@tamu.edu>,
    patterned after the PPC opcode handling written by Ian Lance Taylor.
 
-This file is part of GDB, GAS, and the GNU binutils.
+   This file is part of libopcodes.
 
-GDB, GAS, and the GNU binutils are free software; you can redistribute
-them and/or modify them under the terms of the GNU General Public
-License as published by the Free Software Foundation; either version
-2, or (at your option) any later version.
+   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.
 
-GDB, GAS, and the GNU binutils are distributed in the hope that they
-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.
+   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 file; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this file; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include <stdio.h>
 #include "sysdep.h"
@@ -27,8 +28,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /* OSF register names.  */
 
-static const char * const osf_regnames[64] =
-{
+static const char * const osf_regnames[64] = {
   "v0", "t0", "t1", "t2", "t3", "t4", "t5", "t6",
   "t7", "s0", "s1", "s2", "s3", "s4", "s5", "fp",
   "a0", "a1", "a2", "a3", "a4", "a5", "t8", "t9",
@@ -41,8 +41,7 @@ static const char * const osf_regnames[64] =
 
 /* VMS register names.  */
 
-static const char * const vms_regnames[64] =
-{
+static const char * const vms_regnames[64] = {
   "R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7",
   "R8", "R9", "R10", "R11", "R12", "R13", "R14", "R15",
   "R16", "R17", "R18", "R19", "R20", "R21", "R22", "R23",
@@ -74,11 +73,11 @@ print_insn_alpha (memaddr, info)
       opcode_end = opcode + alpha_num_opcodes;
 
       for (op = 0; op < AXP_NOPS; ++op)
-        {
-          opcode_index[op] = opcode;
-          while (opcode < opcode_end && op == AXP_OP (opcode->opcode))
+	{
+	  opcode_index[op] = opcode;
+	  while (opcode < opcode_end && op == AXP_OP (opcode->opcode))
 	    ++opcode;
-        }
+	}
       opcode_index[op] = opcode;
     }
 
@@ -107,8 +106,8 @@ print_insn_alpha (memaddr, info)
     int status = (*info->read_memory_func) (memaddr, buffer, 4, info);
     if (status != 0)
       {
-        (*info->memory_error_func) (status, memaddr, info);
-        return -1;
+	(*info->memory_error_func) (status, memaddr, info);
+	return -1;
       }
     insn = bfd_getl32 (buffer);
   }
@@ -117,10 +116,10 @@ print_insn_alpha (memaddr, info)
   op = AXP_OP (insn);
 
   /* Find the first match in the opcode table.  */
-  opcode_end = opcode_index[op+1];
+  opcode_end = opcode_index[op + 1];
   for (opcode = opcode_index[op]; opcode < opcode_end; ++opcode)
     {
-      if ((insn & opcode->mask) != opcode->opcode)
+      if ((insn ^ opcode->opcode) & opcode->mask)
 	continue;
 
       if (!(opcode->flags & isa_mask))
@@ -130,14 +129,14 @@ print_insn_alpha (memaddr, info)
 	 have extraction functions, and, if they do, make sure the
 	 instruction is valid.  */
       {
-        int invalid = 0;
-        for (opindex = opcode->operands; *opindex != 0; opindex++)
+	int invalid = 0;
+	for (opindex = opcode->operands; *opindex != 0; opindex++)
 	  {
-            const struct alpha_operand *operand = alpha_operands + *opindex;
+	    const struct alpha_operand *operand = alpha_operands + *opindex;
 	    if (operand->extract)
 	      (*operand->extract) (insn, &invalid);
 	  }
-        if (invalid)
+	if (invalid)
 	  continue;
       }
 
@@ -147,7 +146,7 @@ print_insn_alpha (memaddr, info)
 
   /* No instruction found */
   (*info->fprintf_func) (info->stream, ".long %#08x", insn);
-    
+
   return 4;
 
 found:
@@ -182,7 +181,7 @@ found:
 	}
 
       if (need_comma &&
-	  ((operand->flags & (AXP_OPERAND_PARENS|AXP_OPERAND_COMMA))
+	  ((operand->flags & (AXP_OPERAND_PARENS | AXP_OPERAND_COMMA))
 	   != AXP_OPERAND_PARENS))
 	{
 	  (*info->fprintf_func) (info->stream, ",");
@@ -194,7 +193,7 @@ found:
       if (operand->flags & AXP_OPERAND_IR)
 	(*info->fprintf_func) (info->stream, "%s", regnames[value]);
       else if (operand->flags & AXP_OPERAND_FPR)
-	(*info->fprintf_func) (info->stream, "%s", regnames[value+32]);
+	(*info->fprintf_func) (info->stream, "%s", regnames[value + 32]);
       else if (operand->flags & AXP_OPERAND_RELATIVE)
 	(*info->print_address_func) (memaddr + 4 + value, info);
       else if (operand->flags & AXP_OPERAND_SIGNED)