* archive.c (_bfd_generic_read_ar_hdr_mag): Simplify end-of-name test.

[binutils-gdb.git] / bfd / libhppa.h

diff --git a/bfd/libhppa.h b/bfd/libhppa.h
index 1b366d1fb54f49b0a9bd50005df5256a741e3cce..2070aad7e239db7f6b05b32e307fce019d83ca94 100644 (file)
--- a/bfd/libhppa.h
+++ b/bfd/libhppa.h
@@ -1,5 +1,5 @@
 /* HP PA-RISC SOM object file format:  definitions internal to BFD.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
 
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).
@@ -34,6 +34,46 @@
 #endif /* GNU C? */
 #endif /* INLINE */
 
+#if __GNUC__ >= 2 && __GNUC_MINOR__ >= 7
+/* Declare the functions with the unused attribute to avoid warnings.  */
+static INLINE unsigned int assemble_3 (unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_3 (unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned int assemble_12 (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_12 (unsigned int, unsigned int *,
+                                   unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long assemble_17 (unsigned int, unsigned int,
+                                        unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void dis_assemble_17 (unsigned int, unsigned int *,
+                                   unsigned int *, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long assemble_21 (unsigned int)
+     __attribute ((__unused__));
+static INLINE void dis_assemble_21 (unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long sign_extend (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE unsigned int ones (int) __attribute ((__unused__));
+static INLINE void sign_unext (unsigned int, unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long low_sign_extend (unsigned int, unsigned int)
+     __attribute__ ((__unused__));
+static INLINE void low_sign_unext (unsigned int, unsigned int, unsigned int *)
+     __attribute__ ((__unused__));
+static INLINE unsigned long hppa_field_adjust (unsigned long, unsigned long,
+                                              unsigned short)
+     __attribute__ ((__unused__));
+static INLINE char bfd_hppa_insn2fmt (unsigned long)
+     __attribute__ ((__unused__));
+static INLINE  unsigned long hppa_rebuild_insn (bfd *, unsigned long,
+                                               unsigned long, unsigned long)
+     __attribute__ ((__unused__));
+#endif /* gcc 2.7 or higher */
+
 /* The PA instruction set variants.  */
 enum pa_arch {pa10 = 10, pa11 = 11, pa20 = 20};
 
@@ -51,12 +91,15 @@ enum hppa_reloc_field_selector_type
     R_HPPA_LRSEL = 0x7,
     R_HPPA_RRSEL = 0x8,
     R_HPPA_NSEL  = 0x9,
-    R_HPPA_PSEL = 0xa,
-    R_HPPA_LPSEL = 0xb,
-    R_HPPA_RPSEL = 0xc,
-    R_HPPA_TSEL = 0xd,
-    R_HPPA_LTSEL = 0xe,
-    R_HPPA_RTSEL = 0xf
+    R_HPPA_NLSEL  = 0xa,
+    R_HPPA_NLRSEL  = 0xb,
+    R_HPPA_PSEL = 0xc,
+    R_HPPA_LPSEL = 0xd,
+    R_HPPA_RPSEL = 0xe,
+    R_HPPA_TSEL = 0xf,
+    R_HPPA_LTSEL = 0x10,
+    R_HPPA_RTSEL = 0x11,
+    R_HPPA_ESEL = 0xff
   };
 
 /* /usr/include/reloc.h defines these to constants.  We want to use
@@ -74,12 +117,15 @@ enum hppa_reloc_field_selector_type
 #undef e_lrsel
 #undef e_rrsel
 #undef e_nsel
+#undef e_nlsel
+#undef e_nlrsel
 #undef e_psel
 #undef e_lpsel
 #undef e_rpsel
 #undef e_tsel
 #undef e_ltsel
 #undef e_rtsel
+#undef e_esel
 #undef e_one
 #undef e_two
 #undef e_pcrel
@@ -100,12 +146,15 @@ enum hppa_reloc_field_selector_type_alt
     e_lrsel = R_HPPA_LRSEL,
     e_rrsel = R_HPPA_RRSEL,
     e_nsel = R_HPPA_NSEL,
+    e_nlsel = R_HPPA_NLSEL,
+    e_nlrsel = R_HPPA_NLRSEL,
     e_psel = R_HPPA_PSEL,
     e_lpsel = R_HPPA_LPSEL,
     e_rpsel = R_HPPA_RPSEL,
     e_tsel = R_HPPA_TSEL,
     e_ltsel = R_HPPA_LTSEL,
-    e_rtsel = R_HPPA_RTSEL
+    e_rtsel = R_HPPA_RTSEL,
+    e_esel = R_HPPA_ESEL
   };
 
 enum hppa_reloc_expr_type
@@ -310,6 +359,7 @@ hppa_field_adjust (value, constant_value, r_field)
   switch (r_field)
     {
     case e_fsel:               /* F  : no change                      */
+    case e_nsel:               /* N  : no change                      */
       value += constant_value;
       break;
 
@@ -330,6 +380,7 @@ hppa_field_adjust (value, constant_value, r_field)
       break;
 
     case e_lsel:               /* L  : Arithmetic shift right 11 bits */
+    case e_nlsel:              /* NL  : Arithmetic shift right 11 bits */
       value += constant_value;
       value = (value & 0xfffff800) >> 11;
       break;
@@ -351,8 +402,8 @@ hppa_field_adjust (value, constant_value, r_field)
       value |= 0xfffff800;
       break;
 
-    case e_nsel:               /* Just a guess at the moment.         */
     case e_lrsel:              /* LR : L with "rounded" constant      */
+    case e_nlrsel:             /* NLR : NL with "rounded" constant      */
       value = value + ((constant_value + 0x1000) & 0xffffe000);
       value = (value & 0xfffff800) >> 11;
       break;
@@ -509,9 +560,13 @@ hppa_rebuild_insn (abfd, insn, value, r_format)
       }
 
     case 14:
-      const_part = insn & 0xffffc000;
-      low_sign_unext (value, 14, &rebuilt_part);
-      return const_part | rebuilt_part;
+      {
+       unsigned int ext;
+       
+       const_part = insn & 0xffffc000;
+       low_sign_unext (value, 14, &ext);
+       return const_part | ext;
+      }
 
     case 17:
       {
@@ -524,9 +579,13 @@ hppa_rebuild_insn (abfd, insn, value, r_format)
       }
 
     case 21:
-      const_part = insn & 0xffe00000;
-      dis_assemble_21 (value, &rebuilt_part);
-      return const_part | rebuilt_part;
+      {
+       unsigned int w;
+
+       const_part = insn & 0xffe00000;
+       dis_assemble_21 (value, &w);
+       return const_part | w;
+      }
 
     case 32:
       const_part = 0;