Update year range in copyright notice of binutils files

[thirdparty/binutils-gdb.git] / opcodes / hppa-dis.c

diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
index 032ef2ed0991dcd580faf521701b893c924846b9..358cc536839483caac635af1bbe2ec215405ba80 100644 (file)
--- a/opcodes/hppa-dis.c
+++ b/opcodes/hppa-dis.c
@@ -1,5 +1,5 @@
 /* Disassembler for the PA-RISC. Somewhat derived from sparc-pinsn.c.
-   Copyright (C) 1989-2014 Free Software Foundation, Inc.
+   Copyright (C) 1989-2021 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -22,7 +22,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "libhppa.h"
 #include "opcode/hppa.h"
 
@@ -207,7 +207,7 @@ static void
 fput_const (unsigned num, disassemble_info *info)
 {
   if ((int) num < 0)
-    (*info->fprintf_func) (info->stream, "-%x", - (int) num);
+    (*info->fprintf_func) (info->stream, "-%x", -num);
   else
     (*info->fprintf_func) (info->stream, "%x", num);
 }
@@ -289,7 +289,7 @@ extract_14 (unsigned word)
 static int
 extract_16 (unsigned word)
 {
-  int m15, m0, m1;
+  unsigned m15, m0, m1;
 
   m0 = GET_BIT (word, 16);
   m1 = GET_BIT (word, 17);
@@ -304,7 +304,7 @@ extract_16 (unsigned word)
 static int
 extract_21 (unsigned word)
 {
-  int val;
+  unsigned val;
 
   word &= MASK_21;
   word <<= 11;
@@ -425,7 +425,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                        fput_fp_reg (GET_FIELD (insn, 6, 10), info);
                      break;
 
-                     /* 'fA' will not generate a space before the regsiter
+                     /* 'fA' will not generate a space before the register
                         name.  Normally that is fine.  Except that it
                         causes problems with xmpyu which has no FP format
                         completer.  */
@@ -1098,12 +1098,12 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
                case '#':
                  {
-                   int sign = GET_FIELD (insn, 31, 31);
-                   int imm10 = GET_FIELD (insn, 18, 27);
-                   int disp;
+                   unsigned sign = GET_FIELD (insn, 31, 31);
+                   unsigned imm10 = GET_FIELD (insn, 18, 27);
+                   unsigned disp;
 
                    if (sign)
-                     disp = (-1 << 10) | imm10;
+                     disp = (-1U << 10) | imm10;
                    else
                      disp = imm10;
 
@@ -1114,12 +1114,12 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                case 'K':
                case 'd':
                  {
-                   int sign = GET_FIELD (insn, 31, 31);
-                   int imm11 = GET_FIELD (insn, 18, 28);
-                   int disp;
+                   unsigned sign = GET_FIELD (insn, 31, 31);
+                   unsigned imm11 = GET_FIELD (insn, 18, 28);
+                   unsigned disp;
 
                    if (sign)
-                     disp = (-1 << 11) | imm11;
+                     disp = (-1U << 11) | imm11;
                    else
                      disp = imm11;