Use symbol_set_language to set a symbol's language

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

diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
index 6c3f4de2c466a1cbe793b3451f885b0d3f5613d4..1d85d788393b8581840d3f00cbfd158fe08ae1b7 100644 (file)
--- a/opcodes/hppa-dis.c
+++ b/opcodes/hppa-dis.c
@@ -1,6 +1,5 @@
 /* Disassembler for the PA-RISC. Somewhat derived from sparc-pinsn.c.
-   Copyright 1989, 1990, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2003,
-   2005, 2007, 2012  Free Software Foundation, Inc.
+   Copyright (C) 1989-2019 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -23,7 +22,7 @@
    MA 02110-1301, USA.  */
 
 #include "sysdep.h"
-#include "dis-asm.h"
+#include "disassemble.h"
 #include "libhppa.h"
 #include "opcode/hppa.h"
 
@@ -426,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.  */
@@ -1104,7 +1103,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                    int disp;
 
                    if (sign)
-                     disp = (-1 << 10) | imm10;
+                     disp = (-1U << 10) | imm10;
                    else
                      disp = imm10;
 
@@ -1120,7 +1119,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                    int disp;
 
                    if (sign)
-                     disp = (-1 << 11) | imm11;
+                     disp = (-1U << 11) | imm11;
                    else
                      disp = imm11;