/* 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).
#define BYTES_IN_WORD 4
#define PA_PAGESIZE 0x1000
-#ifndef HINLINE
+#ifndef INLINE
#ifdef __GNUC__
-#define HINLINE extern inline
+#define INLINE inline
#else
-/* INLINE is defined in bfd.h. */
-#define HINLINE static INLINE
+#define INLINE
#endif /* GNU C? */
-#endif /* HINLINE */
+#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};
R_HPPA_RPSEL = 0xe,
R_HPPA_TSEL = 0xf,
R_HPPA_LTSEL = 0x10,
- R_HPPA_RTSEL = 0x11
+ R_HPPA_RTSEL = 0x11,
+ R_HPPA_ESEL = 0xff
};
/* /usr/include/reloc.h defines these to constants. We want to use
#undef e_tsel
#undef e_ltsel
#undef e_rtsel
+#undef e_esel
#undef e_one
#undef e_two
#undef e_pcrel
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
#define HPPA_R_ADDEND(r,c) (((r) << 22) + ((c) & 0x3FFFFF))
/* Some functions to manipulate PA instructions. */
-HINLINE unsigned int
+static INLINE unsigned int
assemble_3 (x)
unsigned int x;
{
return (((x & 1) << 2) | ((x & 6) >> 1)) & 7;
}
-HINLINE void
+static INLINE void
dis_assemble_3 (x, r)
unsigned int x;
unsigned int *r;
*r = (((x & 4) >> 2) | ((x & 3) << 1)) & 7;
}
-HINLINE unsigned int
+static INLINE unsigned int
assemble_12 (x, y)
unsigned int x, y;
{
return (((y & 1) << 11) | ((x & 1) << 10) | ((x & 0x7fe) >> 1)) & 0xfff;
}
-HINLINE void
+static INLINE void
dis_assemble_12 (as12, x, y)
unsigned int as12;
unsigned int *x, *y;
*x = ((as12 & 0x3ff) << 1) | ((as12 & 0x400) >> 10);
}
-HINLINE unsigned long
+static INLINE unsigned long
assemble_17 (x, y, z)
unsigned int x, y, z;
{
return temp & 0x1ffff;
}
-HINLINE void
+static INLINE void
dis_assemble_17 (as17, x, y, z)
unsigned int as17;
unsigned int *x, *y, *z;
*y = (((as17 & 0x00400) >> 10) | ((as17 & 0x3ff) << 1)) & 0x7ff;
}
-HINLINE unsigned long
+static INLINE unsigned long
assemble_21 (x)
unsigned int x;
{
return temp & 0x1fffff;
}
-HINLINE void
+static INLINE void
dis_assemble_21 (as21, x)
unsigned int as21, *x;
{
*x = temp;
}
-HINLINE unsigned long
+static INLINE unsigned long
sign_extend (x, len)
unsigned int x, len;
{
return (int)(x >> (len - 1) ? (-1 << len) | x : x);
}
-HINLINE unsigned int
+static INLINE unsigned int
ones (n)
int n;
{
return len_ones;
}
-HINLINE void
+static INLINE void
sign_unext (x, len, result)
unsigned int x, len;
unsigned int *result;
*result = x & len_ones;
}
-HINLINE unsigned long
+static INLINE unsigned long
low_sign_extend (x, len)
unsigned int x, len;
{
return (int)((x & 0x1 ? (-1 << (len - 1)) : 0) | x >> 1);
}
-HINLINE void
+static INLINE void
low_sign_unext (x, len, result)
unsigned int x, len;
unsigned int *result;
/* Handle field selectors for PA instructions. */
-HINLINE unsigned long
+static INLINE unsigned long
hppa_field_adjust (value, constant_value, r_field)
unsigned long value;
unsigned long constant_value;
FIXME: opcodes which do not map to a known format
should return an error of some sort. */
-HINLINE char
+static INLINE char
bfd_hppa_insn2fmt (insn)
unsigned long insn;
{
/* Insert VALUE into INSN using R_FORMAT to determine exactly what
bits to change. */
-HINLINE unsigned long
+static INLINE unsigned long
hppa_rebuild_insn (abfd, insn, value, r_format)
bfd *abfd;
unsigned long insn;
}
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:
{
}
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;