X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fi370-dis.c;h=98c110bcdfaa1f2158c6354df99837c7e5528bd2;hb=27a5525e751940f55974e64bdcf11f504e68d356;hp=51c0ff1dd3e714b0b2e91ba9eb574f4225655aaa;hpb=0d8dfecfe98596d2999f2616d7f2b904260022cc;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/i370-dis.c b/opcodes/i370-dis.c
index 51c0ff1dd3..98c110bcdf 100644
--- a/opcodes/i370-dis.c
+++ b/opcodes/i370-dis.c
@@ -1,24 +1,24 @@
-
 /* i370-dis.c -- Disassemble Instruction 370 (ESA/390) instructions
-   Copyright 1994, 2000 Free Software Foundation, Inc.
+   Copyright 1994, 2000, 2003, 2005, 2007  Free Software Foundation, Inc.
    PowerPC version written by Ian Lance Taylor, Cygnus Support
    Rewritten for i370 ESA/390 support by Linas Vepstas <linas@linas.org>
 
-This file is part of GDB, GAS, and the GNU binutils.
+   This file is part of the GNU opcodes library.
 
-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"
@@ -26,13 +26,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  *
 #include "opcode/i370.h"
 
 /* This file provides several disassembler functions, all of which use
-   the disassembler interface defined in dis-asm.h.
-*/
+   the disassembler interface defined in dis-asm.h.  */
 
 int
-print_insn_i370 (memaddr, info)
-     bfd_vma memaddr;
-     struct disassemble_info *info;
+print_insn_i370 (bfd_vma memaddr, struct disassemble_info *info)
 {
   bfd_byte buffer[8];
   int status;
@@ -47,7 +44,7 @@ print_insn_i370 (memaddr, info)
       return -1;
     }
 
-  /* Cast the bytes into the insn (in a host-endian indep way) */
+  /* Cast the bytes into the insn (in a host-endian indep way).  */
   insn.i[0] = (buffer[0] << 24) & 0xff000000;
   insn.i[0] |= (buffer[1] << 16) & 0xff0000;
   insn.i[0] |= (buffer[2] << 8) & 0xff00;
@@ -73,15 +70,17 @@ print_insn_i370 (memaddr, info)
           masked.i[0] &= 0xffff;
         }
       masked.i[0] &= opcode->mask.i[0];
-      if (masked.i[0] != opcode->opcode.i[0]) continue;
+      if (masked.i[0] != opcode->opcode.i[0])
+	continue;
 
       if (6 == opcode->len)
         {
           masked.i[1] &= opcode->mask.i[1];
-          if (masked.i[1] != opcode->opcode.i[1]) continue;
+          if (masked.i[1] != opcode->opcode.i[1])
+	    continue;
         }
 
-      /* Found a match.  adjust a tad */
+      /* Found a match.  adjust a tad.  */
       if (2 == opcode->len)
         {
           insn.i[0] >>= 16;
@@ -98,7 +97,8 @@ print_insn_i370 (memaddr, info)
           if (operand->extract)
             (*operand->extract) (insn, &invalid);
         }
-      if (invalid) continue;
+      if (invalid)
+	continue;
 
       /* The instruction is valid.  */
       (*info->fprintf_func) (info->stream, "%s", opcode->name);
@@ -116,9 +116,7 @@ print_insn_i370 (memaddr, info)
           if (operand->extract)
             value = (*operand->extract) (insn, (int *) NULL);
           else
-            {
-              value = (insn.i[0] >> operand->shift) & ((1 << operand->bits) - 1);
-            }
+	    value = (insn.i[0] >> operand->shift) & ((1 << operand->bits) - 1);
 
           /* Print the operand as directed by the flags.  */
           if ((operand->flags & I370_OPERAND_OPTIONAL) != 0)
@@ -151,14 +149,11 @@ print_insn_i370 (memaddr, info)
             (*info->fprintf_func) (info->stream, "%ld", value);
           else
             (*info->fprintf_func) (info->stream, " %ld, ", value);
-
         }
 
       return opcode->len;
-
     }
 
-
   /* We could not find a match.  */
   (*info->fprintf_func) (info->stream, ".short 0x%02x%02x", buffer[0], buffer[1]);