*** empty log message ***

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

diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c
index df05a7589f5cdbde636ebd0e38ac7169943966aa..a1df7f5c62fafff95e3eedd2767f3b0a423cfaaa 100644 (file)
--- a/opcodes/hppa-dis.c
+++ b/opcodes/hppa-dis.c
@@ -1,19 +1,21 @@
 /* Disassembler for the PA-RISC. Somewhat derived from sparc-pinsn.c.
    Copyright 1989, 1990, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2003,
-   2005 Free Software Foundation, Inc.
+   2005, 2007  Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
 
-   This program is free software; you can redistribute it and/or modify
+   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 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
 
-   This program 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.
+   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
@@ -912,6 +914,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                  fput_const (extract_14 (insn), info);
                  break;
                case 'k':
+                 fputs_filtered ("L%", info);
                  fput_const (extract_21 (insn), info);
                  break;
                case '<':
@@ -951,12 +954,12 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
 
                case 'Z':
                  /* addil %r1 implicit output.  */
-                 (*info->fprintf_func) (info->stream, "%%r1");
+                 fputs_filtered ("r1", info);
                  break;
 
                case 'Y':
                  /* be,l %sr0,%r31 implicit output.  */
-                 (*info->fprintf_func) (info->stream, "%%sr0,%%r31");
+                 fputs_filtered ("sr0,r31", info);
                  break;
 
                case '@':
@@ -972,7 +975,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                                         GET_FIELD (insn, 22, 25));
                  break;
                case '!':
-                 (*info->fprintf_func) (info->stream, "%%sar");
+                 fputs_filtered ("sar", info);
                  break;
                case 'p':
                  (*info->fprintf_func) (info->stream, "%d",
@@ -1218,7 +1221,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info)
                    (memaddr + 8 + extract_22 (insn), info);
                  break;
                case 'L':
-                 fputs_filtered (",%r2", info);
+                 fputs_filtered (",rp", info);
                  break;
                default:
                  (*info->fprintf_func) (info->stream, "%c", *s);