* config/obj-elf.c: Make use of elf_group_name and elf_next_in_group

[deliverable/binutils-gdb.git] / gas / config / tc-hppa.c

diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 99914db7dcd0fa5351696e05c36af061dbba31b9..233989021819173e12758acfc046762369eda329 100644 (file)
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1,5 +1,5 @@
 /* tc-hppa.c -- Assemble for the PA
 /* tc-hppa.c -- Assemble for the PA

-   Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999
+   Copyright 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001

    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.


@@ -19,18 +19,16 @@
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
    Software Foundation, 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 

-

 /* HP PA-RISC support was contributed by the Center for Software Science
    at the University of Utah.  */
 
 #include <stdio.h>
 /* HP PA-RISC support was contributed by the Center for Software Science
    at the University of Utah.  */
 
 #include <stdio.h>

-#include <ctype.h>

 
 #include "as.h"
 
 #include "as.h"

+#include "safe-ctype.h"

 #include "subsegs.h"
 
 #include "bfd/libhppa.h"
 #include "subsegs.h"
 
 #include "bfd/libhppa.h"

-#include "bfd/libbfd.h"

 
 /* Be careful, this file includes data *declarations*.  */
 #include "opcode/hppa.h"
 
 /* Be careful, this file includes data *declarations*.  */
 #include "opcode/hppa.h"


@@ -39,16 +37,24 @@
 error only one of OBJ_ELF and OBJ_SOM can be defined
 #endif
 
 error only one of OBJ_ELF and OBJ_SOM can be defined
 #endif
 

+/* If we are using ELF, then we probably can support dwarf2 debug
+   records.  Furthermore, if we are supporting dwarf2 debug records,
+   then we want to use the assembler support for compact line numbers.  */
+#ifdef OBJ_ELF
+#include "dwarf2dbg.h"
+

 /* A "convient" place to put object file dependencies which do
    not need to be seen outside of tc-hppa.c.  */
 /* A "convient" place to put object file dependencies which do
    not need to be seen outside of tc-hppa.c.  */

-#ifdef OBJ_ELF
+

 /* Object file formats specify relocation types.  */
 /* Object file formats specify relocation types.  */

-typedef elf_hppa_reloc_type reloc_type;
+typedef enum elf_hppa_reloc_type reloc_type;

 
 /* Object file formats specify BFD symbol types.  */
 typedef elf_symbol_type obj_symbol_type;
 
 /* Object file formats specify BFD symbol types.  */
 typedef elf_symbol_type obj_symbol_type;

+#define symbol_arg_reloc_info(sym)\
+  (((obj_symbol_type *) symbol_get_bfdsym (sym))->tc_data.hppa_arg_reloc)

 
 

-#ifdef BFD64
+#if TARGET_ARCH_SIZE == 64

 /* How to generate a relocation.  */
 #define hppa_gen_reloc_type _bfd_elf64_hppa_gen_reloc_type
 #else
 /* How to generate a relocation.  */
 #define hppa_gen_reloc_type _bfd_elf64_hppa_gen_reloc_type
 #else


@@ -61,7 +67,7 @@ typedef elf_symbol_type obj_symbol_type;
 #define obj_copyright obj_elf_version
 
 #define UNWIND_SECTION_NAME ".PARISC.unwind"
 #define obj_copyright obj_elf_version
 
 #define UNWIND_SECTION_NAME ".PARISC.unwind"

-#endif
+#endif /* OBJ_ELF */

 
 #ifdef OBJ_SOM
 /* Names of various debugging spaces/subspaces.  */
 
 #ifdef OBJ_SOM
 /* Names of various debugging spaces/subspaces.  */


@@ -82,12 +88,13 @@ typedef int reloc_type;
 
 /* Object file formats specify BFD symbol types.  */
 typedef som_symbol_type obj_symbol_type;
 
 /* Object file formats specify BFD symbol types.  */
 typedef som_symbol_type obj_symbol_type;

+#define symbol_arg_reloc_info(sym)\
+  (((obj_symbol_type *) symbol_get_bfdsym (sym))->tc_data.ap.hppa_arg_reloc)

 
 /* This apparently isn't in older versions of hpux reloc.h.  */
 #ifndef R_DLT_REL
 #define R_DLT_REL 0x78
 #endif
 
 /* This apparently isn't in older versions of hpux reloc.h.  */
 #ifndef R_DLT_REL
 #define R_DLT_REL 0x78
 #endif

-#endif

 
 #ifndef R_N0SEL
 #define R_N0SEL 0xd8
 
 #ifndef R_N0SEL
 #define R_N0SEL 0xd8


@@ -96,6 +103,13 @@ typedef som_symbol_type obj_symbol_type;
 #ifndef R_N1SEL
 #define R_N1SEL 0xd9
 #endif
 #ifndef R_N1SEL
 #define R_N1SEL 0xd9
 #endif

+#endif /* OBJ_SOM */
+
+#if TARGET_ARCH_SIZE == 64
+#define DEFAULT_LEVEL 25
+#else
+#define DEFAULT_LEVEL 10
+#endif

 
 /* Various structures and types used internally in tc-hppa.c.  */
 
 
 /* Various structures and types used internally in tc-hppa.c.  */
 


@@ -125,6 +139,31 @@ struct unwind_desc
     unsigned int frame_size:27;
   };
 
     unsigned int frame_size:27;
   };
 

+/* We can't rely on compilers placing bitfields in any particular
+   place, so use these macros when dumping unwind descriptors to
+   object files.  */
+#define UNWIND_LOW32(U) \
+  (((U)->cannot_unwind << 31)          \
+   | ((U)->millicode << 30)            \
+   | ((U)->millicode_save_rest << 29)  \
+   | ((U)->region_desc << 27)          \
+   | ((U)->save_sr << 25)              \
+   | ((U)->entry_fr << 21)             \
+   | ((U)->entry_gr << 16)             \
+   | ((U)->args_stored << 15)          \
+   | ((U)->call_fr << 10)              \
+   | ((U)->call_gr << 5)               \
+   | ((U)->save_sp << 4)               \
+   | ((U)->save_rp << 3)               \
+   | ((U)->save_rp_in_frame << 2)      \
+   | ((U)->extn_ptr_defined << 1)      \
+   | ((U)->cleanup_defined << 0))
+
+#define UNWIND_HIGH32(U) \
+  (((U)->hpe_interrupt_marker << 31)   \
+   | ((U)->hpux_interrupt_marker << 30)        \
+   | ((U)->frame_size << 0))
+

 struct unwind_table
   {
     /* Starting and ending offsets of the region described by
 struct unwind_table
   {
     /* Starting and ending offsets of the region described by


@@ -202,6 +241,8 @@ struct pa_it
     fp_operand_format fpof1;
     fp_operand_format fpof2;
 
     fp_operand_format fpof1;
     fp_operand_format fpof2;
 

+    /* Whether or not we saw a truncation request on an fcnv insn.  */
+    int trunc;

 
     /* Holds the field selector for this instruction
        (for example L%, LR%, etc).  */
 
     /* Holds the field selector for this instruction
        (for example L%, LR%, etc).  */


@@ -209,7 +250,7 @@ struct pa_it
 
     /* Holds any argument relocation bits associated with this
        instruction.  (instruction should be some sort of call).  */
 
     /* Holds any argument relocation bits associated with this
        instruction.  (instruction should be some sort of call).  */

-    long arg_reloc;
+    unsigned int arg_reloc;

 
     /* The format specification for this instruction.  */
     int format;
 
     /* The format specification for this instruction.  */
     int format;


@@ -220,7 +261,6 @@ struct pa_it
 
 /* PA-89 floating point registers are arranged like this:
 
 
 /* PA-89 floating point registers are arranged like this:
 

-

    +--------------+--------------+
    |   0 or 16L   |  16 or 16R   |
    +--------------+--------------+
    +--------------+--------------+
    |   0 or 16L   |  16 or 16R   |
    +--------------+--------------+


@@ -237,23 +277,7 @@ struct pa_it
    |  14 or 30L   |  30 or 30R   |
    +--------------+--------------+
    |  15 or 31L   |  31 or 31R   |
    |  14 or 30L   |  30 or 30R   |
    +--------------+--------------+
    |  15 or 31L   |  31 or 31R   |

-   +--------------+--------------+
-
-
-   The following is a version of pa_parse_number that
-   handles the L/R notation and returns the correct
-   value to put into the instruction register field.
-   The correct value to put into the instruction is
-   encoded in the structure 'pa_11_fp_reg_struct'.  */
-
-struct pa_11_fp_reg_struct
-  {
-    /* The register number.  */
-    char number_part;
-
-    /* L/R selector.  */
-    char l_r_select;
-  };
+   +--------------+--------------+  */

 
 /* Additional information needed to build argument relocation stubs.  */
 struct call_desc
 
 /* Additional information needed to build argument relocation stubs.  */
 struct call_desc


@@ -428,7 +452,7 @@ struct hppa_fix_struct
     int fx_r_format;
 
     /* Argument relocation bits.  */
     int fx_r_format;
 
     /* Argument relocation bits.  */

-    long fx_arg_reloc;
+    unsigned int fx_arg_reloc;

 
     /* The segment this fixup appears in.  */
     segT segment;
 
     /* The segment this fixup appears in.  */
     segT segment;


@@ -464,15 +488,18 @@ struct selector_entry
 static void pa_check_current_space_and_subspace PARAMS ((void));
 #endif
 
 static void pa_check_current_space_and_subspace PARAMS ((void));
 #endif
 

+#if !(defined (OBJ_ELF) && defined (TE_LINUX))
+static void pa_text PARAMS ((int));
+static void pa_data PARAMS ((int));
+static void pa_comm PARAMS ((int));
+#endif

 static fp_operand_format pa_parse_fp_format PARAMS ((char **s));
 static void pa_cons PARAMS ((int));
 static fp_operand_format pa_parse_fp_format PARAMS ((char **s));
 static void pa_cons PARAMS ((int));

-static void pa_data PARAMS ((int));

 static void pa_float_cons PARAMS ((int));
 static void pa_fill PARAMS ((int));
 static void pa_lcomm PARAMS ((int));
 static void pa_lsym PARAMS ((int));
 static void pa_stringer PARAMS ((int));
 static void pa_float_cons PARAMS ((int));
 static void pa_fill PARAMS ((int));
 static void pa_lcomm PARAMS ((int));
 static void pa_lsym PARAMS ((int));
 static void pa_stringer PARAMS ((int));

-static void pa_text PARAMS ((int));

 static void pa_version PARAMS ((int));
 static int pa_parse_fp_cmp_cond PARAMS ((char **));
 static int get_expression PARAMS ((char *));
 static void pa_version PARAMS ((int));
 static int pa_parse_fp_cmp_cond PARAMS ((char **));
 static int get_expression PARAMS ((char *));


@@ -481,18 +508,19 @@ static int evaluate_absolute PARAMS ((struct pa_it *));
 static unsigned int pa_build_arg_reloc PARAMS ((char *));
 static unsigned int pa_align_arg_reloc PARAMS ((unsigned int, unsigned int));
 static int pa_parse_nullif PARAMS ((char **));
 static unsigned int pa_build_arg_reloc PARAMS ((char *));
 static unsigned int pa_align_arg_reloc PARAMS ((unsigned int, unsigned int));
 static int pa_parse_nullif PARAMS ((char **));

-static int pa_parse_nonneg_cmpsub_cmpltr PARAMS ((char **, int));
-static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **, int));
-static int pa_parse_neg_add_cmpltr PARAMS ((char **, int));
-static int pa_parse_nonneg_add_cmpltr PARAMS ((char **, int));
+static int pa_parse_nonneg_cmpsub_cmpltr PARAMS ((char **));
+static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **));
+static int pa_parse_neg_add_cmpltr PARAMS ((char **));
+static int pa_parse_nonneg_add_cmpltr PARAMS ((char **));
+static int pa_parse_cmpb_64_cmpltr PARAMS ((char **));
+static int pa_parse_cmpib_64_cmpltr PARAMS ((char **));
+static int pa_parse_addb_64_cmpltr PARAMS ((char **));

 static void pa_block PARAMS ((int));
 static void pa_brtab PARAMS ((int));
 static void pa_try PARAMS ((int));
 static void pa_call PARAMS ((int));
 static void pa_call_args PARAMS ((struct call_desc *));
 static void pa_callinfo PARAMS ((int));
 static void pa_block PARAMS ((int));
 static void pa_brtab PARAMS ((int));
 static void pa_try PARAMS ((int));
 static void pa_call PARAMS ((int));
 static void pa_call_args PARAMS ((struct call_desc *));
 static void pa_callinfo PARAMS ((int));

-static void pa_code PARAMS ((int));
-static void pa_comm PARAMS ((int));

 static void pa_copyright PARAMS ((int));
 static void pa_end PARAMS ((int));
 static void pa_enter PARAMS ((int));
 static void pa_copyright PARAMS ((int));
 static void pa_end PARAMS ((int));
 static void pa_enter PARAMS ((int));


@@ -510,11 +538,11 @@ static void pa_proc PARAMS ((int));
 static void pa_procend PARAMS ((int));
 static void pa_param PARAMS ((int));
 static void pa_undefine_label PARAMS ((void));
 static void pa_procend PARAMS ((int));
 static void pa_param PARAMS ((int));
 static void pa_undefine_label PARAMS ((void));

-static int need_pa11_opcode PARAMS ((struct pa_it *,
-                                    struct pa_11_fp_reg_struct *));
-static int pa_parse_number PARAMS ((char **, struct pa_11_fp_reg_struct *));
+static int need_pa11_opcode PARAMS ((void));
+static int pa_parse_number PARAMS ((char **, int));

 static label_symbol_struct *pa_get_label PARAMS ((void));
 #ifdef OBJ_SOM
 static label_symbol_struct *pa_get_label PARAMS ((void));
 #ifdef OBJ_SOM

+static int log2 PARAMS ((int));

 static void pa_compiler PARAMS ((int));
 static void pa_align PARAMS ((int));
 static void pa_space PARAMS ((int));
 static void pa_compiler PARAMS ((int));
 static void pa_align PARAMS ((int));
 static void pa_space PARAMS ((int));


@@ -546,21 +574,24 @@ static void pa_spaces_begin PARAMS ((void));
 #endif
 static void pa_ip PARAMS ((char *));
 static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *,
 #endif
 static void pa_ip PARAMS ((char *));
 static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *,

-                                 long, expressionS *, int,
+                                 offsetT, expressionS *, int,

                                  bfd_reloc_code_real_type,
                                  enum hppa_reloc_field_selector_type_alt,
                                  bfd_reloc_code_real_type,
                                  enum hppa_reloc_field_selector_type_alt,

-                                 int, long, int *));
+                                 int, unsigned int, int));

 static int is_end_of_statement PARAMS ((void));
 static int reg_name_search PARAMS ((char *));
 static int pa_chk_field_selector PARAMS ((char **));
 static int is_same_frag PARAMS ((fragS *, fragS *));
 static void process_exit PARAMS ((void));
 static int is_end_of_statement PARAMS ((void));
 static int reg_name_search PARAMS ((char *));
 static int pa_chk_field_selector PARAMS ((char **));
 static int is_same_frag PARAMS ((fragS *, fragS *));
 static void process_exit PARAMS ((void));

-static int log2 PARAMS ((int));

 static unsigned int pa_stringer_aux PARAMS ((char *));
 static unsigned int pa_stringer_aux PARAMS ((char *));

+static fp_operand_format pa_parse_fp_cnv_format PARAMS ((char **s));
+static int pa_parse_ftest_gfx_completer PARAMS ((char **));

 
 #ifdef OBJ_ELF
 static void hppa_elf_mark_end_of_function PARAMS ((void));
 static void pa_build_unwind_subspace PARAMS ((struct call_info *));
 
 #ifdef OBJ_ELF
 static void hppa_elf_mark_end_of_function PARAMS ((void));
 static void pa_build_unwind_subspace PARAMS ((struct call_info *));

+static void pa_vtable_entry PARAMS ((int));
+static void pa_vtable_inherit  PARAMS ((int));

 #endif
 
 /* File and gloally scoped variable declarations.  */
 #endif
 
 /* File and gloally scoped variable declarations.  */


@@ -589,10 +620,6 @@ static struct call_desc last_call_desc;
 /* handle of the OPCODE hash table */
 static struct hash_control *op_hash = NULL;
 
 /* handle of the OPCODE hash table */
 static struct hash_control *op_hash = NULL;
 

-/* This array holds the chars that always start a comment.  If the
-   pre-processor is disabled, these aren't very useful.  */
-const char comment_chars[] = ";";
-

 /* Table of pseudo ops for the PA.  FIXME -- how many of these
    are now redundant with the overall GAS and the object file
    dependent tables?  */
 /* Table of pseudo ops for the PA.  FIXME -- how many of these
    are now redundant with the overall GAS and the object file
    dependent tables?  */


@@ -613,23 +640,34 @@ const pseudo_typeS md_pseudo_table[] =
   {"byte", pa_cons, 1},
   {"call", pa_call, 0},
   {"callinfo", pa_callinfo, 0},
   {"byte", pa_cons, 1},
   {"call", pa_call, 0},
   {"callinfo", pa_callinfo, 0},

-  {"code", pa_code, 0},
+#if defined (OBJ_ELF) && defined (TE_LINUX)
+  {"code", obj_elf_text, 0},
+#else
+  {"code", pa_text, 0},

   {"comm", pa_comm, 0},
   {"comm", pa_comm, 0},

+#endif

 #ifdef OBJ_SOM
   {"compiler", pa_compiler, 0},
 #endif
   {"copyright", pa_copyright, 0},
 #ifdef OBJ_SOM
   {"compiler", pa_compiler, 0},
 #endif
   {"copyright", pa_copyright, 0},

+#if !(defined (OBJ_ELF) && defined (TE_LINUX))

   {"data", pa_data, 0},
   {"data", pa_data, 0},

+#endif

   {"double", pa_float_cons, 'd'},
   {"dword", pa_cons, 8},
   {"end", pa_end, 0},
   {"end_brtab", pa_brtab, 0},
   {"double", pa_float_cons, 'd'},
   {"dword", pa_cons, 8},
   {"end", pa_end, 0},
   {"end_brtab", pa_brtab, 0},

+#if !(defined (OBJ_ELF) && defined (TE_LINUX))

   {"end_try", pa_try, 0},
   {"end_try", pa_try, 0},

+#endif

   {"enter", pa_enter, 0},
   {"entry", pa_entry, 0},
   {"equ", pa_equ, 0},
   {"exit", pa_exit, 0},
   {"export", pa_export, 0},
   {"enter", pa_enter, 0},
   {"entry", pa_entry, 0},
   {"equ", pa_equ, 0},
   {"exit", pa_exit, 0},
   {"export", pa_export, 0},

+#ifdef OBJ_ELF
+  {"file", dwarf2_directive_file, 0 },
+#endif

   {"fill", pa_fill, 0},
   {"float", pa_float_cons, 'f'},
   {"half", pa_cons, 2},
   {"fill", pa_fill, 0},
   {"float", pa_float_cons, 'f'},
   {"half", pa_cons, 2},


@@ -639,6 +677,9 @@ const pseudo_typeS md_pseudo_table[] =
   {"lcomm", pa_lcomm, 0},
   {"leave", pa_leave, 0},
   {"level", pa_level, 0},
   {"lcomm", pa_lcomm, 0},
   {"leave", pa_leave, 0},
   {"level", pa_level, 0},

+#ifdef OBJ_ELF
+  {"loc", dwarf2_directive_loc, 0 },
+#endif

   {"long", pa_cons, 4},
   {"lsym", pa_lsym, 0},
 #ifdef OBJ_SOM
   {"long", pa_cons, 4},
   {"lsym", pa_lsym, 0},
 #ifdef OBJ_SOM


@@ -663,8 +704,14 @@ const pseudo_typeS md_pseudo_table[] =
 #ifdef OBJ_SOM
   {"subspa", pa_subspace, 0},
 #endif
 #ifdef OBJ_SOM
   {"subspa", pa_subspace, 0},
 #endif

+#if !(defined (OBJ_ELF) && defined (TE_LINUX))

   {"text", pa_text, 0},
   {"text", pa_text, 0},

+#endif

   {"version", pa_version, 0},
   {"version", pa_version, 0},

+#ifdef OBJ_ELF
+  {"vtable_entry", pa_vtable_entry, 0},
+  {"vtable_inherit", pa_vtable_inherit, 0},
+#endif

   {"word", pa_cons, 4},
   {NULL, 0, 0}
 };
   {"word", pa_cons, 4},
   {NULL, 0, 0}
 };


@@ -677,9 +724,13 @@ const pseudo_typeS md_pseudo_table[] =
    first line of the input file.  This is because the compiler outputs
    #NO_APP at the beginning of its output.
 
    first line of the input file.  This is because the compiler outputs
    #NO_APP at the beginning of its output.
 

-   Also note that C style comments will always work. */
+   Also note that C style comments will always work.  */

 const char line_comment_chars[] = "#";
 
 const char line_comment_chars[] = "#";
 

+/* This array holds the chars that always start a comment.  If the
+   pre-processor is disabled, these aren't very useful.  */
+const char comment_chars[] = ";";
+

 /* This array holds the characters which act as line separators.  */
 const char line_separator_chars[] = "!";
 
 /* This array holds the characters which act as line separators.  */
 const char line_separator_chars[] = "!";
 


@@ -710,13 +761,28 @@ static int within_entry_exit;
 /* Nonzero if the assembler is currently within a procedure definition.  */
 static int within_procedure;
 
 /* Nonzero if the assembler is currently within a procedure definition.  */
 static int within_procedure;
 

-/* Handle on strucutre which keep track of the last symbol
+/* Handle on structure which keep track of the last symbol

    seen in each subspace.  */
 static label_symbol_struct *label_symbols_rootp = NULL;
 
 /* Holds the last field selector.  */
 static int hppa_field_selector;
 
    seen in each subspace.  */
 static label_symbol_struct *label_symbols_rootp = NULL;
 
 /* Holds the last field selector.  */
 static int hppa_field_selector;
 

+/* Nonzero when strict syntax checking is enabled.  Zero otherwise.
+
+   Each opcode in the table has a flag which indicates whether or not
+   strict syntax checking should be enabled for that instruction.  */
+static int strict = 0;
+
+/* pa_parse_number returns values in `pa_number'.  Mostly
+   pa_parse_number is used to return a register number, with floating
+   point registers being numbered from FP_REG_BASE upwards.
+   The bit specified with FP_REG_RSEL is set if the floating point
+   register has a `r' suffix.  */
+#define FP_REG_BASE 64
+#define FP_REG_RSEL 128
+static int pa_number;
+

 #ifdef OBJ_SOM
 /* A dummy bfd symbol so that all relocations have symbols of some kind.  */
 static symbolS *dummy_symbol;
 #ifdef OBJ_SOM
 /* A dummy bfd symbol so that all relocations have symbols of some kind.  */
 static symbolS *dummy_symbol;


@@ -749,206 +815,211 @@ static int print_errors = 1;
    Almost every control register has a synonym; they are not listed
    here for brevity.
 
    Almost every control register has a synonym; they are not listed
    here for brevity.
 

-   The table is sorted. Suitable for searching by a binary search. */
+   The table is sorted. Suitable for searching by a binary search.  */

 
 static const struct pd_reg pre_defined_registers[] =
 {
 
 static const struct pd_reg pre_defined_registers[] =
 {

-  {"%arg0", 26},
-  {"%arg1", 25},
-  {"%arg2", 24},
-  {"%arg3", 23},
-  {"%cr0", 0},
-  {"%cr10", 10},
-  {"%cr11", 11},
-  {"%cr12", 12},
-  {"%cr13", 13},
-  {"%cr14", 14},
-  {"%cr15", 15},
-  {"%cr16", 16},
-  {"%cr17", 17},
-  {"%cr18", 18},
-  {"%cr19", 19},
-  {"%cr20", 20},
-  {"%cr21", 21},
-  {"%cr22", 22},
-  {"%cr23", 23},
-  {"%cr24", 24},
-  {"%cr25", 25},
-  {"%cr26", 26},
-  {"%cr27", 27},
-  {"%cr28", 28},
-  {"%cr29", 29},
-  {"%cr30", 30},
-  {"%cr31", 31},
-  {"%cr8", 8},
-  {"%cr9", 9},
-  {"%dp", 27},
-  {"%eiem", 15},
-  {"%eirr", 23},
-  {"%fr0", 0},
-  {"%fr0l", 0},
-  {"%fr0r", 0},
-  {"%fr1", 1},
-  {"%fr10", 10},
-  {"%fr10l", 10},
-  {"%fr10r", 10},
-  {"%fr11", 11},
-  {"%fr11l", 11},
-  {"%fr11r", 11},
-  {"%fr12", 12},
-  {"%fr12l", 12},
-  {"%fr12r", 12},
-  {"%fr13", 13},
-  {"%fr13l", 13},
-  {"%fr13r", 13},
-  {"%fr14", 14},
-  {"%fr14l", 14},
-  {"%fr14r", 14},
-  {"%fr15", 15},
-  {"%fr15l", 15},
-  {"%fr15r", 15},
-  {"%fr16", 16},
-  {"%fr16l", 16},
-  {"%fr16r", 16},
-  {"%fr17", 17},
-  {"%fr17l", 17},
-  {"%fr17r", 17},
-  {"%fr18", 18},
-  {"%fr18l", 18},
-  {"%fr18r", 18},
-  {"%fr19", 19},
-  {"%fr19l", 19},
-  {"%fr19r", 19},
-  {"%fr1l", 1},
-  {"%fr1r", 1},
-  {"%fr2", 2},
-  {"%fr20", 20},
-  {"%fr20l", 20},
-  {"%fr20r", 20},
-  {"%fr21", 21},
-  {"%fr21l", 21},
-  {"%fr21r", 21},
-  {"%fr22", 22},
-  {"%fr22l", 22},
-  {"%fr22r", 22},
-  {"%fr23", 23},
-  {"%fr23l", 23},
-  {"%fr23r", 23},
-  {"%fr24", 24},
-  {"%fr24l", 24},
-  {"%fr24r", 24},
-  {"%fr25", 25},
-  {"%fr25l", 25},
-  {"%fr25r", 25},
-  {"%fr26", 26},
-  {"%fr26l", 26},
-  {"%fr26r", 26},
-  {"%fr27", 27},
-  {"%fr27l", 27},
-  {"%fr27r", 27},
-  {"%fr28", 28},
-  {"%fr28l", 28},
-  {"%fr28r", 28},
-  {"%fr29", 29},
-  {"%fr29l", 29},
-  {"%fr29r", 29},
-  {"%fr2l", 2},
-  {"%fr2r", 2},
-  {"%fr3", 3},
-  {"%fr30", 30},
-  {"%fr30l", 30},
-  {"%fr30r", 30},
-  {"%fr31", 31},
-  {"%fr31l", 31},
-  {"%fr31r", 31},
-  {"%fr3l", 3},
-  {"%fr3r", 3},
-  {"%fr4", 4},
-  {"%fr4l", 4},
-  {"%fr4r", 4},
-  {"%fr5", 5},
-  {"%fr5l", 5},
-  {"%fr5r", 5},
-  {"%fr6", 6},
-  {"%fr6l", 6},
-  {"%fr6r", 6},
-  {"%fr7", 7},
-  {"%fr7l", 7},
-  {"%fr7r", 7},
-  {"%fr8", 8},
-  {"%fr8l", 8},
-  {"%fr8r", 8},
-  {"%fr9", 9},
-  {"%fr9l", 9},
-  {"%fr9r", 9},
-  {"%hta", 25},
-  {"%iir", 19},
-  {"%ior", 21},
-  {"%ipsw", 22},
-  {"%isr", 20},
-  {"%itmr", 16},
-  {"%iva", 14},
-  {"%pcoq", 18},
-  {"%pcsq", 17},
-  {"%pidr1", 8},
-  {"%pidr2", 9},
+  {"%arg0",  26},
+  {"%arg1",  25},
+  {"%arg2",  24},
+  {"%arg3",  23},
+  {"%cr0",    0},
+  {"%cr10",  10},
+  {"%cr11",  11},
+  {"%cr12",  12},
+  {"%cr13",  13},
+  {"%cr14",  14},
+  {"%cr15",  15},
+  {"%cr16",  16},
+  {"%cr17",  17},
+  {"%cr18",  18},
+  {"%cr19",  19},
+  {"%cr20",  20},
+  {"%cr21",  21},
+  {"%cr22",  22},
+  {"%cr23",  23},
+  {"%cr24",  24},
+  {"%cr25",  25},
+  {"%cr26",  26},
+  {"%cr27",  27},
+  {"%cr28",  28},
+  {"%cr29",  29},
+  {"%cr30",  30},
+  {"%cr31",  31},
+  {"%cr8",    8},
+  {"%cr9",    9},
+  {"%dp",    27},
+  {"%eiem",  15},
+  {"%eirr",  23},
+  {"%fr0",    0 + FP_REG_BASE},
+  {"%fr0l",   0 + FP_REG_BASE},
+  {"%fr0r",   0 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr1",    1 + FP_REG_BASE},
+  {"%fr10",  10 + FP_REG_BASE},
+  {"%fr10l", 10 + FP_REG_BASE},
+  {"%fr10r", 10 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr11",  11 + FP_REG_BASE},
+  {"%fr11l", 11 + FP_REG_BASE},
+  {"%fr11r", 11 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr12",  12 + FP_REG_BASE},
+  {"%fr12l", 12 + FP_REG_BASE},
+  {"%fr12r", 12 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr13",  13 + FP_REG_BASE},
+  {"%fr13l", 13 + FP_REG_BASE},
+  {"%fr13r", 13 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr14",  14 + FP_REG_BASE},
+  {"%fr14l", 14 + FP_REG_BASE},
+  {"%fr14r", 14 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr15",  15 + FP_REG_BASE},
+  {"%fr15l", 15 + FP_REG_BASE},
+  {"%fr15r", 15 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr16",  16 + FP_REG_BASE},
+  {"%fr16l", 16 + FP_REG_BASE},
+  {"%fr16r", 16 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr17",  17 + FP_REG_BASE},
+  {"%fr17l", 17 + FP_REG_BASE},
+  {"%fr17r", 17 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr18",  18 + FP_REG_BASE},
+  {"%fr18l", 18 + FP_REG_BASE},
+  {"%fr18r", 18 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr19",  19 + FP_REG_BASE},
+  {"%fr19l", 19 + FP_REG_BASE},
+  {"%fr19r", 19 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr1l",   1 + FP_REG_BASE},
+  {"%fr1r",   1 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr2",    2 + FP_REG_BASE},
+  {"%fr20",  20 + FP_REG_BASE},
+  {"%fr20l", 20 + FP_REG_BASE},
+  {"%fr20r", 20 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr21",  21 + FP_REG_BASE},
+  {"%fr21l", 21 + FP_REG_BASE},
+  {"%fr21r", 21 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr22",  22 + FP_REG_BASE},
+  {"%fr22l", 22 + FP_REG_BASE},
+  {"%fr22r", 22 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr23",  23 + FP_REG_BASE},
+  {"%fr23l", 23 + FP_REG_BASE},
+  {"%fr23r", 23 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr24",  24 + FP_REG_BASE},
+  {"%fr24l", 24 + FP_REG_BASE},
+  {"%fr24r", 24 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr25",  25 + FP_REG_BASE},
+  {"%fr25l", 25 + FP_REG_BASE},
+  {"%fr25r", 25 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr26",  26 + FP_REG_BASE},
+  {"%fr26l", 26 + FP_REG_BASE},
+  {"%fr26r", 26 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr27",  27 + FP_REG_BASE},
+  {"%fr27l", 27 + FP_REG_BASE},
+  {"%fr27r", 27 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr28",  28 + FP_REG_BASE},
+  {"%fr28l", 28 + FP_REG_BASE},
+  {"%fr28r", 28 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr29",  29 + FP_REG_BASE},
+  {"%fr29l", 29 + FP_REG_BASE},
+  {"%fr29r", 29 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr2l",   2 + FP_REG_BASE},
+  {"%fr2r",   2 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr3",    3 + FP_REG_BASE},
+  {"%fr30",  30 + FP_REG_BASE},
+  {"%fr30l", 30 + FP_REG_BASE},
+  {"%fr30r", 30 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr31",  31 + FP_REG_BASE},
+  {"%fr31l", 31 + FP_REG_BASE},
+  {"%fr31r", 31 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr3l",   3 + FP_REG_BASE},
+  {"%fr3r",   3 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr4",    4 + FP_REG_BASE},
+  {"%fr4l",   4 + FP_REG_BASE},
+  {"%fr4r",   4 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr5",    5 + FP_REG_BASE},
+  {"%fr5l",   5 + FP_REG_BASE},
+  {"%fr5r",   5 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr6",    6 + FP_REG_BASE},
+  {"%fr6l",   6 + FP_REG_BASE},
+  {"%fr6r",   6 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr7",    7 + FP_REG_BASE},
+  {"%fr7l",   7 + FP_REG_BASE},
+  {"%fr7r",   7 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr8",    8 + FP_REG_BASE},
+  {"%fr8l",   8 + FP_REG_BASE},
+  {"%fr8r",   8 + FP_REG_BASE + FP_REG_RSEL},
+  {"%fr9",    9 + FP_REG_BASE},
+  {"%fr9l",   9 + FP_REG_BASE},
+  {"%fr9r",   9 + FP_REG_BASE + FP_REG_RSEL},
+  {"%hta",   25},
+  {"%iir",   19},
+  {"%ior",   21},
+  {"%ipsw",  22},
+  {"%isr",   20},
+  {"%itmr",  16},
+  {"%iva",   14},
+#if TARGET_ARCH_SIZE == 64
+  {"%mrp",    2},
+#else
+  {"%mrp",   31},
+#endif
+  {"%pcoq",  18},
+  {"%pcsq",  17},
+  {"%pidr1",  8},
+  {"%pidr2",  9},

   {"%pidr3", 12},
   {"%pidr4", 13},
   {"%pidr3", 12},
   {"%pidr4", 13},

-  {"%ppda", 24},
-  {"%r0", 0},
-  {"%r1", 1},
-  {"%r10", 10},
-  {"%r11", 11},
-  {"%r12", 12},
-  {"%r13", 13},
-  {"%r14", 14},
-  {"%r15", 15},
-  {"%r16", 16},
-  {"%r17", 17},
-  {"%r18", 18},
-  {"%r19", 19},
-  {"%r2", 2},
-  {"%r20", 20},
-  {"%r21", 21},
-  {"%r22", 22},
-  {"%r23", 23},
-  {"%r24", 24},
-  {"%r25", 25},
-  {"%r26", 26},
-  {"%r27", 27},
-  {"%r28", 28},
-  {"%r29", 29},
-  {"%r3", 3},
-  {"%r30", 30},
-  {"%r31", 31},
-  {"%r4", 4},
-  {"%r5", 5},
-  {"%r6", 6},
-  {"%r7", 7},
-  {"%r8", 8},
-  {"%r9", 9},
-  {"%rctr", 0},
-  {"%ret0", 28},
-  {"%ret1", 29},
-  {"%rp", 2},
-  {"%sar", 11},
-  {"%sp", 30},
-  {"%sr0", 0},
-  {"%sr1", 1},
-  {"%sr2", 2},
-  {"%sr3", 3},
-  {"%sr4", 4},
-  {"%sr5", 5},
-  {"%sr6", 6},
-  {"%sr7", 7},
-  {"%tr0", 24},
-  {"%tr1", 25},
-  {"%tr2", 26},
-  {"%tr3", 27},
-  {"%tr4", 28},
-  {"%tr5", 29},
-  {"%tr6", 30},
-  {"%tr7", 31}
+  {"%ppda",  24},
+  {"%r0",     0},
+  {"%r1",     1},
+  {"%r10",   10},
+  {"%r11",   11},
+  {"%r12",   12},
+  {"%r13",   13},
+  {"%r14",   14},
+  {"%r15",   15},
+  {"%r16",   16},
+  {"%r17",   17},
+  {"%r18",   18},
+  {"%r19",   19},
+  {"%r2",     2},
+  {"%r20",   20},
+  {"%r21",   21},
+  {"%r22",   22},
+  {"%r23",   23},
+  {"%r24",   24},
+  {"%r25",   25},
+  {"%r26",   26},
+  {"%r27",   27},
+  {"%r28",   28},
+  {"%r29",   29},
+  {"%r3",     3},
+  {"%r30",   30},
+  {"%r31",   31},
+  {"%r4",     4},
+  {"%r5",     5},
+  {"%r6",     6},
+  {"%r7",     7},
+  {"%r8",     8},
+  {"%r9",     9},
+  {"%rctr",   0},
+  {"%ret0",  28},
+  {"%ret1",  29},
+  {"%rp",     2},
+  {"%sar",   11},
+  {"%sp",    30},
+  {"%sr0",    0},
+  {"%sr1",    1},
+  {"%sr2",    2},
+  {"%sr3",    3},
+  {"%sr4",    4},
+  {"%sr5",    5},
+  {"%sr6",    6},
+  {"%sr7",    7},
+  {"%tr0",   24},
+  {"%tr1",   25},
+  {"%tr2",   26},
+  {"%tr3",   27},
+  {"%tr4",   28},
+  {"%tr5",   29},
+  {"%tr6",   30},
+  {"%tr7",   31}

 };
 
 /* This table is sorted by order of the length of the string. This is
 };
 
 /* This table is sorted by order of the length of the string. This is


@@ -1087,6 +1158,34 @@ static struct default_space_dict pa_def_spaces[] =
       } \
   }
 
       } \
   }
 

+/* Variant of CHECK_FIELD for use in md_apply_fix and other places where
+   the current file and line number are not valid.  */
+
+#define CHECK_FIELD_WHERE(FIELD, HIGH, LOW, FILENAME, LINE) \
+  { \
+    if ((FIELD) > (HIGH) || (FIELD) < (LOW)) \
+      { \
+        as_bad_where ((FILENAME), (LINE), \
+                     _("Field out of range [%d..%d] (%d)."), (LOW), (HIGH), \
+                     (int) (FIELD));\
+        break; \
+      } \
+  }
+
+/* Simple alignment checking for FIELD againt ALIGN (a power of two).
+   IGNORE is used to suppress the error message.  */
+
+#define CHECK_ALIGN(FIELD, ALIGN, IGNORE) \
+  { \
+    if ((FIELD) & ((ALIGN) - 1)) \
+      { \
+       if (! IGNORE) \
+          as_bad (_("Field not properly aligned [%d] (%d)."), (ALIGN), \
+                 (int) (FIELD));\
+        break; \
+      } \
+  }
+

 #define is_DP_relative(exp)                    \
   ((exp).X_op == O_subtract                    \
    && strcmp (S_GET_NAME ((exp).X_op_symbol), "$global$") == 0)
 #define is_DP_relative(exp)                    \
   ((exp).X_op == O_subtract                    \
    && strcmp (S_GET_NAME ((exp).X_op_symbol), "$global$") == 0)


@@ -1208,7 +1307,6 @@ pa_undefine_label ()
     }
 }
 
     }
 }
 

-

 /* An HPPA-specific version of fix_new.  This is required because the HPPA
    code needs to keep track of some extra stuff.  Each call to fix_new_hppa
    results in the creation of an instance of an hppa_fix_struct.  An
 /* An HPPA-specific version of fix_new.  This is required because the HPPA
    code needs to keep track of some extra stuff.  Each call to fix_new_hppa
    results in the creation of an instance of an hppa_fix_struct.  An


@@ -1223,14 +1321,14 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel,
      int where;
      int size;
      symbolS *add_symbol;
      int where;
      int size;
      symbolS *add_symbol;

-     long offset;
+     offsetT offset;

      expressionS *exp;
      int pcrel;
      bfd_reloc_code_real_type r_type;
      enum hppa_reloc_field_selector_type_alt r_field;
      int r_format;
      expressionS *exp;
      int pcrel;
      bfd_reloc_code_real_type r_type;
      enum hppa_reloc_field_selector_type_alt r_field;
      int r_format;

-     long arg_reloc;
-     int* unwind_bits;
+     unsigned int arg_reloc;
+     int unwind_bits ATTRIBUTE_UNUSED;

 {
   fixS *new_fix;
 
 {
   fixS *new_fix;
 


@@ -1249,14 +1347,15 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel,
   hppa_fix->segment = now_seg;
 #ifdef OBJ_SOM
   if (r_type == R_ENTRY || r_type == R_EXIT)
   hppa_fix->segment = now_seg;
 #ifdef OBJ_SOM
   if (r_type == R_ENTRY || r_type == R_EXIT)

-    new_fix->fx_offset = *unwind_bits;
+    new_fix->fx_offset = unwind_bits;

 #endif
 
   /* foo-$global$ is used to access non-automatic storage.  $global$
      is really just a marker and has served its purpose, so eliminate
 #endif
 
   /* foo-$global$ is used to access non-automatic storage.  $global$
      is really just a marker and has served its purpose, so eliminate

-     it now so as not to confuse write.c.  */
+     it now so as not to confuse write.c.  Ditto for $PIC_pcrel$0.  */

   if (new_fix->fx_subsy
   if (new_fix->fx_subsy

-      && !strcmp (S_GET_NAME (new_fix->fx_subsy), "$global$"))
+      && (strcmp (S_GET_NAME (new_fix->fx_subsy), "$global$") == 0
+         || strcmp (S_GET_NAME (new_fix->fx_subsy), "$PIC_pcrel$0") == 0))

     new_fix->fx_subsy = NULL;
 }
 
     new_fix->fx_subsy = NULL;
 }
 


@@ -1292,11 +1391,14 @@ cons_fix_new_hppa (frag, where, size, exp)
     rel_type = R_HPPA;
 
   if (hppa_field_selector != e_psel && hppa_field_selector != e_fsel)
     rel_type = R_HPPA;
 
   if (hppa_field_selector != e_psel && hppa_field_selector != e_fsel)

-    as_warn (_("Invalid field selector.  Assuming F%%."));
+    {
+      as_warn (_("Invalid field selector.  Assuming F%%."));
+      hppa_field_selector = e_fsel;
+    }

 
   fix_new_hppa (frag, where, size,
                (symbolS *) NULL, (offsetT) 0, exp, 0, rel_type,
 
   fix_new_hppa (frag, where, size,
                (symbolS *) NULL, (offsetT) 0, exp, 0, rel_type,

-               hppa_field_selector, size * 8, 0, NULL);
+               hppa_field_selector, size * 8, 0, 0);

 
   /* Reset field selector to its default state.  */
   hppa_field_selector = 0;
 
   /* Reset field selector to its default state.  */
   hppa_field_selector = 0;


@@ -1316,7 +1418,7 @@ md_begin ()
   call_info_root = NULL;
 
   /* Set the default machine type.  */
   call_info_root = NULL;
 
   /* Set the default machine type.  */

-  if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10))
+  if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, DEFAULT_LEVEL))

     as_warn (_("could not set architecture and machine"));
 
   /* Folding of text and data segments fails miserably on the PA.
     as_warn (_("could not set architecture and machine"));
 
   /* Folding of text and data segments fails miserably on the PA.


@@ -1368,8 +1470,8 @@ md_begin ()
 #ifdef OBJ_SOM
   dummy_symbol = symbol_find_or_make ("L$dummy");
   S_SET_SEGMENT (dummy_symbol, text_section);
 #ifdef OBJ_SOM
   dummy_symbol = symbol_find_or_make ("L$dummy");
   S_SET_SEGMENT (dummy_symbol, text_section);

-  /* Force the symbol to be converted to a real symbol. */
-  (void) symbol_get_bfdsym (dummy_symbol); 
+  /* Force the symbol to be converted to a real symbol.  */
+  (void) symbol_get_bfdsym (dummy_symbol);

 #endif
 }
 
 #endif
 }
 


@@ -1406,12 +1508,14 @@ md_assemble (str)
                 information when the label appears after the proc/procend.  */
              if (within_entry_exit)
                {
                 information when the label appears after the proc/procend.  */
              if (within_entry_exit)
                {

-                 char *where = frag_more (0);
+                 char *where;
+                 unsigned int u;

 
 

+                 where = frag_more (0);
+                 u = UNWIND_LOW32 (&last_call_info->ci_unwind.descriptor);

                  fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                                NULL, (offsetT) 0, NULL,
                  fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                                NULL, (offsetT) 0, NULL,

-                               0, R_HPPA_ENTRY, e_fsel, 0, 0,
-                               (int *)&last_call_info->ci_unwind.descriptor);
+                               0, R_HPPA_ENTRY, e_fsel, 0, 0, u);

                }
 #endif
            }
                }
 #endif
            }


@@ -1428,7 +1532,7 @@ md_assemble (str)
   /* Get somewhere to put the assembled instrution.  */
   to = frag_more (4);
 
   /* Get somewhere to put the assembled instrution.  */
   to = frag_more (4);
 

-  /* Output the opcode. */
+  /* Output the opcode.  */

   md_number_to_chars (to, the_insn.opcode, 4);
 
   /* If necessary output more stuff.  */
   md_number_to_chars (to, the_insn.opcode, 4);
 
   /* If necessary output more stuff.  */


@@ -1436,7 +1540,11 @@ md_assemble (str)
     fix_new_hppa (frag_now, (to - frag_now->fr_literal), 4, NULL,
                  (offsetT) 0, &the_insn.exp, the_insn.pcrel,
                  the_insn.reloc, the_insn.field_selector,
     fix_new_hppa (frag_now, (to - frag_now->fr_literal), 4, NULL,
                  (offsetT) 0, &the_insn.exp, the_insn.pcrel,
                  the_insn.reloc, the_insn.field_selector,

-                 the_insn.format, the_insn.arg_reloc, NULL);
+                 the_insn.format, the_insn.arg_reloc, 0);
+
+#ifdef OBJ_ELF
+  dwarf2_emit_insn (4);
+#endif

 }
 
 /* Do the real work for assembling a single instruction.  Store results
 }
 
 /* Do the real work for assembling a single instruction.  Store results


@@ -1463,11 +1571,12 @@ pa_ip (str)
   /* Convert everything up to the first whitespace character into lower
      case.  */
   for (s = str; *s != ' ' && *s != '\t' && *s != '\n' && *s != '\0'; s++)
   /* Convert everything up to the first whitespace character into lower
      case.  */
   for (s = str; *s != ' ' && *s != '\t' && *s != '\n' && *s != '\0'; s++)

-    if (isupper (*s))
-      *s = tolower (*s);
+    *s = TOLOWER (*s);

 
   /* Skip to something interesting.  */
 
   /* Skip to something interesting.  */

-  for (s = str; isupper (*s) || islower (*s) || (*s >= '0' && *s <= '3'); ++s)
+  for (s = str;
+       ISUPPER (*s) || ISLOWER (*s) || (*s >= '0' && *s <= '3');
+       ++s)

     ;
 
   switch (*s)
     ;
 
   switch (*s)


@@ -1489,8 +1598,6 @@ pa_ip (str)
       as_fatal (_("Unknown opcode: `%s'"), str);
     }
 
       as_fatal (_("Unknown opcode: `%s'"), str);
     }
 

-  save_s = str;
-

   /* Look up the opcode in the has table.  */
   if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL)
     {
   /* Look up the opcode in the has table.  */
   if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL)
     {


@@ -1510,6 +1617,7 @@ pa_ip (str)
     {
       /* Do some initialization.  */
       opcode = insn->match;
     {
       /* Do some initialization.  */
       opcode = insn->match;

+      strict = (insn->flags & FLAG_STRICT);

       memset (&the_insn, 0, sizeof (the_insn));
 
       the_insn.reloc = R_HPPA_NONE;
       memset (&the_insn, 0, sizeof (the_insn));
 
       the_insn.reloc = R_HPPA_NONE;


@@ -1534,6 +1642,10 @@ pa_ip (str)
          sure that the operands match.  */
       for (args = insn->args;; ++args)
        {
          sure that the operands match.  */
       for (args = insn->args;; ++args)
        {

+         /* Absorb white space in instruction.  */
+         while (*s == ' ' || *s == '\t')
+           s++;
+

          switch (*args)
            {
 
          switch (*args)
            {
 


@@ -1565,26 +1677,61 @@ pa_ip (str)
            /* Handle a 5 bit register or control register field at 10.  */
            case 'b':
            case '^':
            /* Handle a 5 bit register or control register field at 10.  */
            case 'b':
            case '^':

-             num = pa_parse_number (&s, 0);
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;

              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
 
              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
 

+           /* Handle %sar or %cr11.  No bits get set, we just verify that it
+              is there.  */
+           case '!':
+             /* Skip whitespace before register.  */
+             while (*s == ' ' || *s == '\t')
+               s = s + 1;
+
+             if (!strncasecmp (s, "%sar", 4))
+               {
+                 s += 4;
+                 continue;
+               }
+             else if (!strncasecmp (s, "%cr11", 5))
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
+

            /* Handle a 5 bit register field at 15.  */
            case 'x':
            /* Handle a 5 bit register field at 15.  */
            case 'x':

-             num = pa_parse_number (&s, 0);
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;

              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 5 bit register field at 31.  */
              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 5 bit register field at 31.  */

-           case 'y':

            case 't':
            case 't':

-             num = pa_parse_number (&s, 0);
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;

              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
              CHECK_FIELD (num, 31, 0, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 

+           /* Handle a 5 bit register field at 10 and 15.  */
+           case 'a':
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;
+             CHECK_FIELD (num, 31, 0, 0);
+             opcode |= num << 16;
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
+

            /* Handle a 5 bit field length at 31.  */
            case 'T':
              num = pa_get_absolute_expression (&the_insn, &s);
            /* Handle a 5 bit field length at 31.  */
            case 'T':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              CHECK_FIELD (num, 32, 1, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, 32 - num, 0);
              s = expr_end;
              CHECK_FIELD (num, 32, 1, 0);
              INSERT_FIELD_AND_CONTINUE (opcode, 32 - num, 0);


@@ -1592,323 +1739,623 @@ pa_ip (str)
            /* Handle a 5 bit immediate at 15.  */
            case '5':
              num = pa_get_absolute_expression (&the_insn, &s);
            /* Handle a 5 bit immediate at 15.  */
            case '5':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 15, -16, 0);
-             low_sign_unext (num, 5, &num);
+             /* When in strict mode, we want to just reject this
+                match instead of giving an out of range error.  */
+             CHECK_FIELD (num, 15, -16, strict);
+             num = low_sign_unext (num, 5);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 5 bit immediate at 31.  */
            case 'V':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 5 bit immediate at 31.  */
            case 'V':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 15, -16, 0)
-             low_sign_unext (num, 5, &num);
+             /* When in strict mode, we want to just reject this
+                match instead of giving an out of range error.  */
+             CHECK_FIELD (num, 15, -16, strict);
+             num = low_sign_unext (num, 5);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle an unsigned 5 bit immediate at 31.  */
            case 'r':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle an unsigned 5 bit immediate at 31.  */
            case 'r':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 31, 0, 0);
+             CHECK_FIELD (num, 31, 0, strict);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle an unsigned 5 bit immediate at 15.  */
            case 'R':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle an unsigned 5 bit immediate at 15.  */
            case 'R':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 31, 0, 0);
+             CHECK_FIELD (num, 31, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
+
+           /* Handle an unsigned 10 bit immediate at 15.  */
+           case 'U':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 1023, 0, strict);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 2 bit space identifier at 17.  */
            case 's':
              INSERT_FIELD_AND_CONTINUE (opcode, num, 16);
 
            /* Handle a 2 bit space identifier at 17.  */
            case 's':

-             num = pa_parse_number (&s, 0);
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;

              CHECK_FIELD (num, 3, 0, 1);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 14);
 
            /* Handle a 3 bit space identifier at 18.  */
            case 'S':
              CHECK_FIELD (num, 3, 0, 1);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 14);
 
            /* Handle a 3 bit space identifier at 18.  */
            case 'S':

-             num = pa_parse_number (&s, 0);
+             if (!pa_parse_number (&s, 0))
+               break;
+             num = pa_number;

              CHECK_FIELD (num, 7, 0, 1);
              CHECK_FIELD (num, 7, 0, 1);

-             dis_assemble_3 (num, &num);
-             INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
+             opcode |= re_assemble_3 (num);
+             continue;

 
 

-           /* Handle a completer for an indexing load or store.  */
+           /* Handle all completers.  */

            case 'c':
            case 'c':

-             {
-               int uu = 0;
-               int m = 0;
-               int i = 0;
-               while (*s == ',' && i < 2)
+             switch (*++args)
+               {
+
+               /* Handle a completer for an indexing load or store.  */
+               case 'x':

                  {
                  {

-                   s++;
-                   if (strncasecmp (s, "sm", 2) == 0)
+                   int uu = 0;
+                   int m = 0;
+                   int i = 0;
+                   while (*s == ',' && i < 2)

                      {
                      {

-                       uu = 1;
-                       m = 1;
+                       s++;
+                       if (strncasecmp (s, "sm", 2) == 0)
+                         {
+                           uu = 1;
+                           m = 1;
+                           s++;
+                           i++;
+                         }
+                       else if (strncasecmp (s, "m", 1) == 0)
+                         m = 1;
+                       else if ((strncasecmp (s, "s ", 2) == 0)
+                                || (strncasecmp (s, "s,", 2) == 0))
+                         uu = 1;
+                       /* When in strict mode this is a match failure.  */
+                       else if (strict)
+                         {
+                           s--;
+                           break;
+                         }
+                       else
+                         as_bad (_("Invalid Indexed Load Completer."));

                        s++;
                        i++;
                      }
                        s++;
                        i++;
                      }

-                   else if (strncasecmp (s, "m", 1) == 0)
-                     m = 1;
-                   else if (strncasecmp (s, "s", 1) == 0)
-                     uu = 1;
-                   else
-                     as_bad (_("Invalid Indexed Load Completer."));
-                   s++;
-                   i++;
-                 }
-               if (i > 2)
-                 as_bad (_("Invalid Indexed Load Completer Syntax."));
-               opcode |= m << 5;
-               INSERT_FIELD_AND_CONTINUE (opcode, uu, 13);
-             }
-
-           /* Handle a short load/store completer.  */
-           case 'C':
-             {
-               int a = 0;
-               int m = 0;
-               if (*s == ',')
-                 {
-                   s++;
-                   if (strncasecmp (s, "ma", 2) == 0)
-                     {
-                       a = 0;
-                       m = 1;
-                     }
-                   else if (strncasecmp (s, "mb", 2) == 0)
-                     {
-                       a = 1;
-                       m = 1;
-                     }
-                   else
-                     as_bad (_("Invalid Short Load/Store Completer."));
-                   s += 2;
-                 }
-
-               if (*args == 'C')
-                 {
+                   if (i > 2)
+                     as_bad (_("Invalid Indexed Load Completer Syntax."));

                    opcode |= m << 5;
                    opcode |= m << 5;

-                   INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
-                 }
-             }
-
-           /* Handle a stbys completer.  */
-           case 'Y':
-             {
-               int a = 0;
-               int m = 0;
-               int i = 0;
-               while (*s == ',' && i < 2)
-                 {
-                   s++;
-                   if (strncasecmp (s, "m", 1) == 0)
-                     m = 1;
-                   else if (strncasecmp (s, "b", 1) == 0)
-                     a = 0;
-                   else if (strncasecmp (s, "e", 1) == 0)
-                     a = 1;
-                   else
-                     as_bad (_("Invalid Store Bytes Short Completer"));
-                   s++;
-                   i++;
+                   INSERT_FIELD_AND_CONTINUE (opcode, uu, 13);

                  }
                  }

-               if (i > 2)
-                 as_bad (_("Invalid Store Bytes Short Completer"));
-               opcode |= m << 5;
-               INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
-             }

 
 

-           /* Handle all conditions.  */
-           case '?':
-             {
-               args++;
-               switch (*args)
+               /* Handle a short load/store completer.  */
+               case 'm':
+               case 'q':
+               case 'J':
+               case 'e':

                  {
                  {

-                 /* Handle FP compare conditions.  */
-                 case 'f':
-                   cond = pa_parse_fp_cmp_cond (&s);
-                   INSERT_FIELD_AND_CONTINUE (opcode, cond, 0);
-
-                 /* Handle an add condition.  */
-                 case 'A':
-                 case 'a':
-                   cmpltr = 0;
-                   flag = 0;
+                   int a = 0;
+                   int m = 0;

                    if (*s == ',')
                      {
                    if (*s == ',')
                      {

+                       int found = 0;

                        s++;
                        s++;

-
-                       /* 64 bit conditions.  */
-                       if (*args == 'A')
-                         {
-                           if (*s == '*')
-                             s++;
-                           else
-                             break;
-                         }
-                       name = s;
-
-                       while (*s != ',' && *s != ' ' && *s != '\t')
-                         s += 1;
-                       c = *s;
-                       *s = 0x00;
-                       if (strcmp (name, "=") == 0)
-                         cmpltr = 1;
-                       else if (strcmp (name, "<") == 0)
-                         cmpltr = 2;
-                       else if (strcmp (name, "<=") == 0)
-                         cmpltr = 3;
-                       else if (strcasecmp (name, "nuv") == 0)
-                         cmpltr = 4;
-                       else if (strcasecmp (name, "znv") == 0)
-                         cmpltr = 5;
-                       else if (strcasecmp (name, "sv") == 0)
-                         cmpltr = 6;
-                       else if (strcasecmp (name, "od") == 0)
-                         cmpltr = 7;
-                       else if (strcasecmp (name, "tr") == 0)
-                         {
-                           cmpltr = 0;
-                           flag = 1;
-                         }
-                       else if (strcmp (name, "<>") == 0)
-                         {
-                           cmpltr = 1;
-                           flag = 1;
-                         }
-                       else if (strcmp (name, ">=") == 0)
-                         {
-                           cmpltr = 2;
-                           flag = 1;
-                         }
-                       else if (strcmp (name, ">") == 0)
-                         {
-                           cmpltr = 3;
-                           flag = 1;
-                         }
-                       else if (strcasecmp (name, "uv") == 0)
-                         {
-                           cmpltr = 4;
-                           flag = 1;
-                         }
-                       else if (strcasecmp (name, "vnz") == 0)
+                       if (strncasecmp (s, "ma", 2) == 0)

                          {
                          {

-                           cmpltr = 5;
-                           flag = 1;
+                           a = 0;
+                           m = 1;
+                           found = 1;

                          }
                          }

-                       else if (strcasecmp (name, "nsv") == 0)
+                       else if (strncasecmp (s, "mb", 2) == 0)

                          {
                          {

-                           cmpltr = 6;
-                           flag = 1;
+                           a = 1;
+                           m = 1;
+                           found = 1;

                          }
                          }

-                       else if (strcasecmp (name, "ev") == 0)
+
+                       /* When in strict mode, pass through for cache op.  */
+                       if (!found && strict)
+                         s--;
+                       else

                          {
                          {

-                           cmpltr = 7;
-                           flag = 1;
+                           if (!found)
+                             as_bad (_("Invalid Short Load/Store Completer."));
+                           s += 2;

                          }
                          }

-                       /* ",*" is a valid condition.  */
-                       else if (*args == 'a')
-                         as_bad (_("Invalid Add Condition: %s"), name);
-                       *s = c;

                      }
                      }

-                   opcode |= cmpltr << 13;
-                   INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
+                   /* If we did not get a ma/mb completer, then we do not
+                      consider this a positive match for 'ce'.  */
+                   else if (*args == 'e')
+                     break;

 
 

-                 /* Handle non-negated add and branch condition.  */
-                 case 'd':
-                   cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
-                   if (cmpltr < 0)
+                  /* 'J', 'm' and 'q' are the same, except for where they
+                      encode the before/after field.  */
+                  if (*args == 'm')

                      {
                      {

-                       as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
-                       cmpltr = 0;
+                       opcode |= m << 5;
+                       INSERT_FIELD_AND_CONTINUE (opcode, a, 13);

                      }
                      }

-                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
-
-                 /* Handle negated add and branch condition.  */
-                 case 'D':
-                   abort ();
-
-                 /* Handle wide-mode non-negated add and branch condition.  */
-                 case 'w':
-                   abort ();
-
-                 /* Handle wide-mode negated add and branch condition.  */
-                 case 'W':
-                   abort();
-
-                 /* Handle a negated or non-negated add and branch 
-                    condition.  */
-                 case '@':
-                   save_s = s;
-                   cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
-                   if (cmpltr < 0)
+                   else if (*args == 'q')

                      {
                      {

-                       s = save_s;
-                       cmpltr = pa_parse_neg_add_cmpltr (&s, 1);
-                       if (cmpltr < 0)
-                         {
-                           as_bad (_("Invalid Compare/Subtract Condition"));
-                           cmpltr = 0;
-                         }
-                       else
-                         {
-                           /* Negated condition requires an opcode change. */
-                           opcode |= 1 << 27;
-                         }
+                       opcode |= m << 3;
+                       INSERT_FIELD_AND_CONTINUE (opcode, a, 2);

                      }
                      }

-                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+                   else if (*args == 'J')
+                     {
+                       /* M bit is explicit in the major opcode.  */
+                       INSERT_FIELD_AND_CONTINUE (opcode, a, 2);
+                     }
+                   else if (*args == 'e')
+                     {
+                       /* Stash the ma/mb flag temporarily in the
+                          instruction.  We will use (and remove it)
+                          later when handling 'J', 'K', '<' & '>'.  */
+                       opcode |= a;
+                       continue;
+                     }
+                 }

 
 

-                 /* Handle branch on bit conditions.  */
-                 case 'B':
-                 case 'b':
-                   cmpltr = 0;
-                   if (*s == ',')
+               /* Handle a stbys completer.  */
+               case 's':
+                 {
+                   int a = 0;
+                   int m = 0;
+                   int i = 0;
+                   while (*s == ',' && i < 2)

                      {
                        s++;
                      {
                        s++;

-
-                       if (*args == 'B')
-                         {
-                           if (*s == '*')
-                             s++;
-                           else
-                             break;
-                         }
-
-                       if (strncmp (s, "<", 1) == 0)
-                         {
-                           cmpltr = 0;
-                           s++;
-                         }
-                       else if (strncmp (s, ">=", 2) == 0)
+                       if (strncasecmp (s, "m", 1) == 0)
+                         m = 1;
+                       else if ((strncasecmp (s, "b ", 2) == 0)
+                                || (strncasecmp (s, "b,", 2) == 0))
+                         a = 0;
+                       else if (strncasecmp (s, "e", 1) == 0)
+                         a = 1;
+                       /* When in strict mode this is a match failure.  */
+                       else if (strict)

                          {
                          {

-                           cmpltr = 1;
-                           s += 2;
+                           s--;
+                           break;

                          }
                        else
                          }
                        else

-                         as_bad (_("Invalid Bit Branch Condition: %c"), *s);
+                         as_bad (_("Invalid Store Bytes Short Completer"));
+                       s++;
+                       i++;

                      }
                      }

-                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
+                   if (i > 2)
+                     as_bad (_("Invalid Store Bytes Short Completer"));
+                   opcode |= m << 5;
+                   INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
+                 }

 
 

-                 /* Handle a compare/subtract condition.  */
-                 case 'S':
-                 case 's':
-                   cmpltr = 0;
+               /* Handle load cache hint completer.  */
+               case 'c':
+                 cmpltr = 0;
+                 if (!strncmp (s, ",sl", 3))
+                   {
+                     s += 3;
+                     cmpltr = 2;
+                   }
+                 INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10);
+
+               /* Handle store cache hint completer.  */
+               case 'C':
+                 cmpltr = 0;
+                 if (!strncmp (s, ",sl", 3))
+                   {
+                     s += 3;
+                     cmpltr = 2;
+                   }
+                 else if (!strncmp (s, ",bc", 3))
+                   {
+                     s += 3;
+                     cmpltr = 1;
+                   }
+                 INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10);
+
+               /* Handle load and clear cache hint completer.  */
+               case 'd':
+                 cmpltr = 0;
+                 if (!strncmp (s, ",co", 3))
+                   {
+                     s += 3;
+                     cmpltr = 1;
+                   }
+                 INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10);
+
+               /* Handle load ordering completer.  */
+               case 'o':
+                 if (strncmp (s, ",o", 2) != 0)
+                   break;
+                 s += 2;
+                 continue;
+
+               /* Handle a branch gate completer.  */
+               case 'g':
+                 if (strncasecmp (s, ",gate", 5) != 0)
+                   break;
+                 s += 5;
+                 continue;
+
+               /* Handle a branch link and push completer.  */
+               case 'p':
+                 if (strncasecmp (s, ",l,push", 7) != 0)
+                   break;
+                 s += 7;
+                 continue;
+
+               /* Handle a branch link completer.  */
+               case 'l':
+                 if (strncasecmp (s, ",l", 2) != 0)
+                   break;
+                 s += 2;
+                 continue;
+
+               /* Handle a branch pop completer.  */
+               case 'P':
+                 if (strncasecmp (s, ",pop", 4) != 0)
+                   break;
+                 s += 4;
+                 continue;
+
+               /* Handle a local processor completer.  */
+               case 'L':
+                 if (strncasecmp (s, ",l", 2) != 0)
+                   break;
+                 s += 2;
+                 continue;
+
+               /* Handle a PROBE read/write completer.  */
+               case 'w':
+                 flag = 0;
+                 if (!strncasecmp (s, ",w", 2))
+                   {
+                     flag = 1;
+                     s += 2;
+                   }
+                 else if (!strncasecmp (s, ",r", 2))
+                   {
+                     flag = 0;
+                     s += 2;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 6);
+
+               /* Handle MFCTL wide completer.  */
+               case 'W':
+                 if (strncasecmp (s, ",w", 2) != 0)
+                   break;
+                 s += 2;
+                 continue;
+
+               /* Handle an RFI restore completer.  */
+               case 'r':
+                 flag = 0;
+                 if (!strncasecmp (s, ",r", 2))
+                   {
+                     flag = 5;
+                     s += 2;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 5);
+
+               /* Handle a system control completer.  */
+               case 'Z':
+                 if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M'))
+                   {
+                     flag = 1;
+                     s += 2;
+                   }
+                 else

                    flag = 0;
                    flag = 0;

+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 5);
+
+               /* Handle intermediate/final completer for DCOR.  */
+               case 'i':
+                 flag = 0;
+                 if (!strncasecmp (s, ",i", 2))
+                   {
+                     flag = 1;
+                     s += 2;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 6);
+
+               /* Handle zero/sign extension completer.  */
+               case 'z':
+                 flag = 1;
+                 if (!strncasecmp (s, ",z", 2))
+                   {
+                     flag = 0;
+                     s += 2;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 10);
+
+               /* Handle add completer.  */
+               case 'a':
+                 flag = 1;
+                 if (!strncasecmp (s, ",l", 2))
+                   {
+                     flag = 2;
+                     s += 2;
+                   }
+                 else if (!strncasecmp (s, ",tsv", 4))
+                   {
+                     flag = 3;
+                     s += 4;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 10);
+
+               /* Handle 64 bit carry for ADD.  */
+               case 'Y':
+                 flag = 0;
+                 if (!strncasecmp (s, ",dc,tsv", 7) ||
+                     !strncasecmp (s, ",tsv,dc", 7))
+                   {
+                     flag = 1;
+                     s += 7;
+                   }
+                 else if (!strncasecmp (s, ",dc", 3))
+                   {
+                     flag = 0;
+                     s += 3;
+                   }
+                 else
+                   break;
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle 32 bit carry for ADD.  */
+               case 'y':
+                 flag = 0;
+                 if (!strncasecmp (s, ",c,tsv", 6) ||
+                     !strncasecmp (s, ",tsv,c", 6))
+                   {
+                     flag = 1;
+                     s += 6;
+                   }
+                 else if (!strncasecmp (s, ",c", 2))
+                   {
+                     flag = 0;
+                     s += 2;
+                   }
+                 else
+                   break;
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle trap on signed overflow.  */
+               case 'v':
+                 flag = 0;
+                 if (!strncasecmp (s, ",tsv", 4))
+                   {
+                     flag = 1;
+                     s += 4;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle trap on condition and overflow.  */
+               case 't':
+                 flag = 0;
+                 if (!strncasecmp (s, ",tc,tsv", 7) ||
+                     !strncasecmp (s, ",tsv,tc", 7))
+                   {
+                     flag = 1;
+                     s += 7;
+                   }
+                 else if (!strncasecmp (s, ",tc", 3))
+                   {
+                     flag = 0;
+                     s += 3;
+                   }
+                 else
+                   break;
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle 64 bit borrow for SUB.  */
+               case 'B':
+                 flag = 0;
+                 if (!strncasecmp (s, ",db,tsv", 7) ||
+                     !strncasecmp (s, ",tsv,db", 7))
+                   {
+                     flag = 1;
+                     s += 7;
+                   }
+                 else if (!strncasecmp (s, ",db", 3))
+                   {
+                     flag = 0;
+                     s += 3;
+                   }
+                 else
+                   break;
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle 32 bit borrow for SUB.  */
+               case 'b':
+                 flag = 0;
+                 if (!strncasecmp (s, ",b,tsv", 6) ||
+                     !strncasecmp (s, ",tsv,b", 6))
+                   {
+                     flag = 1;
+                     s += 6;
+                   }
+                 else if (!strncasecmp (s, ",b", 2))
+                   {
+                     flag = 0;
+                     s += 2;
+                   }
+                 else
+                   break;
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+               /* Handle trap condition completer for UADDCM.  */
+               case 'T':
+                 flag = 0;
+                 if (!strncasecmp (s, ",tc", 3))
+                   {
+                     flag = 1;
+                     s += 3;
+                   }
+
+                 INSERT_FIELD_AND_CONTINUE (opcode, flag, 6);
+
+               /* Handle signed/unsigned at 21.  */
+               case 'S':
+                 {
+                   int sign = 1;
+                   if (strncasecmp (s, ",s", 2) == 0)
+                     {
+                       sign = 1;
+                       s += 2;
+                     }
+                   else if (strncasecmp (s, ",u", 2) == 0)
+                     {
+                       sign = 0;
+                       s += 2;
+                     }
+
+                   INSERT_FIELD_AND_CONTINUE (opcode, sign, 10);
+                 }
+
+               /* Handle left/right combination at 17:18.  */
+               case 'h':
+                 if (*s++ == ',')
+                   {
+                     int lr = 0;
+                     if (*s == 'r')
+                       lr = 2;
+                     else if (*s == 'l')
+                       lr = 0;
+                     else
+                       as_bad (_("Invalid left/right combination completer"));
+
+                     s++;
+                     INSERT_FIELD_AND_CONTINUE (opcode, lr, 13);
+                   }
+                 else
+                   as_bad (_("Invalid left/right combination completer"));
+                 break;
+
+               /* Handle saturation at 24:25.  */
+               case 'H':
+                 {
+                   int sat = 3;
+                   if (strncasecmp (s, ",ss", 3) == 0)
+                     {
+                       sat = 1;
+                       s += 3;
+                     }
+                   else if (strncasecmp (s, ",us", 3) == 0)
+                     {
+                       sat = 0;
+                       s += 3;
+                     }
+
+                   INSERT_FIELD_AND_CONTINUE (opcode, sat, 6);
+                 }
+
+               /* Handle permutation completer.  */
+               case '*':
+                 if (*s++ == ',')
+                   {
+                     int permloc[4];
+                     int perm = 0;
+                     int i = 0;
+                     permloc[0] = 13;
+                     permloc[1] = 10;
+                     permloc[2] = 8;
+                     permloc[3] = 6;
+                     for (; i < 4; i++)
+                       {
+                         switch (*s++)
+                           {
+                           case '0':
+                             perm = 0;
+                             break;
+                           case '1':
+                             perm = 1;
+                             break;
+                           case '2':
+                             perm = 2;
+                             break;
+                           case '3':
+                             perm = 3;
+                             break;
+                           default:
+                             as_bad (_("Invalid permutation completer"));
+                           }
+                         opcode |= perm << permloc[i];
+                       }
+                     continue;
+                   }
+                 else
+                   as_bad (_("Invalid permutation completer"));
+                 break;
+
+               default:
+                 abort ();
+               }
+             break;
+
+           /* Handle all conditions.  */
+           case '?':
+             {
+               args++;
+               switch (*args)
+                 {
+                 /* Handle FP compare conditions.  */
+                 case 'f':
+                   cond = pa_parse_fp_cmp_cond (&s);
+                   INSERT_FIELD_AND_CONTINUE (opcode, cond, 0);
+
+                 /* Handle an add condition.  */
+                 case 'A':
+                 case 'a':
+                   cmpltr = 0;
+                   flag = 0;

                    if (*s == ',')
                      {
                        s++;
 
                        /* 64 bit conditions.  */
                    if (*s == ',')
                      {
                        s++;
 
                        /* 64 bit conditions.  */

-                       if (*args == 'S')
-                         { 
+                       if (*args == 'A')
+                         {

                            if (*s == '*')
                              s++;
                            else
                              break;
                            if (*s == '*')
                              s++;
                            else
                              break;

-                         } 
+                         }
+                       else if (*s == '*')
+                         break;
+                       name = s;
+

                        name = s;
                        name = s;

-                           

                        while (*s != ',' && *s != ' ' && *s != '\t')
                          s += 1;
                        c = *s;
                        while (*s != ',' && *s != ' ' && *s != '\t')
                          s += 1;
                        c = *s;


@@ -1919,9 +2366,9 @@ pa_ip (str)
                          cmpltr = 2;
                        else if (strcmp (name, "<=") == 0)
                          cmpltr = 3;
                          cmpltr = 2;
                        else if (strcmp (name, "<=") == 0)
                          cmpltr = 3;

-                       else if (strcasecmp (name, "<<") == 0)
+                       else if (strcasecmp (name, "nuv") == 0)

                          cmpltr = 4;
                          cmpltr = 4;

-                       else if (strcasecmp (name, "<<=") == 0)
+                       else if (strcasecmp (name, "znv") == 0)

                          cmpltr = 5;
                        else if (strcasecmp (name, "sv") == 0)
                          cmpltr = 6;
                          cmpltr = 5;
                        else if (strcasecmp (name, "sv") == 0)
                          cmpltr = 6;


@@ -1947,12 +2394,12 @@ pa_ip (str)
                            cmpltr = 3;
                            flag = 1;
                          }
                            cmpltr = 3;
                            flag = 1;
                          }

-                       else if (strcasecmp (name, ">>=") == 0)
+                       else if (strcasecmp (name, "uv") == 0)

                          {
                            cmpltr = 4;
                            flag = 1;
                          }
                          {
                            cmpltr = 4;
                            flag = 1;
                          }

-                       else if (strcasecmp (name, ">>") == 0)
+                       else if (strcasecmp (name, "vnz") == 0)

                          {
                            cmpltr = 5;
                            flag = 1;
                          {
                            cmpltr = 5;
                            flag = 1;


@@ -1968,88 +2415,263 @@ pa_ip (str)
                            flag = 1;
                          }
                        /* ",*" is a valid condition.  */
                            flag = 1;
                          }
                        /* ",*" is a valid condition.  */

-                       else if (*args != 'S')
-                         as_bad (_("Invalid Compare/Subtract Condition: %s"),
-                                 name);
+                       else if (*args == 'a')
+                         as_bad (_("Invalid Add Condition: %s"), name);

                        *s = c;
                      }
                    opcode |= cmpltr << 13;
                    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
 
                        *s = c;
                      }
                    opcode |= cmpltr << 13;
                    INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
 

-                 /* Handle a non-negated compare condition.  */
-                 case 't':
-                   cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
+                 /* Handle non-negated add and branch condition.  */
+                 case 'd':
+                   cmpltr = pa_parse_nonneg_add_cmpltr (&s);

                    if (cmpltr < 0)
                      {
                    if (cmpltr < 0)
                      {

-                       as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
+                       as_bad (_("Invalid Add and Branch Condition"));

                        cmpltr = 0;
                      }
                    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
 
                        cmpltr = 0;
                      }
                    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
 

-                 /* Handle a negated compare condition.  */
-                 case 'T':
-                   abort ();
-  
-                 /* Handle a 64 bit non-negated compare condition.  */
-                 case 'r':
-                   abort ();
-  
-                 /* Handle a 64 bit negated compare condition.  */
-                 case 'R':
-                   abort ();
-  
-                 /* Handle a 64 bit cmpib condition.  */
-                 case 'Q':
-                   abort ();
-  
-                 /* Handle a negated or non-negated compare/subtract
+                 /* Handle 64 bit wide-mode add and branch condition.  */
+                 case 'W':
+                   cmpltr = pa_parse_addb_64_cmpltr (&s);
+                   if (cmpltr < 0)
+                     {
+                       as_bad (_("Invalid Add and Branch Condition"));
+                       cmpltr = 0;
+                     }
+                   else
+                     {
+                       /* Negated condition requires an opcode change.  */
+                       opcode |= (cmpltr & 8) << 24;
+                     }
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr & 7, 13);
+
+                 /* Handle a negated or non-negated add and branch

                     condition.  */
                     condition.  */

-                 case 'n':
+                 case '@':

                    save_s = s;
                    save_s = s;

-                   cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
+                   cmpltr = pa_parse_nonneg_add_cmpltr (&s);

                    if (cmpltr < 0)
                      {
                        s = save_s;
                    if (cmpltr < 0)
                      {
                        s = save_s;

-                       cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1);
+                       cmpltr = pa_parse_neg_add_cmpltr (&s);

                        if (cmpltr < 0)
                          {
                        if (cmpltr < 0)
                          {

-                           as_bad (_("Invalid Compare/Subtract Condition."));
+                           as_bad (_("Invalid Compare/Subtract Condition"));

                            cmpltr = 0;
                          }
                        else
                          {
                            cmpltr = 0;
                          }
                        else
                          {

-                           /* Negated condition requires an opcode change. */
+                           /* Negated condition requires an opcode change.  */

                            opcode |= 1 << 27;
                          }
                      }
                            opcode |= 1 << 27;
                          }
                      }

-           

                    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
 
                    INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
 

-                   /* Handle a logical instruction condition.  */
-                 case 'L':
-                 case 'l':
+                 /* Handle branch on bit conditions.  */
+                 case 'B':
+                 case 'b':

                    cmpltr = 0;
                    cmpltr = 0;

-                   flag = 0;

                    if (*s == ',')
                      {
                        s++;
 
                    if (*s == ',')
                      {
                        s++;
 

-                       /* 64 bit conditions.  */
-                       if (*args == 'L')
+                       if (*args == 'B')

                          {
                            if (*s == '*')
                              s++;
                            else
                              break;
                          }
                          {
                            if (*s == '*')
                              s++;
                            else
                              break;
                          }

-                       name = s;
-                           
-                       while (*s != ',' && *s != ' ' && *s != '\t')
-                         s += 1;
+                       else if (*s == '*')
+                         break;
+
+                       if (strncmp (s, "<", 1) == 0)
+                         {
+                           cmpltr = 0;
+                           s++;
+                         }
+                       else if (strncmp (s, ">=", 2) == 0)
+                         {
+                           cmpltr = 1;
+                           s += 2;
+                         }
+                       else
+                         as_bad (_("Invalid Bit Branch Condition: %c"), *s);
+                     }
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
+
+                 /* Handle a compare/subtract condition.  */
+                 case 'S':
+                 case 's':
+                   cmpltr = 0;
+                   flag = 0;
+                   if (*s == ',')
+                     {
+                       s++;
+
+                       /* 64 bit conditions.  */
+                       if (*args == 'S')
+                         {
+                           if (*s == '*')
+                             s++;
+                           else
+                             break;
+                         }
+                       else if (*s == '*')
+                         break;
+                       name = s;
+
+                       name = s;
+                       while (*s != ',' && *s != ' ' && *s != '\t')
+                         s += 1;
+                       c = *s;
+                       *s = 0x00;
+                       if (strcmp (name, "=") == 0)
+                         cmpltr = 1;
+                       else if (strcmp (name, "<") == 0)
+                         cmpltr = 2;
+                       else if (strcmp (name, "<=") == 0)
+                         cmpltr = 3;
+                       else if (strcasecmp (name, "<<") == 0)
+                         cmpltr = 4;
+                       else if (strcasecmp (name, "<<=") == 0)
+                         cmpltr = 5;
+                       else if (strcasecmp (name, "sv") == 0)
+                         cmpltr = 6;
+                       else if (strcasecmp (name, "od") == 0)
+                         cmpltr = 7;
+                       else if (strcasecmp (name, "tr") == 0)
+                         {
+                           cmpltr = 0;
+                           flag = 1;
+                         }
+                       else if (strcmp (name, "<>") == 0)
+                         {
+                           cmpltr = 1;
+                           flag = 1;
+                         }
+                       else if (strcmp (name, ">=") == 0)
+                         {
+                           cmpltr = 2;
+                           flag = 1;
+                         }
+                       else if (strcmp (name, ">") == 0)
+                         {
+                           cmpltr = 3;
+                           flag = 1;
+                         }
+                       else if (strcasecmp (name, ">>=") == 0)
+                         {
+                           cmpltr = 4;
+                           flag = 1;
+                         }
+                       else if (strcasecmp (name, ">>") == 0)
+                         {
+                           cmpltr = 5;
+                           flag = 1;
+                         }
+                       else if (strcasecmp (name, "nsv") == 0)
+                         {
+                           cmpltr = 6;
+                           flag = 1;
+                         }
+                       else if (strcasecmp (name, "ev") == 0)
+                         {
+                           cmpltr = 7;
+                           flag = 1;
+                         }
+                       /* ",*" is a valid condition.  */
+                       else if (*args != 'S')
+                         as_bad (_("Invalid Compare/Subtract Condition: %s"),
+                                 name);
+                       *s = c;
+                     }
+                   opcode |= cmpltr << 13;
+                   INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
+
+                 /* Handle a non-negated compare condition.  */
+                 case 't':
+                   cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s);
+                   if (cmpltr < 0)
+                     {
+                       as_bad (_("Invalid Compare/Subtract Condition"));
+                       cmpltr = 0;
+                     }
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+                 /* Handle a 32 bit compare and branch condition.  */
+                 case 'n':
+                   save_s = s;
+                   cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s);
+                   if (cmpltr < 0)
+                     {
+                       s = save_s;
+                       cmpltr = pa_parse_neg_cmpsub_cmpltr (&s);
+                       if (cmpltr < 0)
+                         {
+                           as_bad (_("Invalid Compare and Branch Condition"));
+                           cmpltr = 0;
+                         }
+                       else
+                         {
+                           /* Negated condition requires an opcode change.  */
+                           opcode |= 1 << 27;
+                         }
+                     }
+
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+                 /* Handle a 64 bit compare and branch condition.  */
+                 case 'N':
+                   cmpltr = pa_parse_cmpb_64_cmpltr (&s);
+                   if (cmpltr >= 0)
+                     {
+                       /* Negated condition requires an opcode change.  */
+                       opcode |= (cmpltr & 8) << 26;
+                     }
+                   else
+                     /* Not a 64 bit cond.  Give 32 bit a chance.  */
+                     break;
+
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr & 7, 13);
+
+                 /* Handle a 64 bit cmpib condition.  */
+                 case 'Q':
+                   cmpltr = pa_parse_cmpib_64_cmpltr (&s);
+                   if (cmpltr < 0)
+                     /* Not a 64 bit cond.  Give 32 bit a chance.  */
+                     break;
+
+                   INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+
+                   /* Handle a logical instruction condition.  */
+                 case 'L':
+                 case 'l':
+                   cmpltr = 0;
+                   flag = 0;
+                   if (*s == ',')
+                     {
+                       s++;
+
+                       /* 64 bit conditions.  */
+                       if (*args == 'L')
+                         {
+                           if (*s == '*')
+                             s++;
+                           else
+                             break;
+                         }
+                       else if (*s == '*')
+                         break;
+
+                       name = s;
+                       while (*s != ',' && *s != ' ' && *s != '\t')
+                         s += 1;

                        c = *s;
                        *s = 0x00;
                        c = *s;
                        *s = 0x00;

-           
-           
+

                        if (strcmp (name, "=") == 0)
                          cmpltr = 1;
                        else if (strcmp (name, "<") == 0)
                        if (strcmp (name, "=") == 0)
                          cmpltr = 1;
                        else if (strcmp (name, "<") == 0)


@@ -2108,8 +2730,10 @@ pa_ip (str)
                            else
                              break;
                          }
                            else
                              break;
                          }

+                       else if (*s == '*')
+                         break;
+

                        name = s;
                        name = s;

-                           

                        while (*s != ',' && *s != ' ' && *s != '\t')
                          s += 1;
                        c = *s;
                        while (*s != ',' && *s != ' ' && *s != '\t')
                          s += 1;
                        c = *s;


@@ -2151,7 +2775,7 @@ pa_ip (str)
                    if (*s == ',')
                      {
                        s++;
                    if (*s == ',')
                      {
                        s++;

-           
+

                        /* 64 bit conditions.  */
                        if (*args == 'U')
                          {
                        /* 64 bit conditions.  */
                        if (*args == 'U')
                          {


@@ -2160,7 +2784,9 @@ pa_ip (str)
                            else
                              break;
                          }
                            else
                              break;
                          }

-                           
+                       else if (*s == '*')
+                         break;
+

                        if (strncasecmp (s, "sbz", 3) == 0)
                          {
                            cmpltr = 2;
                        if (strncasecmp (s, "sbz", 3) == 0)
                          {
                            cmpltr = 2;


@@ -2222,6 +2848,30 @@ pa_ip (str)
                            flag = 1;
                            s += 3;
                          }
                            flag = 1;
                            s += 3;
                          }

+                       else if (strncasecmp (s, "swz", 3) == 0)
+                         {
+                           cmpltr = 1;
+                           flag = 0;
+                           s += 3;
+                         }
+                       else if (strncasecmp (s, "swc", 3) == 0)
+                         {
+                           cmpltr = 5;
+                           flag = 0;
+                           s += 3;
+                         }
+                       else if (strncasecmp (s, "nwz", 3) == 0)
+                         {
+                           cmpltr = 1;
+                           flag = 1;
+                           s += 3;
+                         }
+                       else if (strncasecmp (s, "nwc", 3) == 0)
+                         {
+                           cmpltr = 5;
+                           flag = 1;
+                           s += 3;
+                         }

                        /* ",*" is a valid condition.  */
                        else if (*args != 'U')
                          as_bad (_("Invalid Unit Instruction Condition."));
                        /* ",*" is a valid condition.  */
                        else if (*args != 'U')
                          as_bad (_("Invalid Unit Instruction Condition."));


@@ -2235,18 +2885,6 @@ pa_ip (str)
                break;
              }
 
                break;
              }
 

-           /* Handle a system control completer.  */
-           case 'Z':
-             if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M'))
-               {
-                 flag = 1;
-                 s += 2;
-               }
-             else
-               flag = 0;
-
-             INSERT_FIELD_AND_CONTINUE (opcode, flag, 5);
-

            /* Handle a nullification completer for branch instructions.  */
            case 'n':
              nullif = pa_parse_nullif (&s);
            /* Handle a nullification completer for branch instructions.  */
            case 'n':
              nullif = pa_parse_nullif (&s);


@@ -2257,6 +2895,52 @@ pa_ip (str)
              nullif = pa_parse_nullif (&s);
              INSERT_FIELD_AND_CONTINUE (opcode, nullif, 5);
 
              nullif = pa_parse_nullif (&s);
              INSERT_FIELD_AND_CONTINUE (opcode, nullif, 5);
 

+           /* Handle ,%r2 completer for new syntax branches.  */
+           case 'L':
+             if (*s == ',' && strncasecmp (s + 1, "%r2", 3) == 0)
+               s += 4;
+             else if (*s == ',' && strncasecmp (s + 1, "%rp", 3) == 0)
+               s += 4;
+             else
+               break;
+             continue;
+
+           /* Handle 3 bit entry into the fp compare array.   Valid values
+              are 0..6 inclusive.  */
+           case 'h':
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 6, 0, 0);
+                 num++;
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
+               }
+             else
+               break;
+
+           /* Handle 3 bit entry into the fp compare array.   Valid values
+              are 0..6 inclusive.  */
+           case 'm':
+             get_expression (s);
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 s = expr_end;
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 6, 0, 0);
+                 num = (num + 1) ^ 1;
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
+               }
+             else
+               break;
+
+           /* Handle graphics test completers for ftest */
+           case '=':
+             {
+               num = pa_parse_ftest_gfx_completer (&s);
+               INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+             }

 
            /* Handle a 11 bit immediate at 31.  */
            case 'i':
 
            /* Handle a 11 bit immediate at 31.  */
            case 'i':


@@ -2267,7 +2951,7 @@ pa_ip (str)
                {
                  num = evaluate_absolute (&the_insn);
                  CHECK_FIELD (num, 1023, -1024, 0);
                {
                  num = evaluate_absolute (&the_insn);
                  CHECK_FIELD (num, 1023, -1024, 0);

-                 low_sign_unext (num, 11, &num);
+                 num = low_sign_unext (num, 11);

                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }
              else
                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }
              else


@@ -2282,75 +2966,299 @@ pa_ip (str)
                  continue;
                }
 
                  continue;
                }
 

-

            /* Handle a 14 bit immediate at 31.  */
            /* Handle a 14 bit immediate at 31.  */

-           case 'j':
+           case 'J':

              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;
              if (the_insn.exp.X_op == O_constant)
                {
              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;
              if (the_insn.exp.X_op == O_constant)
                {

+                 int mb;
+
+                 /* XXX the completer stored away tidbits of information
+                    for us to extract.  We need a cleaner way to do this.
+                    Now that we have lots of letters again, it would be
+                    good to rethink this.  */
+                 mb = opcode & 1;
+                 opcode -= mb;

                  num = evaluate_absolute (&the_insn);
                  num = evaluate_absolute (&the_insn);

+                 if (mb != (num < 0))
+                   break;

                  CHECK_FIELD (num, 8191, -8192, 0);
                  CHECK_FIELD (num, 8191, -8192, 0);

-                 low_sign_unext (num, 14, &num);
+                 num = low_sign_unext (num, 14);

                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }
                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }

-             else
-               {
-                 if (is_DP_relative (the_insn.exp))
-                   the_insn.reloc = R_HPPA_GOTOFF;
-                 else if (is_PC_relative (the_insn.exp))
-                   the_insn.reloc = R_HPPA_PCREL_CALL;
-                 else
-                   the_insn.reloc = R_HPPA;
-                 the_insn.format = 14;
-                 continue;
-               }
+             break;

 
 

-           /* Handle a 21 bit immediate at 31.  */
-           case 'k':
+           /* Handle a 14 bit immediate at 31.  */
+           case 'K':

              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;
              if (the_insn.exp.X_op == O_constant)
                {
              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;
              if (the_insn.exp.X_op == O_constant)
                {

+                 int mb;
+
+                 mb = opcode & 1;
+                 opcode -= mb;

                  num = evaluate_absolute (&the_insn);
                  num = evaluate_absolute (&the_insn);

-                 CHECK_FIELD (num >> 11, 1048575, -1048576, 0);
-                 dis_assemble_21 (num, &num);
+                 if (mb == (num < 0))
+                   break;
+                 if (num % 4)
+                   break;
+                 CHECK_FIELD (num, 8191, -8192, 0);
+                 num = low_sign_unext (num, 14);

                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }
                  INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
                }

-             else
-               {
-                 if (is_DP_relative (the_insn.exp))
-                   the_insn.reloc = R_HPPA_GOTOFF;
-                 else if (is_PC_relative (the_insn.exp))
-                   the_insn.reloc = R_HPPA_PCREL_CALL;
-                 else
-                   the_insn.reloc = R_HPPA;
-                 the_insn.format = 21;
-                 continue;
-               }
+             break;

 
 

-           /* Handle a 12 bit branch displacement.  */
-           case 'w':
+           /* Handle a 16 bit immediate at 31.  */
+           case '<':

              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;
              the_insn.field_selector = pa_chk_field_selector (&s);
              get_expression (s);
              s = expr_end;

-             the_insn.pcrel = 1;
-             if (!strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), "L$0\001"))
+             if (the_insn.exp.X_op == O_constant)

                {
                {

-                 unsigned int w1, w, result;
+                 int mb;

 
 

+                 mb = opcode & 1;
+                 opcode -= mb;

                  num = evaluate_absolute (&the_insn);
                  num = evaluate_absolute (&the_insn);

-                 if (num % 4)
+                 if (mb != (num < 0))
+                   break;
+                 CHECK_FIELD (num, 32767, -32768, 0);
+                 num = re_assemble_16 (num);
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+               }
+             break;
+
+           /* Handle a 16 bit immediate at 31.  */
+           case '>':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 int mb;
+
+                 mb = opcode & 1;
+                 opcode -= mb;
+                 num = evaluate_absolute (&the_insn);
+                 if (mb == (num < 0))
+                   break;
+                 if (num % 4)
+                   break;
+                 CHECK_FIELD (num, 32767, -32768, 0);
+                 num = re_assemble_16 (num);
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+               }
+             break;
+
+           /* Handle 14 bit immediate, shifted left three times.  */
+           case '#':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 if (num & 0x7)
+                   break;
+                 CHECK_FIELD (num, 8191, -8192, 0);
+                 if (num < 0)
+                   opcode |= 1;
+                 num &= 0x1fff;
+                 num >>= 3;
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 4);
+               }
+             else
+               {
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+             break;
+
+           /* Handle 14 bit immediate, shifted left twice.  */
+           case 'd':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 if (num & 0x3)
+                   break;
+                 CHECK_FIELD (num, 8191, -8192, 0);
+                 if (num < 0)
+                   opcode |= 1;
+                 num &= 0x1fff;
+                 num >>= 2;
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 3);
+               }
+             else
+               {
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+
+           /* Handle a 14 bit immediate at 31.  */
+           case 'j':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 8191, -8192, 0);
+                 num = low_sign_unext (num, 14);
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+               }
+             else
+               {
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+
+           /* Handle a 21 bit immediate at 31.  */
+           case 'k':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num >> 11, 1048575, -1048576, 0);
+                 opcode |= re_assemble_21 (num);
+                 continue;
+               }
+             else
+               {
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 21;
+                 continue;
+               }
+
+           /* Handle a 16 bit immediate at 31 (PA 2.0 wide mode only).  */
+           case 'l':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 32767, -32768, 0);
+                 opcode |= re_assemble_16 (num);
+                 continue;
+               }
+             else
+               {
+                 /* ??? Is this valid for wide mode?  */
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+
+           /* Handle a word-aligned 16-bit imm. at 31 (PA2.0 wide).  */
+           case 'y':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 32767, -32768, 0);
+                 CHECK_ALIGN (num, 4, 0);
+                 opcode |= re_assemble_16 (num);
+                 continue;
+               }
+             else
+               {
+                 /* ??? Is this valid for wide mode?  */
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+
+           /* Handle a dword-aligned 16-bit imm. at 31 (PA2.0 wide).  */
+           case '&':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             if (the_insn.exp.X_op == O_constant)
+               {
+                 num = evaluate_absolute (&the_insn);
+                 CHECK_FIELD (num, 32767, -32768, 0);
+                 CHECK_ALIGN (num, 8, 0);
+                 opcode |= re_assemble_16 (num);
+                 continue;
+               }
+             else
+               {
+                 /* ??? Is this valid for wide mode?  */
+                 if (is_DP_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_GOTOFF;
+                 else if (is_PC_relative (the_insn.exp))
+                   the_insn.reloc = R_HPPA_PCREL_CALL;
+                 else
+                   the_insn.reloc = R_HPPA;
+                 the_insn.format = 14;
+                 continue;
+               }
+
+           /* Handle a 12 bit branch displacement.  */
+           case 'w':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             the_insn.pcrel = 1;
+             if (!the_insn.exp.X_add_symbol
+                 || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
+                             "L$0\001"))
+               {
+                 num = evaluate_absolute (&the_insn);
+                 if (num % 4)

                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }
                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }

-                 CHECK_FIELD (num, 8199, -8184, 0);
-                 sign_unext ((num - 8) >> 2, 12, &result);
-                 dis_assemble_12 (result, &w1, &w);
-                 INSERT_FIELD_AND_CONTINUE (opcode, ((w1 << 2) | w), 0);
+                 if (the_insn.exp.X_add_symbol)
+                   num -= 8;
+                 CHECK_FIELD (num, 8191, -8192, 0);
+                 opcode |= re_assemble_12 (num >> 2);
+                 continue;

                }
              else
                {
                }
              else
                {


@@ -2372,28 +3280,52 @@ pa_ip (str)
                  || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
                              "L$0\001"))
                {
                  || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
                              "L$0\001"))
                {

-                 unsigned int w2, w1, w, result;
-

                  num = evaluate_absolute (&the_insn);
                  if (num % 4)
                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }
                  num = evaluate_absolute (&the_insn);
                  if (num % 4)
                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }

+                 if (the_insn.exp.X_add_symbol)
+                   num -= 8;

                  CHECK_FIELD (num, 262143, -262144, 0);
                  CHECK_FIELD (num, 262143, -262144, 0);

+                 opcode |= re_assemble_17 (num >> 2);
+                 continue;
+               }
+             else
+               {
+                 the_insn.reloc = R_HPPA_PCREL_CALL;
+                 the_insn.format = 17;
+                 the_insn.arg_reloc = last_call_desc.arg_reloc;
+                 memset (&last_call_desc, 0, sizeof (struct call_desc));
+                 continue;
+               }

 
 

+           /* Handle a 22 bit branch displacement.  */
+           case 'X':
+             the_insn.field_selector = pa_chk_field_selector (&s);
+             get_expression (s);
+             s = expr_end;
+             the_insn.pcrel = 1;
+             if (!the_insn.exp.X_add_symbol
+                 || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
+                             "L$0\001"))
+               {
+                 num = evaluate_absolute (&the_insn);
+                 if (num % 4)
+                   {
+                     as_bad (_("Branch to unaligned address"));
+                     break;
+                   }

                  if (the_insn.exp.X_add_symbol)
                    num -= 8;
                  if (the_insn.exp.X_add_symbol)
                    num -= 8;

-
-                 sign_unext (num >> 2, 17, &result);
-                 dis_assemble_17 (result, &w1, &w2, &w);
-                 INSERT_FIELD_AND_CONTINUE (opcode,
-                                          ((w2 << 2) | (w1 << 16) | w), 0);
+                 CHECK_FIELD (num, 8388607, -8388608, 0);
+                 opcode |= re_assemble_22 (num >> 2);

                }
              else
                {
                  the_insn.reloc = R_HPPA_PCREL_CALL;
                }
              else
                {
                  the_insn.reloc = R_HPPA_PCREL_CALL;

-                 the_insn.format = 17;
+                 the_insn.format = 22;

                  the_insn.arg_reloc = last_call_desc.arg_reloc;
                  memset (&last_call_desc, 0, sizeof (struct call_desc));
                  continue;
                  the_insn.arg_reloc = last_call_desc.arg_reloc;
                  memset (&last_call_desc, 0, sizeof (struct call_desc));
                  continue;


@@ -2409,23 +3341,17 @@ pa_ip (str)
                  || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
                              "L$0\001"))
                {
                  || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol),
                              "L$0\001"))
                {

-                 unsigned int w2, w1, w, result;
-

                  num = evaluate_absolute (&the_insn);
                  if (num % 4)
                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }
                  num = evaluate_absolute (&the_insn);
                  if (num % 4)
                    {
                      as_bad (_("Branch to unaligned address"));
                      break;
                    }

-                 CHECK_FIELD (num, 262143, -262144, 0);
-

                  if (the_insn.exp.X_add_symbol)
                    num -= 8;
                  if (the_insn.exp.X_add_symbol)
                    num -= 8;

-
-                 sign_unext (num >> 2, 17, &result);
-                 dis_assemble_17 (result, &w1, &w2, &w);
-                 INSERT_FIELD_AND_CONTINUE (opcode,
-                                          ((w2 << 2) | (w1 << 16) | w), 0);
+                 CHECK_FIELD (num, 262143, -262144, 0);
+                 opcode |= re_assemble_17 (num >> 2);
+                 continue;

                }
              else
                {
                }
              else
                {


@@ -2436,81 +3362,210 @@ pa_ip (str)
                  continue;
                }
 
                  continue;
                }
 

-           /* Handle a 5 bit shift count at 26.  */
-           case 'p':
-             num = pa_get_absolute_expression (&the_insn, &s);
-             s = expr_end;
-             CHECK_FIELD (num, 31, 0, 0);
-             INSERT_FIELD_AND_CONTINUE (opcode, 31 - num, 5);
+           /* Handle '%r1' implicit operand of addil instruction.  */
+           case 'Z':
+             if (*s == ',' && *(s + 1) == '%' && *(s + 3) == '1'
+                 && (*(s + 2) == 'r' || *(s + 2) == 'R'))
+               {
+                 s += 4;
+                 continue;
+               }
+             else
+               break;

 
 

-           /* Handle a 5 bit bit position at 26.  */
-           case 'P':
-             num = pa_get_absolute_expression (&the_insn, &s);
-             s = expr_end;
-             CHECK_FIELD (num, 31, 0, 0);
-             INSERT_FIELD_AND_CONTINUE (opcode, num, 5);
+           /* Handle '%sr0,%r31' implicit operand of be,l instruction.  */
+           case 'Y':
+             if (strncasecmp (s, "%sr0,%r31", 9) != 0)
+               break;
+             s += 9;
+             continue;

 
 

-           /* Handle a 5 bit immediate at 10.  */
-           case 'Q':
+           /* Handle immediate value of 0 for ordered load/store instructions.  */
+           case '@':
+             if (*s != '0')
+               break;
+             s++;
+             continue;

 
 

+           /* Handle a 2 bit shift count at 25.  */
+           case '.':

              num = pa_get_absolute_expression (&the_insn, &s);
              num = pa_get_absolute_expression (&the_insn, &s);

-             if (the_insn.exp.X_op != O_constant)
+             if (strict && the_insn.exp.X_op != O_constant)

                break;
              s = expr_end;
                break;
              s = expr_end;

-             CHECK_FIELD (num, 31, 0, 0);
-             INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
+             CHECK_FIELD (num, 3, 1, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 6);

 
 

-           /* Handle a 13 bit immediate at 18.  */
-           case 'A':
+           /* Handle a 4 bit shift count at 25.  */
+           case '*':

              num = pa_get_absolute_expression (&the_insn, &s);
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 8191, 0, 0);
-             INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
+             CHECK_FIELD (num, 15, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 6);

 
 

-           /* Handle a 26 bit immediate at 31.  */
-           case 'D':
+           /* Handle a 5 bit shift count at 26.  */
+           case 'p':

              num = pa_get_absolute_expression (&the_insn, &s);
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 671108864, 0, 0);
-             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+             CHECK_FIELD (num, 31, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, 31 - num, 5);
+
+           /* Handle a 6 bit shift count at 20,22:26.  */
+           case '~':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 63, 0, strict);
+             num = 63 - num;
+             opcode |= (num & 0x20) << 6;
+             INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 5);
+
+           /* Handle a 6 bit field length at 23,27:31.  */
+           case '%':
+             flag = 0;
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 64, 1, strict);
+             num--;
+             opcode |= (num & 0x20) << 3;
+             num = 31 - (num & 0x1f);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+
+           /* Handle a 6 bit field length at 19,27:31.  */
+           case '|':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 64, 1, strict);
+             num--;
+             opcode |= (num & 0x20) << 7;
+             num = 31 - (num & 0x1f);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+
+           /* Handle a 5 bit bit position at 26.  */
+           case 'P':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 31, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 5);
+
+           /* Handle a 6 bit bit position at 20,22:26.  */
+           case 'q':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 63, 0, strict);
+             opcode |= (num & 0x20) << 6;
+             INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 5);
+
+           /* Handle a 5 bit immediate at 10 with 'd' as the complement
+              of the high bit of the immediate.  */
+           case 'B':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 63, 0, strict);
+             if (num & 0x20)
+               ;
+             else
+               opcode |= (1 << 13);
+             INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 21);
+
+           /* Handle a 5 bit immediate at 10.  */
+           case 'Q':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 31, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
+
+           /* Handle a 9 bit immediate at 28.  */
+           case '$':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 511, 1, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 3);
+
+           /* Handle a 13 bit immediate at 18.  */
+           case 'A':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 8191, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 13);
+
+           /* Handle a 26 bit immediate at 31.  */
+           case 'D':
+             num = pa_get_absolute_expression (&the_insn, &s);
+             if (strict && the_insn.exp.X_op != O_constant)
+               break;
+             s = expr_end;
+             CHECK_FIELD (num, 67108863, 0, strict);
+             INSERT_FIELD_AND_CONTINUE (opcode, num, 0);

 
            /* Handle a 3 bit SFU identifier at 25.  */
 
            /* Handle a 3 bit SFU identifier at 25.  */

-           case 'f':
+           case 'v':

              if (*s++ != ',')
                as_bad (_("Invalid SFU identifier"));
              num = pa_get_absolute_expression (&the_insn, &s);
              if (*s++ != ',')
                as_bad (_("Invalid SFU identifier"));
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 7, 0, 0);
+             CHECK_FIELD (num, 7, 0, strict);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 6);
 
            /* Handle a 20 bit SOP field for spop0.  */
            case 'O':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 6);
 
            /* Handle a 20 bit SOP field for spop0.  */
            case 'O':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 1048575, 0, 0);
+             CHECK_FIELD (num, 1048575, 0, strict);

              num = (num & 0x1f) | ((num & 0x000fffe0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle a 15bit SOP field for spop1.  */
            case 'o':
              num = pa_get_absolute_expression (&the_insn, &s);
              num = (num & 0x1f) | ((num & 0x000fffe0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle a 15bit SOP field for spop1.  */
            case 'o':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 32767, 0, 0);
+             CHECK_FIELD (num, 32767, 0, strict);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 11);
 
            /* Handle a 10bit SOP field for spop3.  */
            case '0':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 11);
 
            /* Handle a 10bit SOP field for spop3.  */
            case '0':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 1023, 0, 0);
+             CHECK_FIELD (num, 1023, 0, strict);

              num = (num & 0x1f) | ((num & 0x000003e0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle a 15 bit SOP field for spop2.  */
            case '1':
              num = pa_get_absolute_expression (&the_insn, &s);
              num = (num & 0x1f) | ((num & 0x000003e0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
            /* Handle a 15 bit SOP field for spop2.  */
            case '1':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 32767, 0, 0);
+             CHECK_FIELD (num, 32767, 0, strict);

              num = (num & 0x1f) | ((num & 0x00007fe0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
              num = (num & 0x1f) | ((num & 0x00007fe0) << 6);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 


@@ -2519,18 +3574,97 @@ pa_ip (str)
              if (*s++ != ',')
                as_bad (_("Invalid COPR identifier"));
              num = pa_get_absolute_expression (&the_insn, &s);
              if (*s++ != ',')
                as_bad (_("Invalid COPR identifier"));
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 7, 0, 0);
+             CHECK_FIELD (num, 7, 0, strict);

              INSERT_FIELD_AND_CONTINUE (opcode, num, 6);
 
            /* Handle a 22bit SOP field for copr.  */
            case '2':
              num = pa_get_absolute_expression (&the_insn, &s);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 6);
 
            /* Handle a 22bit SOP field for copr.  */
            case '2':
              num = pa_get_absolute_expression (&the_insn, &s);

+             if (strict && the_insn.exp.X_op != O_constant)
+               break;

              s = expr_end;
              s = expr_end;

-             CHECK_FIELD (num, 4194303, 0, 0);
+             CHECK_FIELD (num, 4194303, 0, strict);

              num = (num & 0x1f) | ((num & 0x003fffe0) << 4);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 
              num = (num & 0x1f) | ((num & 0x003fffe0) << 4);
              INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
 

+           /* Handle a source FP operand format completer.  */
+           case '{':
+             if (*s == ',' && *(s+1) == 't')
+               {
+                 the_insn.trunc = 1;
+                 s += 2;
+               }
+             else
+               the_insn.trunc = 0;
+             flag = pa_parse_fp_cnv_format (&s);
+             the_insn.fpof1 = flag;
+             if (flag == W || flag == UW)
+               flag = SGL;
+             if (flag == DW || flag == UDW)
+               flag = DBL;
+             if (flag == QW || flag == UQW)
+               flag = QUAD;
+             INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);
+
+           /* Handle a destination FP operand format completer.  */
+           case '_':
+             /* pa_parse_format needs the ',' prefix.  */
+             s--;
+             flag = pa_parse_fp_cnv_format (&s);
+             the_insn.fpof2 = flag;
+             if (flag == W || flag == UW)
+               flag = SGL;
+             if (flag == DW || flag == UDW)
+               flag = DBL;
+             if (flag == QW || flag == UQW)
+               flag = QUAD;
+             opcode |= flag << 13;
+             if (the_insn.fpof1 == SGL
+                 || the_insn.fpof1 == DBL
+                 || the_insn.fpof1 == QUAD)
+               {
+                 if (the_insn.fpof2 == SGL
+                     || the_insn.fpof2 == DBL
+                     || the_insn.fpof2 == QUAD)
+                   flag = 0;
+                 else if (the_insn.fpof2 == W
+                     || the_insn.fpof2 == DW
+                     || the_insn.fpof2 == QW)
+                   flag = 2;
+                 else if (the_insn.fpof2 == UW
+                     || the_insn.fpof2 == UDW
+                     || the_insn.fpof2 == UQW)
+                   flag = 6;
+                 else
+                   abort ();
+               }
+             else if (the_insn.fpof1 == W
+                      || the_insn.fpof1 == DW
+                      || the_insn.fpof1 == QW)
+               {
+                 if (the_insn.fpof2 == SGL
+                     || the_insn.fpof2 == DBL
+                     || the_insn.fpof2 == QUAD)
+                   flag = 1;
+                 else
+                   abort ();
+               }
+             else if (the_insn.fpof1 == UW
+                      || the_insn.fpof1 == UDW
+                      || the_insn.fpof1 == UQW)
+               {
+                 if (the_insn.fpof2 == SGL
+                     || the_insn.fpof2 == DBL
+                     || the_insn.fpof2 == QUAD)
+                   flag = 5;
+                 else
+                   abort ();
+               }
+             flag |= the_insn.trunc;
+             INSERT_FIELD_AND_CONTINUE (opcode, flag, 15);

 
            /* Handle a source FP operand format completer.  */
            case 'F':
 
            /* Handle a source FP operand format completer.  */
            case 'F':


@@ -2546,227 +3680,259 @@ pa_ip (str)
              the_insn.fpof2 = flag;
              INSERT_FIELD_AND_CONTINUE (opcode, flag, 13);
 
              the_insn.fpof2 = flag;
              INSERT_FIELD_AND_CONTINUE (opcode, flag, 13);
 

-           /* Handle L/R register halves like 't'.  */
-           case 'v':
-             {
-               struct pa_11_fp_reg_struct result;
-
-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= result.number_part;
+           /* Handle a source FP operand format completer at 20.  */
+           case 'I':
+             flag = pa_parse_fp_format (&s);
+             the_insn.fpof1 = flag;
+             INSERT_FIELD_AND_CONTINUE (opcode, flag, 11);

 
 

-               /* 0x30 opcodes are FP arithmetic operation opcodes
-                  and need to be turned into 0x38 opcodes.  This
-                  is not necessary for loads/stores.  */
-               if (need_pa11_opcode (&the_insn, &result)
-                   && ((opcode & 0xfc000000) == 0x30000000))
-                 opcode |= 1 << 27;
+           /* Handle a floating point operand format at 26.
+              Only allows single and double precision.  */
+           case 'H':
+             flag = pa_parse_fp_format (&s);
+             switch (flag)
+               {
+               case SGL:
+                 opcode |= 0x20;
+               case DBL:
+                 the_insn.fpof1 = flag;
+                 continue;

 
 

-               INSERT_FIELD_AND_CONTINUE (opcode, result.l_r_select & 1, 6);
-             }
+               case QUAD:
+               case ILLEGAL_FMT:
+               default:
+                 as_bad (_("Invalid Floating Point Operand Format."));
+               }
+             break;

 
 

-           /* Handle L/R register halves like 'b'.  */
-           case 'E':
-             {
-               struct pa_11_fp_reg_struct result;
+           /* Handle all floating point registers.  */
+           case 'f':
+             switch (*++args)
+               {
+               /* Float target register.  */
+               case 't':
+                 if (!pa_parse_number (&s, 3))
+                   break;
+                 num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                 CHECK_FIELD (num, 31, 0, 0);
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 0);

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= result.number_part << 21;
-               if (need_pa11_opcode (&the_insn, &result))
+               /* Float target register with L/R selection.  */
+               case 'T':

                  {
                  {

-                   opcode |= (result.l_r_select & 1) << 7;
-                   opcode |= 1 << 27;
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num;
+
+                   /* 0x30 opcodes are FP arithmetic operation opcodes
+                      and need to be turned into 0x38 opcodes.  This
+                      is not necessary for loads/stores.  */
+                   if (need_pa11_opcode ()
+                       && ((opcode & 0xfc000000) == 0x30000000))
+                     opcode |= 1 << 27;
+
+                   opcode |= (pa_number & FP_REG_RSEL ? 1 << 6 : 0);
+                   continue;

                  }
                  }

-               continue;
-             }
-
-           /* Float operand 1 similar to 'b' but with l/r registers.  */
-           case 'J':
-             {
-               struct pa_11_fp_reg_struct result;
-
-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= result.number_part << 21;
-               opcode |= (result.l_r_select & 1) << 7;
-               continue;
-             }
-
-           /* Handle L/R register halves like 'b'.  */
-           case '3':
-             {
-               struct pa_11_fp_reg_struct result;
-               int regnum;
-
-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= (result.number_part & 0x1c) << 11;
-               opcode |= (result.number_part & 0x3) << 9;
-               opcode |= (result.l_r_select & 1) << 8;
-               continue;
-             }

 
 

-           /* Handle L/R register halves like 'x'.  */
-           case 'e':
-             {
-               struct pa_11_fp_reg_struct result;
-
-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= (result.number_part & 0x1f) << 16;
-               if (need_pa11_opcode (&the_insn, &result))
+               /* Float operand 1.  */
+               case 'a':

                  {
                  {

-                   opcode |= (result.l_r_select & 1) << 1;
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num << 21;
+                   if (need_pa11_opcode ())
+                     {
+                       opcode |= (pa_number & FP_REG_RSEL ? 1 << 7 : 0);
+                       opcode |= 1 << 27;
+                     }
+                   continue;

                  }
                  }

-               continue;
-             }
-
-           /* Handle L/R register halves like 'x'.  */
-           case 'X':
-             {
-               struct pa_11_fp_reg_struct result;

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= (result.number_part & 0x1f) << 16;
-               if (need_pa11_opcode (&the_insn, &result))
+               /* Float operand 1 with L/R selection.  */
+               case 'X':
+               case 'A':

                  {
                  {

-                   opcode |= (result.l_r_select & 1) << 12;
-                   opcode |= 1 << 27;
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num << 21;
+                   opcode |= (pa_number & FP_REG_RSEL ? 1 << 7 : 0);
+                   continue;

                  }
                  }

-               continue;
-             }
-
-           /* Float operand 2, like 'x' but with l/r register halves.  */
-           case 'K':
-             {
-               struct pa_11_fp_reg_struct result;

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               opcode |= (result.number_part & 0x1f) << 16;
-               opcode |= (result.l_r_select & 1) << 12;
-               continue;
-             }
-
-           /* Handle a 5 bit register field at 10.  */
-           case '4':
-             {
-               struct pa_11_fp_reg_struct result;
-
-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               if (the_insn.fpof1 == SGL)
+               /* Float operand 2.  */
+               case 'b':

                  {
                  {

-                   if (result.number_part < 16)
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num << 16;
+                   if (need_pa11_opcode ())

                      {
                      {

-                       as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
-                       break;
+                       opcode |= (pa_number & FP_REG_RSEL ? 1 << 12 : 0);
+                       opcode |= 1 << 27;

                      }
                      }

+                   continue;
+                 }

 
 

-                   result.number_part &= 0xF;
-                   result.number_part |= (result.l_r_select & 1) << 4;
+               /* Float operand 2 with L/R selection.  */
+               case 'B':
+                 {
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num << 16;
+                   opcode |= (pa_number & FP_REG_RSEL ? 1 << 12 : 0);
+                   continue;

                  }
                  }

-               INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 21);
-             }

 
 

-           /* Handle a 5 bit register field at 15.  */
-           case '6':
-             {
-               struct pa_11_fp_reg_struct result;
+               /* Float operand 3 for fmpyfadd, fmpynfadd.  */
+               case 'C':
+                 {
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= (num & 0x1c) << 11;
+                   opcode |= (num & 0x03) << 9;
+                   opcode |= (pa_number & FP_REG_RSEL ? 1 << 8 : 0);
+                   continue;
+                 }

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               if (the_insn.fpof1 == SGL)
+               /* Float mult operand 1 for fmpyadd, fmpysub */
+               case 'i':

                  {
                  {

-                   if (result.number_part < 16)
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   if (the_insn.fpof1 == SGL)

                      {
                      {

-                       as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
-                       break;
+                       if (num < 16)
+                         {
+                           as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
+                           break;
+                         }
+                       num &= 0xF;
+                       num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0);

                      }
                      }

-                   result.number_part &= 0xF;
-                   result.number_part |= (result.l_r_select & 1) << 4;
+                   INSERT_FIELD_AND_CONTINUE (opcode, num, 21);

                  }
                  }

-               INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 16);
-             }
-
-           /* Handle a 5 bit register field at 31.  */
-           case '7':
-             {
-               struct pa_11_fp_reg_struct result;

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               if (the_insn.fpof1 == SGL)
+               /* Float mult operand 2 for fmpyadd, fmpysub */
+               case 'j':

                  {
                  {

-                   if (result.number_part < 16)
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   if (the_insn.fpof1 == SGL)

                      {
                      {

-                       as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
-                       break;
+                       if (num < 16)
+                         {
+                           as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
+                           break;
+                         }
+                       num &= 0xF;
+                       num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0);

                      }
                      }

-                   result.number_part &= 0xF;
-                   result.number_part |= (result.l_r_select & 1) << 4;
+                   INSERT_FIELD_AND_CONTINUE (opcode, num, 16);

                  }
                  }

-               INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 0);
-             }

 
 

-           /* Handle a 5 bit register field at 20.  */
-           case '8':
-             {
-               struct pa_11_fp_reg_struct result;
+               /* Float mult target for fmpyadd, fmpysub */
+               case 'k':
+                 {
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   if (the_insn.fpof1 == SGL)
+                     {
+                       if (num < 16)
+                         {
+                           as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
+                           break;
+                         }
+                       num &= 0xF;
+                       num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0);
+                     }
+                   INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+                 }

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               if (the_insn.fpof1 == SGL)
+               /* Float add operand 1 for fmpyadd, fmpysub */
+               case 'l':

                  {
                  {

-                   if (result.number_part < 16)
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   if (the_insn.fpof1 == SGL)

                      {
                      {

-                       as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
-                       break;
+                       if (num < 16)
+                         {
+                           as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
+                           break;
+                         }
+                       num &= 0xF;
+                       num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0);

                      }
                      }

-                   result.number_part &= 0xF;
-                   result.number_part |= (result.l_r_select & 1) << 4;
+                   INSERT_FIELD_AND_CONTINUE (opcode, num, 6);

                  }
                  }

-               INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 11);
-             }

 
 

-           /* Handle a 5 bit register field at 25.  */
-           case '9':
-             {
-               struct pa_11_fp_reg_struct result;
+               /* Float add target for fmpyadd, fmpysub */
+               case 'm':
+                 {
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   if (the_insn.fpof1 == SGL)
+                     {
+                       if (num < 16)
+                         {
+                           as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
+                           break;
+                         }
+                       num &= 0xF;
+                       num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0);
+                     }
+                   INSERT_FIELD_AND_CONTINUE (opcode, num, 11);
+                 }

 
 

-               pa_parse_number (&s, &result);
-               CHECK_FIELD (result.number_part, 31, 0, 0);
-               if (the_insn.fpof1 == SGL)
+               /* Handle L/R register halves like 'x'.  */
+               case 'E':
+               case 'e':

                  {
                  {

-                   if (result.number_part < 16)
+                   if (!pa_parse_number (&s, 1))
+                     break;
+                   num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                   CHECK_FIELD (num, 31, 0, 0);
+                   opcode |= num << 16;
+                   if (need_pa11_opcode ())

                      {
                      {

-                       as_bad  (_("Invalid register for single precision fmpyadd or fmpysub"));
-                       break;
+                       opcode |= (pa_number & FP_REG_RSEL ? 1 << 1 : 0);

                      }
                      }

-                   result.number_part &= 0xF;
-                   result.number_part |= (result.l_r_select & 1) << 4;
+                   continue;

                  }
                  }

-               INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 6);
-             }

 
 

-           /* Handle a floating point operand format at 26.
-              Only allows single and double precision.  */
-           case 'H':
-             flag = pa_parse_fp_format (&s);
-             switch (flag)
-               {
-               case SGL:
-                 opcode |= 0x20;
-               case DBL:
-                 the_insn.fpof1 = flag;
-                 continue;
+               /* Float target register (PA 2.0 wide).  */
+               case 'x':
+                 if (!pa_parse_number (&s, 3))
+                   break;
+                 num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE;
+                 CHECK_FIELD (num, 31, 0, 0);
+                 INSERT_FIELD_AND_CONTINUE (opcode, num, 16);

 
 

-               case QUAD:
-               case ILLEGAL_FMT:

                default:
                default:

-                 as_bad (_("Invalid Floating Point Operand Format."));
+                 abort ();

                }
              break;
 
                }
              break;
 


@@ -2880,16 +4046,17 @@ tc_gen_reloc (section, fixp)
 {
   arelent *reloc;
   struct hppa_fix_struct *hppa_fixp;
 {
   arelent *reloc;
   struct hppa_fix_struct *hppa_fixp;

-  bfd_reloc_code_real_type code;

   static arelent *no_relocs = NULL;
   arelent **relocs;
   static arelent *no_relocs = NULL;
   arelent **relocs;

-  bfd_reloc_code_real_type **codes;
+  reloc_type **codes;
+  reloc_type code;

   int n_relocs;
   int i;
 
   hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
   if (fixp->fx_addsy == 0)
     return &no_relocs;
   int n_relocs;
   int i;
 
   hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
   if (fixp->fx_addsy == 0)
     return &no_relocs;

+

   assert (hppa_fixp != 0);
   assert (section != 0);
 
   assert (hppa_fixp != 0);
   assert (section != 0);
 


@@ -2897,7 +4064,7 @@ tc_gen_reloc (section, fixp)
 
   reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
 
   reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);

-  codes = (bfd_reloc_code_real_type **) hppa_gen_reloc_type (stdoutput,
+  codes = hppa_gen_reloc_type (stdoutput,

                               fixp->fx_r_type,
                               hppa_fixp->fx_r_format,
                               hppa_fixp->fx_r_field,
                               fixp->fx_r_type,
                               hppa_fixp->fx_r_format,
                               hppa_fixp->fx_r_field,


@@ -2905,7 +4072,10 @@ tc_gen_reloc (section, fixp)
                               symbol_get_bfdsym (fixp->fx_addsy));
 
   if (codes == NULL)
                               symbol_get_bfdsym (fixp->fx_addsy));
 
   if (codes == NULL)

-    abort ();
+    {
+      as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup"));
+      abort ();
+    }

 
   for (n_relocs = 0; codes[n_relocs]; n_relocs++)
     ;
 
   for (n_relocs = 0; codes[n_relocs]; n_relocs++)
     ;


@@ -2925,14 +4095,6 @@ tc_gen_reloc (section, fixp)
 
       code = *codes[0];
 
 
       code = *codes[0];
 

-      reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
-      *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
-      reloc->howto = bfd_reloc_type_lookup (stdoutput, code);
-      reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
-      reloc->addend = 0;       /* default */
-
-      assert (reloc->howto && code == reloc->howto->type);
-

       /* Now, do any processing that is dependent on the relocation type.  */
       switch (code)
        {
       /* Now, do any processing that is dependent on the relocation type.  */
       switch (code)
        {


@@ -2944,9 +4106,8 @@ tc_gen_reloc (section, fixp)
        case R_PARISC_PLABEL14R:
          /* For plabel relocations, the addend of the
             relocation should be either 0 (no static link) or 2
        case R_PARISC_PLABEL14R:
          /* For plabel relocations, the addend of the
             relocation should be either 0 (no static link) or 2

-            (static link required).
-
-            FIXME: We always assume no static link!
+            (static link required).  This adjustment is done in
+            bfd/elf32-hppa.c:elf32_hppa_relocate_section.

 
             We also slam a zero addend into the DLT relative relocs;
             it doesn't make a lot of sense to use any addend since
 
             We also slam a zero addend into the DLT relative relocs;
             it doesn't make a lot of sense to use any addend since


@@ -2954,19 +4115,37 @@ tc_gen_reloc (section, fixp)
          reloc->addend = 0;
          break;
 
          reloc->addend = 0;
          break;
 

-       case R_PARISC_PCREL21L:
+#ifdef ELF_ARG_RELOC

        case R_PARISC_PCREL17R:
        case R_PARISC_PCREL17F:
        case R_PARISC_PCREL17C:
        case R_PARISC_PCREL17R:
        case R_PARISC_PCREL17F:
        case R_PARISC_PCREL17C:

-       case R_PARISC_PCREL14R:
-       case R_PARISC_PCREL14F:
-         /* The constant is stored in the instruction.  */
-         reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0);
+       case R_PARISC_DIR17R:
+       case R_PARISC_DIR17F:
+       case R_PARISC_PCREL21L:
+       case R_PARISC_DIR21L:
+         reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc,
+                                        fixp->fx_offset);

          break;
          break;

+#endif
+
+       case R_PARISC_DIR32:
+         /* Facilitate hand-crafted unwind info.  */
+         if (strcmp (section->name, UNWIND_SECTION_NAME) == 0)
+           code = R_PARISC_SEGREL32;
+         /* Fall thru */
+

        default:
          reloc->addend = fixp->fx_offset;
          break;
        }
        default:
          reloc->addend = fixp->fx_offset;
          break;
        }

+
+      reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+      *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
+      reloc->howto = bfd_reloc_type_lookup (stdoutput,
+                                           (bfd_reloc_code_real_type) code);
+      reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
+
+      assert (reloc->howto && (unsigned int) code == reloc->howto->type);

       break;
     }
 #else /* OBJ_SOM */
       break;
     }
 #else /* OBJ_SOM */


@@ -2978,7 +4157,9 @@ tc_gen_reloc (section, fixp)
 
       relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
       *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
 
       relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
       *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);

-      relocs[i]->howto = bfd_reloc_type_lookup (stdoutput, code);
+      relocs[i]->howto =
+       bfd_reloc_type_lookup (stdoutput,
+                              (bfd_reloc_code_real_type) code);

       relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where;
 
       switch (code)
       relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where;
 
       switch (code)


@@ -2989,25 +4170,35 @@ tc_gen_reloc (section, fixp)
             relocs now and break out of the loop.  */
          assert (i == 1);
          relocs[0]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
             relocs now and break out of the loop.  */
          assert (i == 1);
          relocs[0]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);

-         relocs[0]->howto = bfd_reloc_type_lookup (stdoutput, *codes[0]);
+         relocs[0]->howto =
+           bfd_reloc_type_lookup (stdoutput,
+                                  (bfd_reloc_code_real_type) *codes[0]);

          relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[0]->addend = 0;
          relocs[1]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
          *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
          relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[0]->addend = 0;
          relocs[1]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
          *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);

-         relocs[1]->howto = bfd_reloc_type_lookup (stdoutput, *codes[1]);
+         relocs[1]->howto =
+           bfd_reloc_type_lookup (stdoutput,
+                                  (bfd_reloc_code_real_type) *codes[1]);

          relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[1]->addend = 0;
          relocs[2]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
          *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy);
          relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[1]->addend = 0;
          relocs[2]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
          *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy);

-         relocs[2]->howto = bfd_reloc_type_lookup (stdoutput, *codes[2]);
+         relocs[2]->howto =
+           bfd_reloc_type_lookup (stdoutput,
+                                  (bfd_reloc_code_real_type) *codes[2]);

          relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[2]->addend = 0;
          relocs[3]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
          relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[2]->addend = 0;
          relocs[3]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);

-         relocs[3]->howto = bfd_reloc_type_lookup (stdoutput, *codes[3]);
+         relocs[3]->howto =
+           bfd_reloc_type_lookup (stdoutput,
+                                  (bfd_reloc_code_real_type) *codes[3]);

          relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[3]->addend = 0;
          relocs[4]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
          relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[3]->addend = 0;
          relocs[4]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);

-         relocs[4]->howto = bfd_reloc_type_lookup (stdoutput, *codes[4]);
+         relocs[4]->howto =
+           bfd_reloc_type_lookup (stdoutput,
+                                  (bfd_reloc_code_real_type) *codes[4]);

          relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[4]->addend = 0;
          goto done;
          relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where;
          relocs[4]->addend = 0;
          goto done;


@@ -3073,8 +4264,8 @@ tc_gen_reloc (section, fixp)
 
 void
 md_convert_frag (abfd, sec, fragP)
 
 void
 md_convert_frag (abfd, sec, fragP)

-     register bfd *abfd;
-     register asection *sec;
+     register bfd *abfd ATTRIBUTE_UNUSED;
+     register asection *sec ATTRIBUTE_UNUSED;

      register fragS *fragP;
 {
   unsigned int address;
      register fragS *fragP;
 {
   unsigned int address;


@@ -3102,7 +4293,7 @@ md_convert_frag (abfd, sec, fragP)
     }
 }
 
     }
 }
 

-/* Round up a section size to the appropriate boundary. */
+/* Round up a section size to the appropriate boundary.  */

 
 valueT
 md_section_align (segment, size)
 
 valueT
 md_section_align (segment, size)


@@ -3119,7 +4310,7 @@ md_section_align (segment, size)
 int
 md_estimate_size_before_relax (fragP, segment)
      register fragS *fragP;
 int
 md_estimate_size_before_relax (fragP, segment)
      register fragS *fragP;

-     asection *segment;
+     asection *segment ATTRIBUTE_UNUSED;

 {
   int size;
 
 {
   int size;
 


@@ -3131,35 +4322,85 @@ md_estimate_size_before_relax (fragP, segment)
   return size;
 }
 \f
   return size;
 }
 \f

-CONST char *md_shortopts = "";
+#ifdef OBJ_ELF
+# ifdef WARN_COMMENTS
+const char *md_shortopts = "Vc";
+# else
+const char *md_shortopts = "V";
+# endif
+#else
+# ifdef WARN_COMMENTS
+const char *md_shortopts = "c";
+# else
+const char *md_shortopts = "";
+# endif
+#endif
+

 struct option md_longopts[] = {
 struct option md_longopts[] = {

+#ifdef WARN_COMMENTS
+  {"warn-comment", no_argument, NULL, 'c'},
+#endif

   {NULL, no_argument, NULL, 0}
 };
   {NULL, no_argument, NULL, 0}
 };

-size_t md_longopts_size = sizeof(md_longopts);
+size_t md_longopts_size = sizeof (md_longopts);

 
 int
 md_parse_option (c, arg)
 
 int
 md_parse_option (c, arg)

-     int c;
-     char *arg;
+     int c ATTRIBUTE_UNUSED;
+     char *arg ATTRIBUTE_UNUSED;

 {
 {

-  return 0;
+  switch (c)
+    {
+    default:
+      return 0;
+
+#ifdef OBJ_ELF
+    case 'V':
+      print_version_id ();
+      break;
+#endif
+#ifdef WARN_COMMENTS
+    case 'c':
+      warn_comment = 1;
+      break;
+#endif
+    }
+
+  return 1;

 }
 
 void
 md_show_usage (stream)
 }
 
 void
 md_show_usage (stream)

-     FILE *stream;
+     FILE *stream ATTRIBUTE_UNUSED;

 {
 {

+#ifdef OBJ_ELF
+  fprintf (stream, _("\
+  -Q                      ignored\n"));
+#endif
+#ifdef WARN_COMMENTS
+  fprintf (stream, _("\
+  -c                      print a warning if a comment is found\n"));
+#endif

 }
 \f
 /* We have no need to default values of symbols.  */
 
 symbolS *
 md_undefined_symbol (name)
 }
 \f
 /* We have no need to default values of symbols.  */
 
 symbolS *
 md_undefined_symbol (name)

-     char *name;
+     char *name ATTRIBUTE_UNUSED;

 {
   return 0;
 }
 
 {
   return 0;
 }
 

+#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC)
+#define nonzero_dibits(x) \
+  ((x) | (((x) & 0x55555555) << 1) | (((x) & 0xAAAAAAAA) >> 1))
+#define arg_reloc_stub_needed(CALLER, CALLEE) \
+  (((CALLER) ^ (CALLEE)) & nonzero_dibits (CALLER) & nonzero_dibits (CALLEE))
+#else
+#define arg_reloc_stub_needed(CALLER, CALLEE) 0
+#endif
+

 /* Apply a fixup to an instruction.  */
 
 int
 /* Apply a fixup to an instruction.  */
 
 int


@@ -3167,12 +4408,11 @@ md_apply_fix (fixP, valp)
      fixS *fixP;
      valueT *valp;
 {
      fixS *fixP;
      valueT *valp;
 {

-  char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
+  unsigned char *buf;

   struct hppa_fix_struct *hppa_fixP;
   struct hppa_fix_struct *hppa_fixP;

-  long new_val, result = 0;
-  unsigned int w1, w2, w, resulti;
+  offsetT new_val;
+  int insn, val, fmt;

 
 

-  hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data;

   /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can
      never be "applied" (they are just markers).  Likewise for
      R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB.  */
   /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can
      never be "applied" (they are just markers).  Likewise for
      R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB.  */


@@ -3193,160 +4433,203 @@ md_apply_fix (fixP, valp)
       return 1;
     }
 #endif
       return 1;
     }
 #endif

+#ifdef OBJ_ELF
+  if (fixP->fx_r_type == (int) R_PARISC_GNU_VTENTRY
+      || fixP->fx_r_type == (int) R_PARISC_GNU_VTINHERIT)
+    return 1;
+#endif

 
   /* There should have been an HPPA specific fixup associated
      with the GAS fixup.  */
 
   /* There should have been an HPPA specific fixup associated
      with the GAS fixup.  */

-  if (hppa_fixP)
+  hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data;
+  if (hppa_fixP == NULL)

     {
     {

-      unsigned long buf_wd = bfd_get_32 (stdoutput, buf);
-      unsigned char fmt = bfd_hppa_insn2fmt (buf_wd);
-
-      /* If there is a symbol associated with this fixup, then it's something
-        which will need a SOM relocation (except for some PC-relative relocs).
-        In such cases we should treat the "val" or "addend" as zero since it
-        will be added in as needed from fx_offset in tc_gen_reloc.  */
-      if ((fixP->fx_addsy != NULL
-          || fixP->fx_r_type == R_HPPA_NONE)
+      as_bad_where (fixP->fx_file, fixP->fx_line,
+                   _("no hppa_fixup entry for fixup type 0x%x"),
+                   fixP->fx_r_type);
+      return 0;
+    }
+
+  buf = fixP->fx_frag->fr_literal + fixP->fx_where;
+  insn = bfd_get_32 (stdoutput, buf);
+  fmt = bfd_hppa_insn2fmt (stdoutput, insn);
+
+  /* If there is a symbol associated with this fixup, then it's something
+     which will need a SOM relocation (except for some PC-relative relocs).
+     In such cases we should treat the "val" or "addend" as zero since it
+     will be added in as needed from fx_offset in tc_gen_reloc.  */
+  if ((fixP->fx_addsy != NULL
+       || fixP->fx_r_type == (int) R_HPPA_NONE)

 #ifdef OBJ_SOM
 #ifdef OBJ_SOM

-         && fmt != 32
+      && fmt != 32

 #endif
 #endif

-         )
-       new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0);
+      )
+    new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0);

 #ifdef OBJ_SOM
 #ifdef OBJ_SOM

-      /* These field selectors imply that we do not want an addend.  */
-      else if (hppa_fixP->fx_r_field == e_psel
-              || hppa_fixP->fx_r_field == e_rpsel
-              || hppa_fixP->fx_r_field == e_lpsel
-              || hppa_fixP->fx_r_field == e_tsel
-              || hppa_fixP->fx_r_field == e_rtsel
-              || hppa_fixP->fx_r_field == e_ltsel)
-       new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0);
-      /* This is truely disgusting.  The machine independent code blindly
-        adds in the value of the symbol being relocated against.  Damn!  */
-      else if (fmt == 32
-              && fixP->fx_addsy != NULL
-              && S_GET_SEGMENT (fixP->fx_addsy) != bfd_com_section_ptr)
-       new_val = hppa_field_adjust (*valp - S_GET_VALUE (fixP->fx_addsy),
-                                    0, hppa_fixP->fx_r_field);
+  /* These field selectors imply that we do not want an addend.  */
+  else if (hppa_fixP->fx_r_field == e_psel
+          || hppa_fixP->fx_r_field == e_rpsel
+          || hppa_fixP->fx_r_field == e_lpsel
+          || hppa_fixP->fx_r_field == e_tsel
+          || hppa_fixP->fx_r_field == e_rtsel
+          || hppa_fixP->fx_r_field == e_ltsel)
+    new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0);
+  /* This is truly disgusting.  The machine independent code blindly
+     adds in the value of the symbol being relocated against.  Damn!  */
+  else if (fmt == 32
+          && fixP->fx_addsy != NULL
+          && S_GET_SEGMENT (fixP->fx_addsy) != bfd_com_section_ptr)
+    new_val = hppa_field_adjust (*valp - S_GET_VALUE (fixP->fx_addsy),
+                                0, hppa_fixP->fx_r_field);
+#endif
+  else
+    new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field);
+
+  /* Handle pc-relative exceptions from above.  */
+  if ((fmt == 12 || fmt == 17 || fmt == 22)
+      && fixP->fx_addsy
+      && fixP->fx_pcrel
+      && !arg_reloc_stub_needed (symbol_arg_reloc_info (fixP->fx_addsy),
+                                hppa_fixP->fx_arg_reloc)
+#ifdef OBJ_ELF
+      && (*valp - 8 + 8192 < 16384
+         || (fmt == 17 && *valp - 8 + 262144 < 524288)
+         || (fmt == 22 && *valp - 8 + 8388608 < 16777216))

 #endif
 #endif

-      else
-       new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field);
-
-      /* Handle pc-relative exceptions from above.  */
-#define arg_reloc_stub_needed(CALLER, CALLEE) \
-  ((CALLEE) && (CALLER) && ((CALLEE) != (CALLER)))
-      if ((fmt == 12 || fmt == 17 || fmt == 22)
-         && fixP->fx_addsy
-         && fixP->fx_pcrel

 #ifdef OBJ_SOM
 #ifdef OBJ_SOM

-         && !arg_reloc_stub_needed ((long) ((obj_symbol_type *)
-               symbol_get_bfdsym (fixP->fx_addsy))->tc_data.ap.hppa_arg_reloc,
-               hppa_fixP->fx_arg_reloc)
+      && (*valp - 8 + 262144 < 524288
+         || (fmt == 22 && *valp - 8 + 8388608 < 16777216))

 #endif
 #endif

-         && (((int)(*valp) > -262144 && (int)(*valp) < 262143) && fmt != 22)
-         && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment
-         && !(fixP->fx_subsy
-              && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment))
-             
-       new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field);
-#undef arg_reloc_stub_needed
-       
-      switch (fmt)
-       {
-       /* Handle all opcodes with the 'j' operand type.  */
-       case 14:
-         CHECK_FIELD (new_val, 8191, -8192, 0);
-
-         /* Mask off 14 bits to be changed.  */
-         bfd_put_32 (stdoutput,
-                     bfd_get_32 (stdoutput, buf) & 0xffffc000,
-                     buf);
-         low_sign_unext (new_val, 14, &resulti);
-         result = resulti;
-         break;
+      && !S_IS_EXTERNAL (fixP->fx_addsy)
+      && !S_IS_WEAK (fixP->fx_addsy)
+      && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment
+      && !(fixP->fx_subsy
+          && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment))
+    {
+      new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field);
+    }

 
 

-       /* Handle all opcodes with the 'k' operand type.  */
-       case 21:
-         CHECK_FIELD (new_val, 2097152, 0, 0);
+  switch (fmt)
+    {
+    case 10:
+      CHECK_FIELD_WHERE (new_val, 8191, -8192,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val;

 
 

-         /* Mask off 21 bits to be changed.  */
-         bfd_put_32 (stdoutput,
-                     bfd_get_32 (stdoutput, buf) & 0xffe00000,
-                     buf);
-         dis_assemble_21 (new_val, &resulti);
-         result = resulti;
-         break;
+      insn = (insn & ~ 0x3ff1) | (((val & 0x1ff8) << 1)
+                                 | ((val & 0x2000) >> 13));
+      break;
+    case -11:
+      CHECK_FIELD_WHERE (new_val, 8191, -8192,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val;

 
 

-       /* Handle all the opcodes with the 'i' operand type.  */
-       case 11:
-         CHECK_FIELD (new_val, 1023, -1023, 0);
+      insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1)
+                                 | ((val & 0x2000) >> 13));
+      break;
+      /* Handle all opcodes with the 'j' operand type.  */
+    case 14:
+      CHECK_FIELD_WHERE (new_val, 8191, -8192,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val;

 
 

-         /* Mask off 11 bits to be changed.  */
-         bfd_put_32 (stdoutput,
-                     bfd_get_32 (stdoutput, buf) & 0xffff800,
-                     buf);
-         low_sign_unext (new_val, 11, &resulti);
-         result = resulti;
-         break;
+      insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14));
+      break;

 
 

-       /* Handle all the opcodes with the 'w' operand type.  */
-       case 12:
-         CHECK_FIELD (new_val, 8199, -8184, 0);
+      /* Handle all opcodes with the 'k' operand type.  */
+    case 21:
+      CHECK_FIELD_WHERE (new_val, 1048575, -1048576,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val;

 
 

-         /* Mask off 11 bits to be changed.  */
-         sign_unext ((new_val - 8) >> 2, 12, &resulti);
-         bfd_put_32 (stdoutput,
-                     bfd_get_32 (stdoutput, buf) & 0xffffe002,
-                     buf);
+      insn = (insn & ~ 0x1fffff) | re_assemble_21 (val);
+      break;

 
 

-         dis_assemble_12 (resulti, &w1, &w);
-         result = ((w1 << 2) | w);
-         break;
+      /* Handle all the opcodes with the 'i' operand type.  */
+    case 11:
+      CHECK_FIELD_WHERE (new_val, 1023, -1024,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val;

 
 

-       /* Handle some of the opcodes with the 'W' operand type.  */
-       case 17:
-         {
-           int distance = *valp;
-
-           CHECK_FIELD (new_val, 262143, -262144, 0);
-
-           /* If this is an absolute branch (ie no link) with an out of
-              range target, then we want to complain.  */
-           if (fixP->fx_r_type == R_HPPA_PCREL_CALL
-               && (distance > 262143 || distance < -262144)
-               && (bfd_get_32 (stdoutput, buf) & 0xffe00000) == 0xe8000000)
-             CHECK_FIELD (distance, 262143, -262144, 0);
-
-           /* Mask off 17 bits to be changed.  */
-           bfd_put_32 (stdoutput,
-                       bfd_get_32 (stdoutput, buf) & 0xffe0e002,
-                       buf);
-           sign_unext ((new_val - 8) >> 2, 17, &resulti);
-           dis_assemble_17 (resulti, &w1, &w2, &w);
-           result = ((w2 << 2) | (w1 << 16) | w);
-           break;
-         }
+      insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11);
+      break;

 
 

-       case 32:
-         result = 0;
-         bfd_put_32 (stdoutput, new_val, buf);
-         break;
+      /* Handle all the opcodes with the 'w' operand type.  */
+    case 12:
+      CHECK_FIELD_WHERE (new_val - 8, 8191, -8192,
+                        fixP->fx_file, fixP->fx_line);
+      val = new_val - 8;

 
 

-       default:
-         as_bad (_("Unknown relocation encountered in md_apply_fix."));
-         return 0;
-       }
+      insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2);
+      break;

 
 

-      /* Insert the relocation.  */
-      bfd_put_32 (stdoutput, bfd_get_32 (stdoutput, buf) | result, buf);
-      return 1;
-    }
-  else
-    {
-      printf (_("no hppa_fixup entry for this fixup (fixP = 0x%x, type = 0x%x)\n"),
-             (unsigned int) fixP, fixP->fx_r_type);
+      /* Handle some of the opcodes with the 'W' operand type.  */
+    case 17:
+      {
+       offsetT distance = *valp;
+
+       /* If this is an absolute branch (ie no link) with an out of
+          range target, then we want to complain.  */
+       if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL
+           && (insn & 0xffe00000) == 0xe8000000)
+         CHECK_FIELD_WHERE (distance - 8, 262143, -262144,
+                            fixP->fx_file, fixP->fx_line);
+
+       CHECK_FIELD_WHERE (new_val - 8, 262143, -262144,
+                          fixP->fx_file, fixP->fx_line);
+       val = new_val - 8;
+
+       insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2);
+       break;
+      }
+
+    case 22:
+      {
+       offsetT distance = *valp;
+
+       /* If this is an absolute branch (ie no link) with an out of
+          range target, then we want to complain.  */
+       if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL
+           && (insn & 0xffe00000) == 0xe8000000)
+         CHECK_FIELD_WHERE (distance - 8, 8388607, -8388608,
+                            fixP->fx_file, fixP->fx_line);
+
+       CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608,
+                          fixP->fx_file, fixP->fx_line);
+       val = new_val - 8;
+
+       insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2);
+       break;
+      }
+
+    case -10:
+      val = new_val;
+      insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8);
+      break;
+
+    case -16:
+      val = new_val;
+      insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4);
+      break;
+
+    case 16:
+      val = new_val;
+      insn = (insn & ~ 0xffff) | re_assemble_16 (val);
+      break;
+
+    case 32:
+      insn = new_val;
+      break;
+
+    default:
+      as_bad_where (fixP->fx_file, fixP->fx_line,
+                   _("Unknown relocation encountered in md_apply_fix."));

       return 0;
     }
       return 0;
     }

+
+  /* Insert the relocation.  */
+  bfd_put_32 (stdoutput, insn, buf);
+  return 1;

 }
 
 /* Exactly what point is a PC-relative offset relative TO?
 }
 
 /* Exactly what point is a PC-relative offset relative TO?


@@ -3374,19 +4657,21 @@ is_end_of_statement ()
    the most common will be a hex or decimal constant, but it could be
    a pre-defined register (Yuk!), or an absolute symbol.
 
    the most common will be a hex or decimal constant, but it could be
    a pre-defined register (Yuk!), or an absolute symbol.
 

-   Return a number or -1 for failure.
+   Return 1 on success or 0 on failure.  If STRICT, then a missing
+   register prefix will cause a failure.  The number itself is
+   returned in `pa_number'.

 
 

-   When parsing PA-89 FP register numbers RESULT will be
-   the address of a structure to return information about
-   L/R half of FP registers, store results there as appropriate.
+   IS_FLOAT indicates that a PA-89 FP register number should be
+   parsed;  A `l' or `r' suffix is checked for if but 2 of IS_FLOAT is
+   not set.

 
    pa_parse_number can not handle negative constants and will fail
    horribly if it is passed such a constant.  */
 
 static int
 
    pa_parse_number can not handle negative constants and will fail
    horribly if it is passed such a constant.  */
 
 static int

-pa_parse_number (s, result)
+pa_parse_number (s, is_float)

      char **s;
      char **s;

-     struct pa_11_fp_reg_struct *result;
+     int is_float;

 {
   int num;
   char *name;
 {
   int num;
   char *name;


@@ -3394,32 +4679,27 @@ pa_parse_number (s, result)
   symbolS *sym;
   int status;
   char *p = *s;
   symbolS *sym;
   int status;
   char *p = *s;

+  boolean have_prefix;

 
   /* Skip whitespace before the number.  */
   while (*p == ' ' || *p == '\t')
     p = p + 1;
 
 
   /* Skip whitespace before the number.  */
   while (*p == ' ' || *p == '\t')
     p = p + 1;
 

-  /* Store info in RESULT if requested by caller.  */
-  if (result)
-    {
-      result->number_part = -1;
-      result->l_r_select = -1;
-    }
-  num = -1;
-
-  if (isdigit (*p))
+  pa_number = -1;
+  have_prefix = 0;
+  num = 0;
+  if (!strict && ISDIGIT (*p))

     {
       /* Looks like a number.  */
     {
       /* Looks like a number.  */

-      num = 0;

 
       if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X'))
        {
          /* The number is specified in hex.  */
          p += 2;
 
       if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X'))
        {
          /* The number is specified in hex.  */
          p += 2;

-         while (isdigit (*p) || ((*p >= 'a') && (*p <= 'f'))
+         while (ISDIGIT (*p) || ((*p >= 'a') && (*p <= 'f'))

                 || ((*p >= 'A') && (*p <= 'F')))
            {
                 || ((*p >= 'A') && (*p <= 'F')))
            {

-             if (isdigit (*p))
+             if (ISDIGIT (*p))

                num = num * 16 + *p - '0';
              else if (*p >= 'a' && *p <= 'f')
                num = num * 16 + *p - 'a' + 10;
                num = num * 16 + *p - '0';
              else if (*p >= 'a' && *p <= 'f')
                num = num * 16 + *p - 'a' + 10;


@@ -3431,42 +4711,43 @@ pa_parse_number (s, result)
       else
        {
          /* The number is specified in decimal.  */
       else
        {
          /* The number is specified in decimal.  */

-         while (isdigit (*p))
+         while (ISDIGIT (*p))

            {
              num = num * 10 + *p - '0';
              ++p;
            }
        }
 
            {
              num = num * 10 + *p - '0';
              ++p;
            }
        }
 

-      /* Store info in RESULT if requested by the caller.  */
-      if (result)
-       {
-         result->number_part = num;
+      pa_number = num;

 
 

-         if (IS_R_SELECT (p))
-           {
-             result->l_r_select = 1;
-             ++p;
-           }
-         else if (IS_L_SELECT (p))
+      /* Check for a `l' or `r' suffix.  */
+      if (is_float)
+       {
+         pa_number += FP_REG_BASE;
+         if (! (is_float & 2))

            {
            {

-             result->l_r_select = 0;
-             ++p;
+             if (IS_R_SELECT (p))
+               {
+                 pa_number += FP_REG_RSEL;
+                 ++p;
+               }
+             else if (IS_L_SELECT (p))
+               {
+                 ++p;
+               }

            }
            }

-         else
-           result->l_r_select = 0;

        }
     }
   else if (*p == '%')
     {
       /* The number might be a predefined register.  */
        }
     }
   else if (*p == '%')
     {
       /* The number might be a predefined register.  */

-      num = 0;
+      have_prefix = 1;

       name = p;
       p++;
       c = *p;
       /* Tege hack: Special case for general registers as the general
          code makes a binary search with case translation, and is VERY
       name = p;
       p++;
       c = *p;
       /* Tege hack: Special case for general registers as the general
          code makes a binary search with case translation, and is VERY

-         slow. */
+         slow.  */

       if (c == 'r')
        {
          p++;
       if (c == 'r')
        {
          p++;


@@ -3482,7 +4763,7 @@ pa_parse_number (s, result)
              num = 2;
              p++;
            }
              num = 2;
              p++;
            }

-         else if (!isdigit (*p))
+         else if (!ISDIGIT (*p))

            {
              if (print_errors)
                as_bad (_("Undefined register: '%s'."), name);
            {
              if (print_errors)
                as_bad (_("Undefined register: '%s'."), name);


@@ -3492,7 +4773,7 @@ pa_parse_number (s, result)
            {
              do
                num = num * 10 + *p++ - '0';
            {
              do
                num = num * 10 + *p++ - '0';

-             while (isdigit (*p));
+             while (ISDIGIT (*p));

            }
        }
       else
            }
        }
       else


@@ -3516,23 +4797,12 @@ pa_parse_number (s, result)
          *p = c;
        }
 
          *p = c;
        }
 

-      /* Store info in RESULT if requested by caller.  */
-      if (result)
-       {
-         result->number_part = num;
-         if (IS_R_SELECT (p - 1))
-           result->l_r_select = 1;
-         else if (IS_L_SELECT (p - 1))
-           result->l_r_select = 0;
-         else
-           result->l_r_select = 0;
-       }
+      pa_number = num;

     }
   else
     {
       /* And finally, it could be a symbol in the absolute section which
     }
   else
     {
       /* And finally, it could be a symbol in the absolute section which

-         is effectively a constant.  */
-      num = 0;
+         is effectively a constant, or a register alias symbol.  */

       name = p;
       c = *p;
       while (is_part_of_name (c))
       name = p;
       c = *p;
       while (is_part_of_name (c))


@@ -3543,16 +4813,23 @@ pa_parse_number (s, result)
       *p = 0;
       if ((sym = symbol_find (name)) != NULL)
        {
       *p = 0;
       if ((sym = symbol_find (name)) != NULL)
        {

-         if (S_GET_SEGMENT (sym) == &bfd_abs_section)
+         if (S_GET_SEGMENT (sym) == reg_section)
+           {
+             num = S_GET_VALUE (sym);
+             /* Well, we don't really have one, but we do have a
+                register, so...  */
+             have_prefix = true;
+           }
+         else if (S_GET_SEGMENT (sym) == &bfd_abs_section)

            num = S_GET_VALUE (sym);
            num = S_GET_VALUE (sym);

-         else
+         else if (!strict)

            {
              if (print_errors)
                as_bad (_("Non-absolute symbol: '%s'."), name);
              num = -1;
            }
        }
            {
              if (print_errors)
                as_bad (_("Non-absolute symbol: '%s'."), name);
              num = -1;
            }
        }

-      else
+      else if (!strict)

        {
          /* There is where we'd come for an undefined symbol
             or for an empty string.  For an empty string we
        {
          /* There is where we'd come for an undefined symbol
             or for an empty string.  For an empty string we


@@ -3569,24 +4846,18 @@ pa_parse_number (s, result)
        }
       *p = c;
 
        }
       *p = c;
 

-      /* Store info in RESULT if requested by caller.  */
-      if (result)
-       {
-         result->number_part = num;
-         if (IS_R_SELECT (p - 1))
-           result->l_r_select = 1;
-         else if (IS_L_SELECT (p - 1))
-           result->l_r_select = 0;
-         else
-           result->l_r_select = 0;
-       }
+      pa_number = num;

     }
 
     }
 

-  *s = p;
-  return num;
+  if (!strict || have_prefix)
+    {
+      *s = p;
+      return 1;
+    }
+  return 0;

 }
 
 }
 

-#define REG_NAME_CNT   (sizeof(pre_defined_registers) / sizeof(struct pd_reg))
+#define REG_NAME_CNT   (sizeof (pre_defined_registers) / sizeof (struct pd_reg))

 
 /* Given NAME, find the register number associated with that name, return
    the integer value associated with the given name or -1 on failure.  */
 
 /* Given NAME, find the register number associated with that name, return
    the integer value associated with the given name or -1 on failure.  */


@@ -3617,16 +4888,14 @@ reg_name_search (name)
   return -1;
 }
 
   return -1;
 }
 

-

 /* Return nonzero if the given INSN and L/R information will require
    a new PA-1.1 opcode.  */
 
 static int
 /* Return nonzero if the given INSN and L/R information will require
    a new PA-1.1 opcode.  */
 
 static int

-need_pa11_opcode (insn, result)
-     struct pa_it *insn;
-     struct pa_11_fp_reg_struct *result;
+need_pa11_opcode ()

 {
 {

-  if (result->l_r_select == 1 && !(insn->fpof1 == DBL && insn->fpof2 == DBL))
+  if ((pa_number & FP_REG_RSEL) != 0
+      && !(the_insn.fpof1 == DBL && the_insn.fpof2 == DBL))

     {
       /* If this instruction is specific to a particular architecture,
         then set a new architecture.  */
     {
       /* If this instruction is specific to a particular architecture,
         then set a new architecture.  */


@@ -3681,6 +4950,126 @@ pa_parse_fp_cmp_cond (s)
   return 0;
 }
 
   return 0;
 }
 

+/* Parse a graphics test complete for ftest.  */
+
+static int
+pa_parse_ftest_gfx_completer (s)
+     char **s;
+{
+  int value;
+
+  value = 0;
+  if (strncasecmp (*s, "acc8", 4) == 0)
+    {
+      value = 5;
+      *s += 4;
+    }
+  else if (strncasecmp (*s, "acc6", 4) == 0)
+    {
+      value = 9;
+      *s += 4;
+    }
+  else if (strncasecmp (*s, "acc4", 4) == 0)
+    {
+      value = 13;
+      *s += 4;
+    }
+  else if (strncasecmp (*s, "acc2", 4) == 0)
+    {
+      value = 17;
+      *s += 4;
+    }
+  else if (strncasecmp (*s, "acc", 3) == 0)
+    {
+      value = 1;
+      *s += 3;
+    }
+  else if (strncasecmp (*s, "rej8", 4) == 0)
+    {
+      value = 6;
+      *s += 4;
+    }
+  else if (strncasecmp (*s, "rej", 3) == 0)
+    {
+      value = 2;
+      *s += 3;
+    }
+  else
+    {
+      value = 0;
+      as_bad (_("Invalid FTEST completer: %s"), *s);
+    }
+
+  return value;
+}
+
+/* Parse an FP operand format completer returning the completer
+   type.  */
+
+static fp_operand_format
+pa_parse_fp_cnv_format (s)
+     char **s;
+{
+  int format;
+
+  format = SGL;
+  if (**s == ',')
+    {
+      *s += 1;
+      if (strncasecmp (*s, "sgl", 3) == 0)
+       {
+         format = SGL;
+         *s += 4;
+       }
+      else if (strncasecmp (*s, "dbl", 3) == 0)
+       {
+         format = DBL;
+         *s += 4;
+       }
+      else if (strncasecmp (*s, "quad", 4) == 0)
+       {
+         format = QUAD;
+         *s += 5;
+       }
+      else if (strncasecmp (*s, "w", 1) == 0)
+       {
+         format = W;
+         *s += 2;
+       }
+      else if (strncasecmp (*s, "uw", 2) == 0)
+       {
+         format = UW;
+         *s += 3;
+       }
+      else if (strncasecmp (*s, "dw", 2) == 0)
+       {
+         format = DW;
+         *s += 3;
+       }
+      else if (strncasecmp (*s, "udw", 3) == 0)
+       {
+         format = UDW;
+         *s += 4;
+       }
+      else if (strncasecmp (*s, "qw", 2) == 0)
+       {
+         format = QW;
+         *s += 3;
+       }
+      else if (strncasecmp (*s, "uqw", 3) == 0)
+       {
+         format = UQW;
+         *s += 4;
+       }
+      else
+       {
+         format = ILLEGAL_FMT;
+         as_bad (_("Invalid FP Operand Format: %3s"), *s);
+       }
+    }
+
+  return format;
+}

 
 /* Parse an FP operand format completer returning the completer
    type.  */
 
 /* Parse an FP operand format completer returning the completer
    type.  */


@@ -3736,16 +5125,16 @@ pa_chk_field_selector (str)
     *str = *str + 1;
 
   if ((*str)[1] == '\'' || (*str)[1] == '%')
     *str = *str + 1;
 
   if ((*str)[1] == '\'' || (*str)[1] == '%')

-    name[0] = tolower ((*str)[0]),
+    name[0] = TOLOWER ((*str)[0]),

     name[1] = 0;
   else if ((*str)[2] == '\'' || (*str)[2] == '%')
     name[1] = 0;
   else if ((*str)[2] == '\'' || (*str)[2] == '%')

-    name[0] = tolower ((*str)[0]),
-    name[1] = tolower ((*str)[1]),
+    name[0] = TOLOWER ((*str)[0]),
+    name[1] = TOLOWER ((*str)[1]),

     name[2] = 0;
   else if ((*str)[3] == '\'' || (*str)[3] == '%')
     name[2] = 0;
   else if ((*str)[3] == '\'' || (*str)[3] == '%')

-    name[0] = tolower ((*str)[0]),
-    name[1] = tolower ((*str)[1]),
-    name[2] = tolower ((*str)[2]),
+    name[0] = TOLOWER ((*str)[0]),
+    name[1] = TOLOWER ((*str)[1]),
+    name[2] = TOLOWER ((*str)[2]),

     name[3] = 0;
   else
     return e_fsel;
     name[3] = 0;
   else
     return e_fsel;


@@ -3802,7 +5191,7 @@ get_expression (str)
   return 0;
 }
 
   return 0;
 }
 

-/* Mark (via expr_end) the end of an absolute expression.  FIXME. */
+/* Mark (via expr_end) the end of an absolute expression.  FIXME.  */

 static int
 pa_get_absolute_expression (insn, strp)
      struct pa_it *insn;
 static int
 pa_get_absolute_expression (insn, strp)
      struct pa_it *insn;


@@ -3818,7 +5207,7 @@ pa_get_absolute_expression (insn, strp)
 
      The PA assembly syntax is ambigious in a variety of ways.  Consider
      this string "4 %r5"  Is that the number 4 followed by the register
 
      The PA assembly syntax is ambigious in a variety of ways.  Consider
      this string "4 %r5"  Is that the number 4 followed by the register

-     r5, or is that 4 MOD 5?
+     r5, or is that 4 MOD r5?

 
      If we get a modulo expresion When looking for an absolute, we try
      again cutting off the input string at the first whitespace character.  */
 
      If we get a modulo expresion When looking for an absolute, we try
      again cutting off the input string at the first whitespace character.  */


@@ -3841,6 +5230,14 @@ pa_get_absolute_expression (insn, strp)
       *s = c;
       return evaluate_absolute (insn);
     }
       *s = c;
       return evaluate_absolute (insn);
     }

+  /* When in strict mode we have a non-match, fix up the pointers
+     and return to our caller.  */
+  if (insn->exp.X_op != O_constant && strict)
+    {
+      expr_end = input_line_pointer;
+      input_line_pointer = save_in;
+      return 0;
+    }

   if (insn->exp.X_op != O_constant)
     {
       as_bad (_("Bad segment (should be absolute)."));
   if (insn->exp.X_op != O_constant)
     {
       as_bad (_("Bad segment (should be absolute)."));


@@ -3859,70 +5256,14 @@ static int
 evaluate_absolute (insn)
      struct pa_it *insn;
 {
 evaluate_absolute (insn)
      struct pa_it *insn;
 {

-  int value;
+  offsetT value;

   expressionS exp;
   int field_selector = insn->field_selector;
 
   exp = insn->exp;
   value = exp.X_add_number;
 
   expressionS exp;
   int field_selector = insn->field_selector;
 
   exp = insn->exp;
   value = exp.X_add_number;
 

-  switch (field_selector)
-    {
-    /* No change.  */
-    case e_fsel:
-      break;
-
-    /* If bit 21 is on then add 0x800 and arithmetic shift right 11 bits.  */
-    case e_lssel:
-      if (value & 0x00000400)
-       value += 0x800;
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    /* Sign extend from bit 21.  */
-    case e_rssel:
-      if (value & 0x00000400)
-       value |= 0xfffff800;
-      else
-       value &= 0x7ff;
-      break;
-
-    /* Arithmetic shift right 11 bits.  */
-    case e_lsel:
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    /* Set bits 0-20 to zero.  */
-    case e_rsel:
-      value = value & 0x7ff;
-      break;
-
-    /* Add 0x800 and arithmetic shift right 11 bits.  */
-    case e_ldsel:
-      value += 0x800;
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    /* Set bitgs 0-21 to one.  */
-    case e_rdsel:
-      value |= 0xfffff800;
-      break;
-
-#define RSEL_ROUND(c)  (((c) + 0x1000) & ~0x1fff)
-    case e_rrsel:
-      value = (RSEL_ROUND (value) & 0x7ff) + (value - RSEL_ROUND (value));
-      break;
-
-    case e_lrsel:
-      value = (RSEL_ROUND (value) >> 11) & 0x1fffff;
-      break;
-#undef RSEL_ROUND
-
-    default:
-      BAD_CASE (field_selector);
-      break;
-    }
-  return value;
+  return hppa_field_adjust (0, value, field_selector);

 }
 
 /* Given an argument location specification return the associated
 }
 
 /* Given an argument location specification return the associated


@@ -3996,26 +5337,326 @@ pa_parse_nullif (s)
        nullif = 1;
       else
        {
        nullif = 1;
       else
        {

-         as_bad (_("Invalid Nullification: (%c)"), **s);
-         nullif = 0;
+         as_bad (_("Invalid Nullification: (%c)"), **s);
+         nullif = 0;
+       }
+      *s = *s + 1;
+    }
+
+  return nullif;
+}
+
+/* Parse a non-negated compare/subtract completer returning the
+   number (for encoding in instrutions) of the given completer.  */
+
+static int
+pa_parse_nonneg_cmpsub_cmpltr (s)
+     char **s;
+{
+  int cmpltr;
+  char *name = *s + 1;
+  char c;
+  char *save_s = *s;
+  int nullify = 0;
+
+  cmpltr = 0;
+  if (**s == ',')
+    {
+      *s += 1;
+      while (**s != ',' && **s != ' ' && **s != '\t')
+       *s += 1;
+      c = **s;
+      **s = 0x00;
+
+      if (strcmp (name, "=") == 0)
+       {
+         cmpltr = 1;
+       }
+      else if (strcmp (name, "<") == 0)
+       {
+         cmpltr = 2;
+       }
+      else if (strcmp (name, "<=") == 0)
+       {
+         cmpltr = 3;
+       }
+      else if (strcmp (name, "<<") == 0)
+       {
+         cmpltr = 4;
+       }
+      else if (strcmp (name, "<<=") == 0)
+       {
+         cmpltr = 5;
+       }
+      else if (strcasecmp (name, "sv") == 0)
+       {
+         cmpltr = 6;
+       }
+      else if (strcasecmp (name, "od") == 0)
+       {
+         cmpltr = 7;
+       }
+      /* If we have something like addb,n then there is no condition
+         completer.  */
+      else if (strcasecmp (name, "n") == 0)
+       {
+         cmpltr = 0;
+         nullify = 1;
+       }
+      else
+       {
+         cmpltr = -1;
+       }
+      **s = c;
+    }
+
+  /* Reset pointers if this was really a ,n for a branch instruction.  */
+  if (nullify)
+    *s = save_s;
+
+  return cmpltr;
+}
+
+/* Parse a negated compare/subtract completer returning the
+   number (for encoding in instrutions) of the given completer.  */
+
+static int
+pa_parse_neg_cmpsub_cmpltr (s)
+     char **s;
+{
+  int cmpltr;
+  char *name = *s + 1;
+  char c;
+  char *save_s = *s;
+  int nullify = 0;
+
+  cmpltr = 0;
+  if (**s == ',')
+    {
+      *s += 1;
+      while (**s != ',' && **s != ' ' && **s != '\t')
+       *s += 1;
+      c = **s;
+      **s = 0x00;
+
+      if (strcasecmp (name, "tr") == 0)
+       {
+         cmpltr = 0;
+       }
+      else if (strcmp (name, "<>") == 0)
+       {
+         cmpltr = 1;
+       }
+      else if (strcmp (name, ">=") == 0)
+       {
+         cmpltr = 2;
+       }
+      else if (strcmp (name, ">") == 0)
+       {
+         cmpltr = 3;
+       }
+      else if (strcmp (name, ">>=") == 0)
+       {
+         cmpltr = 4;
+       }
+      else if (strcmp (name, ">>") == 0)
+       {
+         cmpltr = 5;
+       }
+      else if (strcasecmp (name, "nsv") == 0)
+       {
+         cmpltr = 6;
+       }
+      else if (strcasecmp (name, "ev") == 0)
+       {
+         cmpltr = 7;
+       }
+      /* If we have something like addb,n then there is no condition
+         completer.  */
+      else if (strcasecmp (name, "n") == 0)
+       {
+         cmpltr = 0;
+         nullify = 1;
+       }
+      else
+       {
+         cmpltr = -1;
+       }
+      **s = c;
+    }
+
+  /* Reset pointers if this was really a ,n for a branch instruction.  */
+  if (nullify)
+    *s = save_s;
+
+  return cmpltr;
+}
+
+/* Parse a 64 bit compare and branch completer returning the number (for
+   encoding in instrutions) of the given completer.
+
+   Nonnegated comparisons are returned as 0-7, negated comparisons are
+   returned as 8-15.  */
+
+static int
+pa_parse_cmpb_64_cmpltr (s)
+     char **s;
+{
+  int cmpltr;
+  char *name = *s + 1;
+  char c;
+
+  cmpltr = -1;
+  if (**s == ',')
+    {
+      *s += 1;
+      while (**s != ',' && **s != ' ' && **s != '\t')
+       *s += 1;
+      c = **s;
+      **s = 0x00;
+
+      if (strcmp (name, "*") == 0)
+       {
+         cmpltr = 0;
+       }
+      else if (strcmp (name, "*=") == 0)
+       {
+         cmpltr = 1;
+       }
+      else if (strcmp (name, "*<") == 0)
+       {
+         cmpltr = 2;
+       }
+      else if (strcmp (name, "*<=") == 0)
+       {
+         cmpltr = 3;
+       }
+      else if (strcmp (name, "*<<") == 0)
+       {
+         cmpltr = 4;
+       }
+      else if (strcmp (name, "*<<=") == 0)
+       {
+         cmpltr = 5;
+       }
+      else if (strcasecmp (name, "*sv") == 0)
+       {
+         cmpltr = 6;
+       }
+      else if (strcasecmp (name, "*od") == 0)
+       {
+         cmpltr = 7;
+       }
+      else if (strcasecmp (name, "*tr") == 0)
+       {
+         cmpltr = 8;
+       }
+      else if (strcmp (name, "*<>") == 0)
+       {
+         cmpltr = 9;
+       }
+      else if (strcmp (name, "*>=") == 0)
+       {
+         cmpltr = 10;
+       }
+      else if (strcmp (name, "*>") == 0)
+       {
+         cmpltr = 11;
+       }
+      else if (strcmp (name, "*>>=") == 0)
+       {
+         cmpltr = 12;
+       }
+      else if (strcmp (name, "*>>") == 0)
+       {
+         cmpltr = 13;
+       }
+      else if (strcasecmp (name, "*nsv") == 0)
+       {
+         cmpltr = 14;
+       }
+      else if (strcasecmp (name, "*ev") == 0)
+       {
+         cmpltr = 15;
+       }
+      else
+       {
+         cmpltr = -1;
+       }
+      **s = c;
+    }
+
+  return cmpltr;
+}
+
+/* Parse a 64 bit compare immediate and branch completer returning the number
+   (for encoding in instrutions) of the given completer.  */
+
+static int
+pa_parse_cmpib_64_cmpltr (s)
+     char **s;
+{
+  int cmpltr;
+  char *name = *s + 1;
+  char c;
+
+  cmpltr = -1;
+  if (**s == ',')
+    {
+      *s += 1;
+      while (**s != ',' && **s != ' ' && **s != '\t')
+       *s += 1;
+      c = **s;
+      **s = 0x00;
+
+      if (strcmp (name, "*<<") == 0)
+       {
+         cmpltr = 0;
+       }
+      else if (strcmp (name, "*=") == 0)
+       {
+         cmpltr = 1;
+       }
+      else if (strcmp (name, "*<") == 0)
+       {
+         cmpltr = 2;
+       }
+      else if (strcmp (name, "*<=") == 0)
+       {
+         cmpltr = 3;
+       }
+      else if (strcmp (name, "*>>=") == 0)
+       {
+         cmpltr = 4;
+       }
+      else if (strcmp (name, "*<>") == 0)
+       {
+         cmpltr = 5;
+       }
+      else if (strcasecmp (name, "*>=") == 0)
+       {
+         cmpltr = 6;
+       }
+      else if (strcasecmp (name, "*>") == 0)
+       {
+         cmpltr = 7;
+       }
+      else
+       {
+         cmpltr = -1;

        }
        }

-      *s = *s + 1;
+      **s = c;

     }
 
     }
 

-  return nullif;
+  return cmpltr;

 }
 
 }
 

-/* Parse a non-negated compare/subtract completer returning the
-   number (for encoding in instrutions) of the given completer.
-
-   ISBRANCH specifies whether or not this is parsing a condition
-   completer for a branch (vs a nullification completer for a
-   computational instruction.  */
+/* Parse a non-negated addition completer returning the number
+   (for encoding in instrutions) of the given completer.  */

 
 static int
 
 static int

-pa_parse_nonneg_cmpsub_cmpltr (s, isbranch)
+pa_parse_nonneg_add_cmpltr (s)

      char **s;
      char **s;

-     int isbranch;

 {
   int cmpltr;
   char *name = *s + 1;
 {
   int cmpltr;
   char *name = *s + 1;


@@ -4031,8 +5672,6 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch)
        *s += 1;
       c = **s;
       **s = 0x00;
        *s += 1;
       c = **s;
       **s = 0x00;

-
-

       if (strcmp (name, "=") == 0)
        {
          cmpltr = 1;
       if (strcmp (name, "=") == 0)
        {
          cmpltr = 1;


@@ -4045,11 +5684,11 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch)
        {
          cmpltr = 3;
        }
        {
          cmpltr = 3;
        }

-      else if (strcmp (name, "<<") == 0)
+      else if (strcasecmp (name, "nuv") == 0)

        {
          cmpltr = 4;
        }
        {
          cmpltr = 4;
        }

-      else if (strcmp (name, "<<=") == 0)
+      else if (strcasecmp (name, "znv") == 0)

        {
          cmpltr = 5;
        }
        {
          cmpltr = 5;
        }


@@ -4063,7 +5702,7 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch)
        }
       /* If we have something like addb,n then there is no condition
          completer.  */
        }
       /* If we have something like addb,n then there is no condition
          completer.  */

-      else if (strcasecmp (name, "n") == 0 && isbranch)
+      else if (strcasecmp (name, "n") == 0)

        {
          cmpltr = 0;
          nullify = 1;
        {
          cmpltr = 0;
          nullify = 1;


@@ -4079,21 +5718,15 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch)
   if (nullify)
     *s = save_s;
 
   if (nullify)
     *s = save_s;
 

-

   return cmpltr;
 }
 
   return cmpltr;
 }
 

-/* Parse a negated compare/subtract completer returning the
-   number (for encoding in instrutions) of the given completer.
-
-   ISBRANCH specifies whether or not this is parsing a condition
-   completer for a branch (vs a nullification completer for a
-   computational instruction.  */
+/* Parse a negated addition completer returning the number
+   (for encoding in instrutions) of the given completer.  */

 
 static int
 
 static int

-pa_parse_neg_cmpsub_cmpltr (s, isbranch)
+pa_parse_neg_add_cmpltr (s)

      char **s;
      char **s;

-     int isbranch;

 {
   int cmpltr;
   char *name = *s + 1;
 {
   int cmpltr;
   char *name = *s + 1;


@@ -4109,8 +5742,6 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch)
        *s += 1;
       c = **s;
       **s = 0x00;
        *s += 1;
       c = **s;
       **s = 0x00;

-
-

       if (strcasecmp (name, "tr") == 0)
        {
          cmpltr = 0;
       if (strcasecmp (name, "tr") == 0)
        {
          cmpltr = 0;


@@ -4127,11 +5758,11 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch)
        {
          cmpltr = 3;
        }
        {
          cmpltr = 3;
        }

-      else if (strcmp (name, ">>=") == 0)
+      else if (strcasecmp (name, "uv") == 0)

        {
          cmpltr = 4;
        }
        {
          cmpltr = 4;
        }

-      else if (strcmp (name, ">>") == 0)
+      else if (strcasecmp (name, "vnz") == 0)

        {
          cmpltr = 5;
        }
        {
          cmpltr = 5;
        }


@@ -4145,7 +5776,7 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch)
        }
       /* If we have something like addb,n then there is no condition
          completer.  */
        }
       /* If we have something like addb,n then there is no condition
          completer.  */

-      else if (strcasecmp (name, "n") == 0 && isbranch)
+      else if (strcasecmp (name, "n") == 0)

        {
          cmpltr = 0;
          nullify = 1;
        {
          cmpltr = 0;
          nullify = 1;


@@ -4161,27 +5792,21 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch)
   if (nullify)
     *s = save_s;
 
   if (nullify)
     *s = save_s;
 

-

   return cmpltr;
 }
 
   return cmpltr;
 }
 

-
-/* Parse a non-negated addition completer returning the number
-   (for encoding in instrutions) of the given completer.
-
-   ISBRANCH specifies whether or not this is parsing a condition
-   completer for a branch (vs a nullification completer for a
-   computational instruction.  */
+/* Parse a 64 bit wide mode add and branch completer returning the number (for
+   encoding in instrutions) of the given completer.  */

 
 static int
 
 static int

-pa_parse_nonneg_add_cmpltr (s, isbranch)
+pa_parse_addb_64_cmpltr (s)

      char **s;
      char **s;

-     int isbranch;

 {
   int cmpltr;
   char *name = *s + 1;
   char c;
   char *save_s = *s;
 {
   int cmpltr;
   char *name = *s + 1;
   char c;
   char *save_s = *s;

+  int nullify = 0;

 
   cmpltr = 0;
   if (**s == ',')
 
   cmpltr = 0;
   if (**s == ',')


@@ -4207,100 +5832,56 @@ pa_parse_nonneg_add_cmpltr (s, isbranch)
        {
          cmpltr = 4;
        }
        {
          cmpltr = 4;
        }

-      else if (strcasecmp (name, "znv") == 0)
+      else if (strcasecmp (name, "*=") == 0)

        {
          cmpltr = 5;
        }
        {
          cmpltr = 5;
        }

-      else if (strcasecmp (name, "sv") == 0)
+      else if (strcasecmp (name, "*<") == 0)

        {
          cmpltr = 6;
        }
        {
          cmpltr = 6;
        }

-      else if (strcasecmp (name, "od") == 0)
+      else if (strcasecmp (name, "*<=") == 0)

        {
          cmpltr = 7;
        }
        {
          cmpltr = 7;
        }

-      /* If we have something like addb,n then there is no condition
-         completer.  */
-      else if (strcasecmp (name, "n") == 0 && isbranch)
-       {
-         cmpltr = 0;
-       }
-      else
-       {
-         cmpltr = -1;
-       }
-      **s = c;
-    }
-
-  /* Reset pointers if this was really a ,n for a branch instruction.  */
-  if (cmpltr == 0 && *name == 'n' && isbranch)
-    *s = save_s;
-
-  return cmpltr;
-}
-
-/* Parse a negated addition completer returning the number
-   (for encoding in instrutions) of the given completer.
-
-   ISBRANCH specifies whether or not this is parsing a condition
-   completer for a branch (vs a nullification completer for a
-   computational instruction).  */
-
-static int
-pa_parse_neg_add_cmpltr (s, isbranch)
-     char **s;
-     int isbranch;
-{
-  int cmpltr;
-  char *name = *s + 1;
-  char c;
-  char *save_s = *s;
-
-  cmpltr = 0;
-  if (**s == ',')
-    {
-      *s += 1;
-      while (**s != ',' && **s != ' ' && **s != '\t')
-       *s += 1;
-      c = **s;
-      **s = 0x00;
-      if (strcasecmp (name, "tr") == 0)
+      else if (strcmp (name, "tr") == 0)

        {
        {

-         cmpltr = 0;
+         cmpltr = 8;

        }
       else if (strcmp (name, "<>") == 0)
        {
        }
       else if (strcmp (name, "<>") == 0)
        {

-         cmpltr = 1;
+         cmpltr = 9;

        }
       else if (strcmp (name, ">=") == 0)
        {
        }
       else if (strcmp (name, ">=") == 0)
        {

-         cmpltr = 2;
+         cmpltr = 10;

        }
       else if (strcmp (name, ">") == 0)
        {
        }
       else if (strcmp (name, ">") == 0)
        {

-         cmpltr = 3;
+         cmpltr = 11;

        }
       else if (strcasecmp (name, "uv") == 0)
        {
        }
       else if (strcasecmp (name, "uv") == 0)
        {

-         cmpltr = 4;
+         cmpltr = 12;

        }
        }

-      else if (strcasecmp (name, "vnz") == 0)
+      else if (strcasecmp (name, "*<>") == 0)

        {
        {

-         cmpltr = 5;
+         cmpltr = 13;

        }
        }

-      else if (strcasecmp (name, "nsv") == 0)
+      else if (strcasecmp (name, "*>=") == 0)

        {
        {

-         cmpltr = 6;
+         cmpltr = 14;

        }
        }

-      else if (strcasecmp (name, "ev") == 0)
+      else if (strcasecmp (name, "*>") == 0)

        {
        {

-         cmpltr = 7;
+         cmpltr = 15;

        }
       /* If we have something like addb,n then there is no condition
          completer.  */
        }
       /* If we have something like addb,n then there is no condition
          completer.  */

-      else if (strcasecmp (name, "n") == 0 && isbranch)
+      else if (strcasecmp (name, "n") == 0)

        {
          cmpltr = 0;
        {
          cmpltr = 0;

+         nullify = 1;

        }
       else
        {
        }
       else
        {


@@ -4310,7 +5891,7 @@ pa_parse_neg_add_cmpltr (s, isbranch)
     }
 
   /* Reset pointers if this was really a ,n for a branch instruction.  */
     }
 
   /* Reset pointers if this was really a ,n for a branch instruction.  */

-  if (cmpltr == 0 && *name == 'n' && isbranch)
+  if (nullify)

     *s = save_s;
 
   return cmpltr;
     *s = save_s;
 
   return cmpltr;


@@ -4321,6 +5902,7 @@ pa_parse_neg_add_cmpltr (s, isbranch)
    alignment of the subspace if necessary.  */
 static void
 pa_align (bytes)
    alignment of the subspace if necessary.  */
 static void
 pa_align (bytes)

+     int bytes;

 {
   /* We must have a valid space and subspace.  */
   pa_check_current_space_and_subspace ();
 {
   /* We must have a valid space and subspace.  */
   pa_check_current_space_and_subspace ();


@@ -4339,7 +5921,7 @@ pa_align (bytes)
 
 static void
 pa_block (z)
 
 static void
 pa_block (z)

-     int z;
+     int z ATTRIBUTE_UNUSED;

 {
   char *p;
   long int temp_fill;
 {
   char *p;
   long int temp_fill;


@@ -4377,7 +5959,7 @@ pa_block (z)
 
 static void
 pa_brtab (begin)
 
 static void
 pa_brtab (begin)

-     int begin;
+     int begin ATTRIBUTE_UNUSED;

 {
 
 #ifdef OBJ_SOM
 {
 
 #ifdef OBJ_SOM


@@ -4388,7 +5970,7 @@ pa_brtab (begin)
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0, NULL,
                0, begin ? R_HPPA_BEGIN_BRTAB : R_HPPA_END_BRTAB,
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0, NULL,
                0, begin ? R_HPPA_BEGIN_BRTAB : R_HPPA_END_BRTAB,

-               e_fsel, 0, 0, NULL);
+               e_fsel, 0, 0, 0);

 #endif
 
   demand_empty_rest_of_line ();
 #endif
 
   demand_empty_rest_of_line ();


@@ -4398,7 +5980,7 @@ pa_brtab (begin)
 
 static void
 pa_try (begin)
 
 static void
 pa_try (begin)

-     int begin;
+     int begin ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   expressionS exp;
 {
 #ifdef OBJ_SOM
   expressionS exp;


@@ -4413,7 +5995,7 @@ pa_try (begin)
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0, begin ? NULL : &exp,
                0, begin ? R_HPPA_BEGIN_TRY : R_HPPA_END_TRY,
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0, begin ? NULL : &exp,
                0, begin ? R_HPPA_BEGIN_TRY : R_HPPA_END_TRY,

-               e_fsel, 0, 0, NULL);
+               e_fsel, 0, 0, 0);

 #endif
 
   demand_empty_rest_of_line ();
 #endif
 
   demand_empty_rest_of_line ();


@@ -4425,7 +6007,7 @@ pa_try (begin)
 
 static void
 pa_call (unused)
 
 static void
 pa_call (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -4514,49 +6096,45 @@ static void
 pa_build_unwind_subspace (call_info)
      struct call_info *call_info;
 {
 pa_build_unwind_subspace (call_info)
      struct call_info *call_info;
 {

-  char *unwind;

   asection *seg, *save_seg;
   asection *seg, *save_seg;

-  asymbol *sym;
-  subsegT subseg, save_subseg;
-  int i, reloc;
-  char c, *p;
+  subsegT save_subseg;
+  unsigned int unwind;
+  int reloc;
+  char *p;

 
 

-  if (bfd_get_arch_info (stdoutput)->bits_per_address == 32)
-    reloc = R_PARISC_DIR32;
-  else
-    reloc = R_PARISC_SEGREL32;
-    
+  if ((bfd_get_section_flags (stdoutput, now_seg)
+       & (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
+      != (SEC_ALLOC | SEC_LOAD | SEC_READONLY))
+    return;
+
+  reloc = R_PARISC_SEGREL32;
+  save_seg = now_seg;
+  save_subseg = now_subseg;

   /* Get into the right seg/subseg.  This may involve creating
      the seg the first time through.  Make sure to have the
      old seg/subseg so that we can reset things when we are done.  */
   seg = bfd_get_section_by_name (stdoutput, UNWIND_SECTION_NAME);
   if (seg == ASEC_NULL)
     {
   /* Get into the right seg/subseg.  This may involve creating
      the seg the first time through.  Make sure to have the
      old seg/subseg so that we can reset things when we are done.  */
   seg = bfd_get_section_by_name (stdoutput, UNWIND_SECTION_NAME);
   if (seg == ASEC_NULL)
     {

-      seg = bfd_make_section_old_way (stdoutput, UNWIND_SECTION_NAME);
+      seg = subseg_new (UNWIND_SECTION_NAME, 0);

       bfd_set_section_flags (stdoutput, seg,
                             SEC_READONLY | SEC_HAS_CONTENTS
                             | SEC_LOAD | SEC_RELOC | SEC_ALLOC | SEC_DATA);
       bfd_set_section_alignment (stdoutput, seg, 2);
     }
 
       bfd_set_section_flags (stdoutput, seg,
                             SEC_READONLY | SEC_HAS_CONTENTS
                             | SEC_LOAD | SEC_RELOC | SEC_ALLOC | SEC_DATA);
       bfd_set_section_alignment (stdoutput, seg, 2);
     }
 

-  save_seg = now_seg;
-  save_subseg = now_subseg;

   subseg_set (seg, 0);
 
   subseg_set (seg, 0);
 

-

   /* Get some space to hold relocation information for the unwind
      descriptor.  */
   /* Get some space to hold relocation information for the unwind
      descriptor.  */

-  p = frag_more (4);
-  md_number_to_chars (p, 0, 4);
+  p = frag_more (16);

 
   /* Relocation info. for start offset of the function.  */
 
   /* Relocation info. for start offset of the function.  */

+  md_number_to_chars (p, 0, 4);

   fix_new_hppa (frag_now, p - frag_now->fr_literal, 4,
                call_info->start_symbol, (offsetT) 0,
                (expressionS *) NULL, 0, reloc,
   fix_new_hppa (frag_now, p - frag_now->fr_literal, 4,
                call_info->start_symbol, (offsetT) 0,
                (expressionS *) NULL, 0, reloc,

-               e_fsel, 32, 0, NULL);
-
-  p = frag_more (4);
-  md_number_to_chars (p, 0, 4);
+               e_fsel, 32, 0, 0);

 
   /* Relocation info. for end offset of the function.
 
 
   /* Relocation info. for end offset of the function.
 


@@ -4565,21 +6143,18 @@ pa_build_unwind_subspace (call_info)
      symbol into the symbol table.  It (should) end up giving the same
      value as call_info->start_symbol + function size once the linker is
      finished with its work.  */
      symbol into the symbol table.  It (should) end up giving the same
      value as call_info->start_symbol + function size once the linker is
      finished with its work.  */

-
-  fix_new_hppa (frag_now, p - frag_now->fr_literal, 4,
+  md_number_to_chars (p + 4, 0, 4);
+  fix_new_hppa (frag_now, p + 4 - frag_now->fr_literal, 4,

                call_info->end_symbol, (offsetT) 0,
                (expressionS *) NULL, 0, reloc,
                call_info->end_symbol, (offsetT) 0,
                (expressionS *) NULL, 0, reloc,

-               e_fsel, 32, 0, NULL);
+               e_fsel, 32, 0, 0);

 
 

-  /* Dump it. */
-  unwind = (char *) &call_info->ci_unwind;
-  for (i = 8; i < sizeof (struct unwind_table); i++)
-    {
-      c = *(unwind + i);
-      {
-       FRAG_APPEND_1_CHAR (c);
-      }
-    }
+  /* Dump the descriptor.  */
+  unwind = UNWIND_LOW32 (&call_info->ci_unwind.descriptor);
+  md_number_to_chars (p + 8, unwind, 4);
+
+  unwind = UNWIND_HIGH32 (&call_info->ci_unwind.descriptor);
+  md_number_to_chars (p + 12, unwind, 4);

 
   /* Return back to the original segment/subsegment.  */
   subseg_set (save_seg, save_subseg);
 
   /* Return back to the original segment/subsegment.  */
   subseg_set (save_seg, save_subseg);


@@ -4592,7 +6167,7 @@ pa_build_unwind_subspace (call_info)
 
 static void
 pa_callinfo (unused)
 
 static void
 pa_callinfo (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *p;
   int temp;
 {
   char *name, c, *p;
   int temp;


@@ -4731,21 +6306,37 @@ pa_callinfo (unused)
   demand_empty_rest_of_line ();
 }
 
   demand_empty_rest_of_line ();
 }
 

-/* Switch into the code subspace.  */
-
+#if !(defined (OBJ_ELF) && defined (TE_LINUX))
+/* Switch to the text space.  Like s_text, but delete our
+   label when finished.  */

 static void
 static void

-pa_code (unused)
-     int unused;
+pa_text (unused)
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   current_space = is_defined_space ("$TEXT$");
   current_subspace
     = pa_subsegment_to_subspace (current_space->sd_seg, 0);
 #endif
 {
 #ifdef OBJ_SOM
   current_space = is_defined_space ("$TEXT$");
   current_subspace
     = pa_subsegment_to_subspace (current_space->sd_seg, 0);
 #endif

+

   s_text (0);
   pa_undefine_label ();
 }
 
   s_text (0);
   pa_undefine_label ();
 }
 

+/* Switch to the data space.  As usual delete our label.  */
+static void
+pa_data (unused)
+     int unused ATTRIBUTE_UNUSED;
+{
+#ifdef OBJ_SOM
+  current_space = is_defined_space ("$PRIVATE$");
+  current_subspace
+    = pa_subsegment_to_subspace (current_space->sd_seg, 0);
+#endif
+  s_data (0);
+  pa_undefine_label ();
+}
+

 /* This is different than the standard GAS s_comm(). On HP9000/800 machines,
    the .comm pseudo-op has the following symtax:
 
 /* This is different than the standard GAS s_comm(). On HP9000/800 machines,
    the .comm pseudo-op has the following symtax:
 


@@ -4768,7 +6359,7 @@ pa_code (unused)
 
 static void
 pa_comm (unused)
 
 static void
 pa_comm (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   unsigned int size;
   symbolS *symbol;
 {
   unsigned int size;
   symbolS *symbol;


@@ -4795,12 +6386,13 @@ pa_comm (unused)
     }
   demand_empty_rest_of_line ();
 }
     }
   demand_empty_rest_of_line ();
 }

+#endif /* !(defined (OBJ_ELF) && defined (TE_LINUX)) */

 
 /* Process a .END pseudo-op.  */
 
 static void
 pa_end (unused)
 
 /* Process a .END pseudo-op.  */
 
 static void
 pa_end (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   demand_empty_rest_of_line ();
 }
 {
   demand_empty_rest_of_line ();
 }


@@ -4808,7 +6400,7 @@ pa_end (unused)
 /* Process a .ENTER pseudo-op.  This is not supported.  */
 static void
 pa_enter (unused)
 /* Process a .ENTER pseudo-op.  This is not supported.  */
 static void
 pa_enter (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -4823,7 +6415,7 @@ pa_enter (unused)
    procesure.  */
 static void
 pa_entry (unused)
    procesure.  */
 static void
 pa_entry (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -4852,16 +6444,39 @@ pa_entry (unused)
      denote the entry and exit points.  */
   if (last_call_info->start_symbol != NULL)
     {
      denote the entry and exit points.  */
   if (last_call_info->start_symbol != NULL)
     {

-      char *where = frag_more (0);
+      char *where;
+      unsigned int u;

 
 

+      where = frag_more (0);
+      u = UNWIND_LOW32 (&last_call_info->ci_unwind.descriptor);

       fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                    NULL, (offsetT) 0, NULL,
       fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                    NULL, (offsetT) 0, NULL,

-                   0, R_HPPA_ENTRY, e_fsel, 0, 0,
-                   (int *) &last_call_info->ci_unwind.descriptor);
+                   0, R_HPPA_ENTRY, e_fsel, 0, 0, u);

     }
 #endif
 }
 
     }
 #endif
 }
 

+/* Silly nonsense for pa_equ.  The only half-sensible use for this is
+   being able to subtract two register symbols that specify a range of
+   registers, to get the size of the range.  */
+static int fudge_reg_expressions;
+
+int
+hppa_force_reg_syms_absolute (resultP, op, rightP)
+     expressionS *resultP;
+     operatorT op ATTRIBUTE_UNUSED;
+     expressionS *rightP;
+{
+  if (fudge_reg_expressions
+      && rightP->X_op == O_register
+      && resultP->X_op == O_register)
+    {
+      rightP->X_op = O_constant;
+      resultP->X_op = O_constant;
+    }
+  return 0;  /* Continue normal expr handling.  */
+}
+

 /* Handle a .EQU pseudo-op.  */
 
 static void
 /* Handle a .EQU pseudo-op.  */
 
 static void


@@ -4875,10 +6490,32 @@ pa_equ (reg)
     {
       symbol = label_symbol->lss_label;
       if (reg)
     {
       symbol = label_symbol->lss_label;
       if (reg)

-       S_SET_VALUE (symbol, pa_parse_number (&input_line_pointer, 0));
+       {
+         strict = 1;
+         if (!pa_parse_number (&input_line_pointer, 0))
+           as_bad (_(".REG expression must be a register"));
+         S_SET_VALUE (symbol, pa_number);
+         S_SET_SEGMENT (symbol, reg_section);
+       }

       else
       else

-       S_SET_VALUE (symbol, (unsigned int) get_absolute_expression ());
-      S_SET_SEGMENT (symbol, bfd_abs_section_ptr);
+       {
+         expressionS exp;
+         segT seg;
+
+         fudge_reg_expressions = 1;
+         seg = expression (&exp);
+         fudge_reg_expressions = 0;
+         if (exp.X_op != O_constant
+             && exp.X_op != O_register)
+           {
+             if (exp.X_op != O_absent)
+               as_bad (_("bad or irreducible absolute expression; zero assumed"));
+             exp.X_add_number = 0;
+             seg = absolute_section;
+           }
+         S_SET_VALUE (symbol, (unsigned int) exp.X_add_number);
+         S_SET_SEGMENT (symbol, seg);
+       }

     }
   else
     {
     }
   else
     {


@@ -4922,7 +6559,7 @@ process_exit ()
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0,
                NULL, 0, R_HPPA_EXIT, e_fsel, 0, 0,
   fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                NULL, (offsetT) 0,
                NULL, 0, R_HPPA_EXIT, e_fsel, 0, 0,

-               (int *) &last_call_info->ci_unwind.descriptor + 1);
+               UNWIND_HIGH32 (&last_call_info->ci_unwind.descriptor));

 #endif
 }
 
 #endif
 }
 


@@ -4930,7 +6567,7 @@ process_exit ()
 
 static void
 pa_exit (unused)
 
 static void
 pa_exit (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -4963,7 +6600,7 @@ pa_exit (unused)
 
 static void
 pa_export (unused)
 
 static void
 pa_export (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *p;
   symbolS *symbol;
 {
   char *name, c, *p;
   symbolS *symbol;


@@ -4980,8 +6617,13 @@ pa_export (unused)
     }
   else
     {
     }
   else
     {

-      /* OK.  Set the external bits and process argument relocations.  */
+      /* OK.  Set the external bits and process argument relocations.
+         For the HP, weak and global are not mutually exclusive.
+         S_SET_EXTERNAL will not set BSF_GLOBAL if WEAK is set.
+         Call S_SET_EXTERNAL to get the other processing.  Manually
+         set BSF_GLOBAL when we get back.  */

       S_SET_EXTERNAL (symbol);
       S_SET_EXTERNAL (symbol);

+      symbol_get_bfdsym (symbol)->flags |= BSF_GLOBAL;

       p = input_line_pointer;
       *p = c;
       if (!is_end_of_statement ())
       p = input_line_pointer;
       *p = c;
       if (!is_end_of_statement ())


@@ -5004,13 +6646,13 @@ pa_type_args (symbolP, is_export)
   char *name, c, *p;
   unsigned int temp, arg_reloc;
   pa_symbol_type type = SYMBOL_TYPE_UNKNOWN;
   char *name, c, *p;
   unsigned int temp, arg_reloc;
   pa_symbol_type type = SYMBOL_TYPE_UNKNOWN;

-  obj_symbol_type *symbol = (obj_symbol_type *) symbol_get_bfdsym (symbolP);
+  asymbol *bfdsym = symbol_get_bfdsym (symbolP);

 
   if (strncasecmp (input_line_pointer, "absolute", 8) == 0)
 
     {
       input_line_pointer += 8;
 
   if (strncasecmp (input_line_pointer, "absolute", 8) == 0)
 
     {
       input_line_pointer += 8;

-      symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
+      bfdsym->flags &= ~BSF_FUNCTION;

       S_SET_SEGMENT (symbolP, bfd_abs_section_ptr);
       type = SYMBOL_TYPE_ABSOLUTE;
     }
       S_SET_SEGMENT (symbolP, bfd_abs_section_ptr);
       type = SYMBOL_TYPE_ABSOLUTE;
     }


@@ -5029,49 +6671,58 @@ pa_type_args (symbolP, is_export)
            as_tsktsk (_("Using ENTRY rather than CODE in export directive for %s"),
                       S_GET_NAME (symbolP));
 
            as_tsktsk (_("Using ENTRY rather than CODE in export directive for %s"),
                       S_GET_NAME (symbolP));
 

-         symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
+         bfdsym->flags |= BSF_FUNCTION;

          type = SYMBOL_TYPE_ENTRY;
        }
       else
        {
          type = SYMBOL_TYPE_ENTRY;
        }
       else
        {

-         symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
+         bfdsym->flags &= ~BSF_FUNCTION;

          type = SYMBOL_TYPE_CODE;
        }
     }
   else if (strncasecmp (input_line_pointer, "data", 4) == 0)
     {
       input_line_pointer += 4;
          type = SYMBOL_TYPE_CODE;
        }
     }
   else if (strncasecmp (input_line_pointer, "data", 4) == 0)
     {
       input_line_pointer += 4;

-      symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
+      bfdsym->flags &= ~BSF_FUNCTION;
+      bfdsym->flags |= BSF_OBJECT;

       type = SYMBOL_TYPE_DATA;
     }
   else if ((strncasecmp (input_line_pointer, "entry", 5) == 0))
     {
       input_line_pointer += 5;
       type = SYMBOL_TYPE_DATA;
     }
   else if ((strncasecmp (input_line_pointer, "entry", 5) == 0))
     {
       input_line_pointer += 5;

-      symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
+      bfdsym->flags |= BSF_FUNCTION;

       type = SYMBOL_TYPE_ENTRY;
     }
   else if (strncasecmp (input_line_pointer, "millicode", 9) == 0)
     {
       input_line_pointer += 9;
       type = SYMBOL_TYPE_ENTRY;
     }
   else if (strncasecmp (input_line_pointer, "millicode", 9) == 0)
     {
       input_line_pointer += 9;

-      symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
+      bfdsym->flags |= BSF_FUNCTION;
+#ifdef OBJ_ELF
+      {
+       elf_symbol_type *elfsym = (elf_symbol_type *) bfdsym;
+       elfsym->internal_elf_sym.st_info =
+         ELF_ST_INFO (ELF_ST_BIND (elfsym->internal_elf_sym.st_info),
+                      STT_PARISC_MILLI);
+      }
+#endif

       type = SYMBOL_TYPE_MILLICODE;
     }
   else if (strncasecmp (input_line_pointer, "plabel", 6) == 0)
     {
       input_line_pointer += 6;
       type = SYMBOL_TYPE_MILLICODE;
     }
   else if (strncasecmp (input_line_pointer, "plabel", 6) == 0)
     {
       input_line_pointer += 6;

-      symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
+      bfdsym->flags &= ~BSF_FUNCTION;

       type = SYMBOL_TYPE_PLABEL;
     }
   else if (strncasecmp (input_line_pointer, "pri_prog", 8) == 0)
     {
       input_line_pointer += 8;
       type = SYMBOL_TYPE_PLABEL;
     }
   else if (strncasecmp (input_line_pointer, "pri_prog", 8) == 0)
     {
       input_line_pointer += 8;

-      symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
+      bfdsym->flags |= BSF_FUNCTION;

       type = SYMBOL_TYPE_PRI_PROG;
     }
   else if (strncasecmp (input_line_pointer, "sec_prog", 8) == 0)
     {
       input_line_pointer += 8;
       type = SYMBOL_TYPE_PRI_PROG;
     }
   else if (strncasecmp (input_line_pointer, "sec_prog", 8) == 0)
     {
       input_line_pointer += 8;

-      symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
+      bfdsym->flags |= BSF_FUNCTION;

       type = SYMBOL_TYPE_SEC_PROG;
     }
 
       type = SYMBOL_TYPE_SEC_PROG;
     }
 


@@ -5079,7 +6730,7 @@ pa_type_args (symbolP, is_export)
      than BFD understands.  This is how we get this information
      to the SOM BFD backend.  */
 #ifdef obj_set_symbol_type
      than BFD understands.  This is how we get this information
      to the SOM BFD backend.  */
 #ifdef obj_set_symbol_type

-  obj_set_symbol_type (symbol_get_bfdsym (symbolP), (int) type);
+  obj_set_symbol_type (bfdsym, (int) type);

 #endif
 
   /* Now that the type of the exported symbol has been handled,
 #endif
 
   /* Now that the type of the exported symbol has been handled,


@@ -5100,8 +6751,8 @@ pa_type_args (symbolP, is_export)
          name = input_line_pointer;
          c = get_symbol_end ();
          arg_reloc = pa_align_arg_reloc (temp, pa_build_arg_reloc (name));
          name = input_line_pointer;
          c = get_symbol_end ();
          arg_reloc = pa_align_arg_reloc (temp, pa_build_arg_reloc (name));

-#ifdef OBJ_SOM
-         symbol->tc_data.ap.hppa_arg_reloc |= arg_reloc;
+#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC)
+         symbol_arg_reloc_info (symbolP) |= arg_reloc;

 #endif
          *input_line_pointer = c;
        }
 #endif
          *input_line_pointer = c;
        }


@@ -5114,8 +6765,8 @@ pa_type_args (symbolP, is_export)
          name = input_line_pointer;
          c = get_symbol_end ();
          arg_reloc = pa_build_arg_reloc (name);
          name = input_line_pointer;
          c = get_symbol_end ();
          arg_reloc = pa_build_arg_reloc (name);

-#ifdef OBJ_SOM
-         symbol->tc_data.ap.hppa_arg_reloc |= arg_reloc;
+#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC)
+         symbol_arg_reloc_info (symbolP) |= arg_reloc;

 #endif
          *input_line_pointer = c;
        }
 #endif
          *input_line_pointer = c;
        }


@@ -5127,7 +6778,7 @@ pa_type_args (symbolP, is_export)
          input_line_pointer++;
          temp = atoi (input_line_pointer);
 #ifdef OBJ_SOM
          input_line_pointer++;
          temp = atoi (input_line_pointer);
 #ifdef OBJ_SOM

-         symbol->tc_data.ap.hppa_priv_level = temp;
+         ((obj_symbol_type *) bfdsym)->tc_data.ap.hppa_priv_level = temp;

 #endif
          c = get_symbol_end ();
          *input_line_pointer = c;
 #endif
          c = get_symbol_end ();
          *input_line_pointer = c;


@@ -5149,7 +6800,7 @@ pa_type_args (symbolP, is_export)
 
 static void
 pa_import (unused)
 
 static void
 pa_import (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *p;
   symbolS *symbol;
 {
   char *name, c, *p;
   symbolS *symbol;


@@ -5201,7 +6852,7 @@ pa_import (unused)
 
 static void
 pa_label (unused)
 
 static void
 pa_label (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *p;
 
 {
   char *name, c, *p;
 


@@ -5231,7 +6882,7 @@ pa_label (unused)
 
 static void
 pa_leave (unused)
 
 static void
 pa_leave (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -5246,7 +6897,7 @@ pa_leave (unused)
 
 static void
 pa_level (unused)
 
 static void
 pa_level (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *level;
 
 {
   char *level;
 


@@ -5287,7 +6938,7 @@ pa_level (unused)
 
 static void
 pa_origin (unused)
 
 static void
 pa_origin (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -5303,7 +6954,7 @@ pa_origin (unused)
 
 static void
 pa_param (unused)
 
 static void
 pa_param (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *p;
   symbolS *symbol;
 {
   char *name, c, *p;
   symbolS *symbol;


@@ -5334,11 +6985,11 @@ pa_param (unused)
 }
 
 /* Handle a .PROC pseudo-op.  It is used to mark the beginning
 }
 
 /* Handle a .PROC pseudo-op.  It is used to mark the beginning

-   of a procedure from a syntatical point of view.  */
+   of a procedure from a syntactical point of view.  */

 
 static void
 pa_proc (unused)
 
 static void
 pa_proc (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   struct call_info *call_info;
 
 {
   struct call_info *call_info;
 


@@ -5408,7 +7059,7 @@ pa_proc (unused)
 
 static void
 pa_procend (unused)
 
 static void
 pa_procend (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 
 #ifdef OBJ_SOM
 {
 
 #ifdef OBJ_SOM


@@ -5439,12 +7090,14 @@ pa_procend (unused)
                 information when the label appears after the proc/procend.  */
              if (within_entry_exit)
                {
                 information when the label appears after the proc/procend.  */
              if (within_entry_exit)
                {

-                 char *where = frag_more (0);
+                 char *where;
+                 unsigned int u;

 
 

+                 where = frag_more (0);
+                 u = UNWIND_LOW32 (&last_call_info->ci_unwind.descriptor);

                  fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                                NULL, (offsetT) 0, NULL,
                  fix_new_hppa (frag_now, where - frag_now->fr_literal, 0,
                                NULL, (offsetT) 0, NULL,

-                               0, R_HPPA_ENTRY, e_fsel, 0, 0,
-                               (int *) &last_call_info->ci_unwind.descriptor);
+                               0, R_HPPA_ENTRY, e_fsel, 0, 0, u);

                }
 #endif
            }
                }
 #endif
            }


@@ -5475,6 +7128,7 @@ pa_procend (unused)
   pa_undefine_label ();
 }
 
   pa_undefine_label ();
 }
 

+#ifdef OBJ_SOM

 /* If VALUE is an exact power of two between zero and 2^31, then
    return log2 (VALUE).  Else return -1.  */
 
 /* If VALUE is an exact power of two between zero and 2^31, then
    return log2 (VALUE).  Else return -1.  */
 


@@ -5493,8 +7147,6 @@ log2 (value)
     return shift;
 }
 
     return shift;
 }
 

-
-#ifdef OBJ_SOM

 /* Check to make sure we have a valid space and subspace.  */
 
 static void
 /* Check to make sure we have a valid space and subspace.  */
 
 static void


@@ -5518,7 +7170,7 @@ pa_parse_space_stmt (space_name, create_flag)
 {
   char *name, *ptemp, c;
   char loadable, defined, private, sort;
 {
   char *name, *ptemp, c;
   char loadable, defined, private, sort;

-  int spnum, temp;
+  int spnum;

   asection *seg = NULL;
   sd_chain_struct *space;
 
   asection *seg = NULL;
   sd_chain_struct *space;
 


@@ -5552,10 +7204,11 @@ pa_parse_space_stmt (space_name, create_flag)
       /* First see if the space was specified as a number rather than
          as a name.  According to the PA assembly manual the rest of
          the line should be ignored.  */
       /* First see if the space was specified as a number rather than
          as a name.  According to the PA assembly manual the rest of
          the line should be ignored.  */

-      temp = pa_parse_number (&ptemp, 0);
-      if (temp >= 0)
+      strict = 0;
+      pa_parse_number (&ptemp, 0);
+      if (pa_number >= 0)

        {
        {

-         spnum = temp;
+         spnum = pa_number;

          input_line_pointer = ptemp;
        }
       else
          input_line_pointer = ptemp;
        }
       else


@@ -5634,10 +7287,9 @@ pa_parse_space_stmt (space_name, create_flag)
 
 static void
 pa_space (unused)
 
 static void
 pa_space (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name, c, *space_name, *save_s;
 {
   char *name, c, *space_name, *save_s;

-  int temp;

   sd_chain_struct *sd_chain;
 
   if (within_procedure)
   sd_chain_struct *sd_chain;
 
   if (within_procedure)


@@ -5715,9 +7367,11 @@ pa_space (unused)
       /* It could be a space specified by number.  */
       print_errors = 0;
       save_s = input_line_pointer;
       /* It could be a space specified by number.  */
       print_errors = 0;
       save_s = input_line_pointer;

-      if ((temp = pa_parse_number (&input_line_pointer, 0)) >= 0)
+      strict = 0;
+      pa_parse_number (&input_line_pointer, 0);
+      if (pa_number >= 0)

        {
        {

-         if ((sd_chain = pa_find_space_by_number (temp)))
+         if ((sd_chain = pa_find_space_by_number (pa_number)))

            {
              current_space = sd_chain;
 
            {
              current_space = sd_chain;
 


@@ -5753,7 +7407,7 @@ pa_space (unused)
 
 static void
 pa_spnum (unused)
 
 static void
 pa_spnum (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   char *name;
   char c;
 {
   char *name;
   char c;


@@ -6002,7 +7656,6 @@ pa_subspace (create_new)
   SUBSPACE_DEFINED (current_subspace) = 1;
 }
 
   SUBSPACE_DEFINED (current_subspace) = 1;
 }
 

-

 /* Create default space and subspace dictionaries.  */
 
 static void
 /* Create default space and subspace dictionaries.  */
 
 static void


@@ -6045,7 +7698,6 @@ pa_spaces_begin ()
       /* Create the new section.  */
       segment = subseg_new (name, subsegment);
 
       /* Create the new section.  */
       segment = subseg_new (name, subsegment);
 

-

       /* For SOM we want to replace the standard .text, .data, and .bss
          sections with our own.   We also want to set BFD flags for
         all the built-in subspaces.  */
       /* For SOM we want to replace the standard .text, .data, and .bss
          sections with our own.   We also want to set BFD flags for
         all the built-in subspaces.  */


@@ -6068,7 +7720,6 @@ pa_spaces_begin ()
                                               | SEC_RELOC
                                               | SEC_HAS_CONTENTS));
 
                                               | SEC_RELOC
                                               | SEC_HAS_CONTENTS));
 

-

        }
       else if (!strcmp (pa_def_subspaces[i].name, "$BSS$"))
        {
        }
       else if (!strcmp (pa_def_subspaces[i].name, "$BSS$"))
        {


@@ -6130,8 +7781,6 @@ pa_spaces_begin ()
     }
 }
 
     }
 }
 

-
-

 /* Create a new space NAME, with the appropriate flags as defined
    by the given parameters.  */
 
 /* Create a new space NAME, with the appropriate flags as defined
    by the given parameters.  */
 


@@ -6496,11 +8145,6 @@ pa_stringer_aux (s)
 {
   unsigned int c = *s & CHAR_MASK;
 
 {
   unsigned int c = *s & CHAR_MASK;
 

-#ifdef OBJ_SOM
-  /* We must have a valid space and subspace.  */
-  pa_check_current_space_and_subspace ();
-#endif
-

   switch (c)
     {
     case '\"':
   switch (c)
     {
     case '\"':


@@ -6523,9 +8167,14 @@ pa_stringer (append_zero)
   int i;
 
   /* Preprocess the string to handle PA-specific escape sequences.
   int i;
 
   /* Preprocess the string to handle PA-specific escape sequences.

-     For example, \xDD where DD is a hexidecimal number should be
+     For example, \xDD where DD is a hexadecimal number should be

      changed to \OOO where OOO is an octal number.  */
 
      changed to \OOO where OOO is an octal number.  */
 

+#ifdef OBJ_SOM
+  /* We must have a valid space and subspace.  */
+  pa_check_current_space_and_subspace ();
+#endif
+

   /* Skip the opening quote.  */
   s = input_line_pointer + 1;
 
   /* Skip the opening quote.  */
   s = input_line_pointer + 1;
 


@@ -6544,15 +8193,15 @@ pa_stringer (append_zero)
                char dg;
                char *s_start = s;
 
                char dg;
                char *s_start = s;
 

-               /* Get pas the 'x'.  */
+               /* Get past the 'x'.  */

                s++;
                for (num_digit = 0, number = 0, dg = *s;
                     num_digit < 2
                s++;
                for (num_digit = 0, number = 0, dg = *s;
                     num_digit < 2

-                    && (isdigit (dg) || (dg >= 'a' && dg <= 'f')
+                    && (ISDIGIT (dg) || (dg >= 'a' && dg <= 'f')

                         || (dg >= 'A' && dg <= 'F'));
                     num_digit++)
                  {
                         || (dg >= 'A' && dg <= 'F'));
                     num_digit++)
                  {

-                   if (isdigit (dg))
+                   if (ISDIGIT (dg))

                      number = number * 16 + dg - '0';
                    else if (dg >= 'a' && dg <= 'f')
                      number = number * 16 + dg - 'a' + 10;
                      number = number * 16 + dg - '0';
                    else if (dg >= 'a' && dg <= 'f')
                      number = number * 16 + dg - 'a' + 10;


@@ -6593,7 +8242,7 @@ pa_stringer (append_zero)
 
 static void
 pa_version (unused)
 
 static void
 pa_version (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   obj_version (0);
   pa_undefine_label ();
 {
   obj_version (0);
   pa_undefine_label ();


@@ -6605,7 +8254,7 @@ pa_version (unused)
 
 static void
 pa_compiler (unused)
 
 static void
 pa_compiler (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   obj_som_compiler (0);
   pa_undefine_label ();
 {
   obj_som_compiler (0);
   pa_undefine_label ();


@@ -6617,7 +8266,7 @@ pa_compiler (unused)
 
 static void
 pa_copyright (unused)
 
 static void
 pa_copyright (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
   obj_copyright (0);
   pa_undefine_label ();
 {
   obj_copyright (0);
   pa_undefine_label ();


@@ -6634,21 +8283,6 @@ pa_cons (nbytes)
   pa_undefine_label ();
 }
 
   pa_undefine_label ();
 }
 

-/* Switch to the data space.  As usual delete our label.  */
-
-static void
-pa_data (unused)
-     int unused;
-{
-#ifdef OBJ_SOM
-  current_space = is_defined_space ("$PRIVATE$");
-  current_subspace
-    = pa_subsegment_to_subspace (current_space->sd_seg, 0);
-#endif
-  s_data (0);
-  pa_undefine_label ();
-}
-

 /* Like float_cons, but we need to undefine our label.  */
 
 static void
 /* Like float_cons, but we need to undefine our label.  */
 
 static void


@@ -6663,7 +8297,7 @@ pa_float_cons (float_type)
 
 static void
 pa_fill (unused)
 
 static void
 pa_fill (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -6693,7 +8327,7 @@ pa_lcomm (needs_align)
 
 static void
 pa_lsym (unused)
 
 static void
 pa_lsym (unused)

-     int unused;
+     int unused ATTRIBUTE_UNUSED;

 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */
 {
 #ifdef OBJ_SOM
   /* We must have a valid space and subspace.  */


@@ -6704,22 +8338,6 @@ pa_lsym (unused)
   pa_undefine_label ();
 }
 
   pa_undefine_label ();
 }
 

-/* Switch to the text space.  Like s_text, but delete our
-   label when finished.  */
-static void
-pa_text (unused)
-     int unused;
-{
-#ifdef OBJ_SOM
-  current_space = is_defined_space ("$TEXT$");
-  current_subspace
-    = pa_subsegment_to_subspace (current_space->sd_seg, 0);
-#endif
-
-  s_text (0);
-  pa_undefine_label ();
-}
-

 /* On the PA relocations which involve function symbols must not be
    adjusted.  This so that the linker can know when/how to create argument
    relocation stubs for indirect calls and calls to static functions.
 /* On the PA relocations which involve function symbols must not be
    adjusted.  This so that the linker can know when/how to create argument
    relocation stubs for indirect calls and calls to static functions.


@@ -6739,7 +8357,7 @@ pa_text (unused)
    selectors).
 
    Reject reductions involving symbols with external scope; such
    selectors).
 
    Reject reductions involving symbols with external scope; such

-   reductions make life a living hell for object file editors. 
+   reductions make life a living hell for object file editors.

 
    FIXME.  Also reject R_HPPA relocations which are 32bits wide in
    the code space.  The SOM BFD backend doesn't know how to pull the
 
    FIXME.  Also reject R_HPPA relocations which are 32bits wide in
    the code space.  The SOM BFD backend doesn't know how to pull the


@@ -6757,9 +8375,20 @@ hppa_fix_adjustable (fixp)
   /* Reject reductions of symbols in 32bit relocs.  */
   if (fixp->fx_r_type == R_HPPA && hppa_fix->fx_r_format == 32)
     return 0;
   /* Reject reductions of symbols in 32bit relocs.  */
   if (fixp->fx_r_type == R_HPPA && hppa_fix->fx_r_format == 32)
     return 0;

+#endif
+
+#ifdef OBJ_ELF
+  if (fixp->fx_r_type == (int) R_PARISC_GNU_VTINHERIT
+      || fixp->fx_r_type ==  (int) R_PARISC_GNU_VTENTRY)
+    return 0;
+#endif
+
+  if (fixp->fx_addsy && (S_IS_EXTERNAL (fixp->fx_addsy)
+                        || S_IS_WEAK (fixp->fx_addsy)))
+    return 0;

 
   /* Reject reductions of symbols in sym1-sym2 expressions when
 
   /* Reject reductions of symbols in sym1-sym2 expressions when

-     the fixup will occur in a CODE subspace. 
+     the fixup will occur in a CODE subspace.

 
      XXX FIXME: Long term we probably want to reject all of these;
      for example reducing in the debug section would lose if we ever
 
      XXX FIXME: Long term we probably want to reject all of these;
      for example reducing in the debug section would lose if we ever


@@ -6774,12 +8403,39 @@ hppa_fix_adjustable (fixp)
     }
 
   /* We can't adjust any relocs that use LR% and RR% field selectors.
     }
 
   /* We can't adjust any relocs that use LR% and RR% field selectors.

-     That confuses the HP linker.  */
+
+     If a symbol is reduced to a section symbol, the assembler will
+     adjust the addend unless the symbol happens to reside right at
+     the start of the section.  Additionally, the linker has no choice
+     but to manipulate the addends when coalescing input sections for
+     "ld -r".  Since an LR% field selector is defined to round the
+     addend, we can't change the addend without risking that a LR% and
+     it's corresponding (possible multiple) RR% field will no longer
+     sum to the right value.
+
+     eg. Suppose we have
+     .         ldil    LR%foo+0,%r21
+     .         ldw     RR%foo+0(%r21),%r26
+     .         ldw     RR%foo+4(%r21),%r25
+
+     If foo is at address 4092 (decimal) in section `sect', then after
+     reducing to the section symbol we get
+     .                 LR%sect+4092 == (L%sect)+0
+     .                 RR%sect+4092 == (R%sect)+4092
+     .                 RR%sect+4096 == (R%sect)-4096
+     and the last address loses because rounding the addend to 8k
+     mutiples takes us up to 8192 with an offset of -4096.
+
+     In cases where the LR% expression is identical to the RR% one we
+     will never have a problem, but is so happens that gcc rounds
+     addends involved in LR% field selectors to work around a HP
+     linker bug.  ie. We often have addresses like the last case
+     above where the LR% expression is offset from the RR% one.  */
+

   if (hppa_fix->fx_r_field == e_lrsel
       || hppa_fix->fx_r_field == e_rrsel
       || hppa_fix->fx_r_field == e_nlrsel)
     return 0;
   if (hppa_fix->fx_r_field == e_lrsel
       || hppa_fix->fx_r_field == e_rrsel
       || hppa_fix->fx_r_field == e_nlrsel)
     return 0;

-#endif

 
   /* Reject reductions of symbols in DLT relative relocs,
      relocations with plabels.  */
 
   /* Reject reductions of symbols in DLT relative relocs,
      relocations with plabels.  */


@@ -6791,18 +8447,15 @@ hppa_fix_adjustable (fixp)
       || hppa_fix->fx_r_field == e_lpsel)
     return 0;
 
       || hppa_fix->fx_r_field == e_lpsel)
     return 0;
 

-  if (fixp->fx_addsy && S_IS_EXTERNAL (fixp->fx_addsy))
-    return 0;
-

   /* Reject absolute calls (jumps).  */
   if (hppa_fix->fx_r_type == R_HPPA_ABS_CALL)
     return 0;
 
   /* Reject reductions of function symbols.  */
   /* Reject absolute calls (jumps).  */
   if (hppa_fix->fx_r_type == R_HPPA_ABS_CALL)
     return 0;
 
   /* Reject reductions of function symbols.  */

-  if (fixp->fx_addsy == 0 || ! S_IS_FUNCTION (fixp->fx_addsy))
-    return 1;
+  if (fixp->fx_addsy != 0 && S_IS_FUNCTION (fixp->fx_addsy))
+    return 0;

 
 

-  return 0;
+  return 1;

 }
 
 /* Return nonzero if the fixup in FIXP will require a relocation,
 }
 
 /* Return nonzero if the fixup in FIXP will require a relocation,


@@ -6811,46 +8464,61 @@ hppa_fix_adjustable (fixp)
 
 int
 hppa_force_relocation (fixp)
 
 int
 hppa_force_relocation (fixp)

-     fixS *fixp;
+     struct fix *fixp;

 {
   struct hppa_fix_struct *hppa_fixp;
 {
   struct hppa_fix_struct *hppa_fixp;

-  int distance;

 
   hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
 #ifdef OBJ_SOM
 
   hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data;
 #ifdef OBJ_SOM

-  if (fixp->fx_r_type == R_HPPA_ENTRY || fixp->fx_r_type == R_HPPA_EXIT
-      || fixp->fx_r_type == R_HPPA_BEGIN_BRTAB
-      || fixp->fx_r_type == R_HPPA_END_BRTAB
-      || fixp->fx_r_type == R_HPPA_BEGIN_TRY
-      || fixp->fx_r_type == R_HPPA_END_TRY
+  if (fixp->fx_r_type == (int) R_HPPA_ENTRY
+      || fixp->fx_r_type == (int) R_HPPA_EXIT
+      || fixp->fx_r_type == (int) R_HPPA_BEGIN_BRTAB
+      || fixp->fx_r_type == (int) R_HPPA_END_BRTAB
+      || fixp->fx_r_type == (int) R_HPPA_BEGIN_TRY
+      || fixp->fx_r_type == (int) R_HPPA_END_TRY

       || (fixp->fx_addsy != NULL && fixp->fx_subsy != NULL
          && (hppa_fixp->segment->flags & SEC_CODE) != 0))
     return 1;
 #endif
       || (fixp->fx_addsy != NULL && fixp->fx_subsy != NULL
          && (hppa_fixp->segment->flags & SEC_CODE) != 0))
     return 1;
 #endif

+#ifdef OBJ_ELF
+  if (fixp->fx_r_type == (int) R_PARISC_GNU_VTINHERIT
+      || fixp->fx_r_type == (int) R_PARISC_GNU_VTENTRY)
+    return 1;
+#endif

 
 

-#define arg_reloc_stub_needed(CALLER, CALLEE) \
-  ((CALLEE) && (CALLER) && ((CALLEE) != (CALLER)))
+  assert (fixp->fx_addsy != NULL);
+
+  /* Ensure we emit a relocation for global symbols so that dynamic
+     linking works.  */
+  if (S_IS_EXTERNAL (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy))
+    return 1;

 
 

-#ifdef OBJ_SOM

   /* It is necessary to force PC-relative calls/jumps to have a relocation
      entry if they're going to need either a argument relocation or long
   /* It is necessary to force PC-relative calls/jumps to have a relocation
      entry if they're going to need either a argument relocation or long

-     call stub.  FIXME.  Can't we need the same for absolute calls?  */
-  if (fixp->fx_pcrel && fixp->fx_addsy
-      && (arg_reloc_stub_needed ((long) ((obj_symbol_type *)
-       symbol_get_bfdsym (fixp->fx_addsy))->tc_data.ap.hppa_arg_reloc,
-       hppa_fixp->fx_arg_reloc)))
+     call stub.  */
+  if (fixp->fx_pcrel
+      && arg_reloc_stub_needed (symbol_arg_reloc_info (fixp->fx_addsy),
+                               hppa_fixp->fx_arg_reloc))

     return 1;
     return 1;

+
+  /* Now check to see if we're going to need a long-branch stub.  */
+  if (fixp->fx_r_type == (int) R_HPPA_PCREL_CALL)
+    {
+      valueT distance;
+
+      distance = (fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy)
+                 - md_pcrel_from (fixp) - 8);
+      if (distance + 8388608 >= 16777216
+         || (hppa_fixp->fx_r_format == 17 && distance + 262144 >= 524288)
+#ifdef OBJ_ELF
+         || (hppa_fixp->fx_r_format == 12 && distance + 8192 >= 16384)

 #endif
 #endif

-  distance = (fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy)
-             - md_pcrel_from (fixp));
-  /* Now check and see if we're going to need a long-branch stub.  */
-  if (fixp->fx_r_type == R_HPPA_PCREL_CALL
-      && (distance > 262143 || distance < -262144))
-    return 1;
+         )
+       return 1;
+    }

 
 

-  if (fixp->fx_r_type == R_HPPA_ABS_CALL)
+  if (fixp->fx_r_type == (int) R_HPPA_ABS_CALL)

     return 1;
     return 1;

-#undef arg_reloc_stub_needed

 
   /* No need (yet) to force another relocations to be emitted.  */
   return 0;
 
   /* No need (yet) to force another relocations to be emitted.  */
   return 0;


@@ -6866,10 +8534,18 @@ hppa_elf_mark_end_of_function ()
 {
   /* ELF does not have EXIT relocations.  All we do is create a
      temporary symbol marking the end of the function.  */
 {
   /* ELF does not have EXIT relocations.  All we do is create a
      temporary symbol marking the end of the function.  */

-  char *name = (char *)
-    xmalloc (strlen ("L$\001end_") +
-            strlen (S_GET_NAME (last_call_info->start_symbol)) + 1);
+  char *name;
+
+  if (last_call_info == NULL || last_call_info->start_symbol == NULL)
+    {
+      /* We have already warned about a missing label,
+        or other problems.  */
+      return;
+    }

 
 

+  name = (char *) xmalloc (strlen ("L$\001end_")
+                          + strlen (S_GET_NAME (last_call_info->start_symbol))
+                          + 1);

   if (name)
     {
       symbolS *symbolP;
   if (name)
     {
       symbolS *symbolP;


@@ -6934,4 +8610,48 @@ elf_hppa_final_processing ()
        - S_GET_VALUE (call_info_pointer->start_symbol) + 4;
     }
 }
        - S_GET_VALUE (call_info_pointer->start_symbol) + 4;
     }
 }

+
+static void
+pa_vtable_entry (ignore)
+     int ignore ATTRIBUTE_UNUSED;
+{
+  struct fix *new_fix;
+
+  new_fix = obj_elf_vtable_entry (0);
+
+  if (new_fix)
+    {
+      struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *)
+       obstack_alloc (&notes, sizeof (struct hppa_fix_struct));
+      hppa_fix->fx_r_type = R_HPPA;
+      hppa_fix->fx_r_field = e_fsel;
+      hppa_fix->fx_r_format = 32;
+      hppa_fix->fx_arg_reloc = 0;
+      hppa_fix->segment = now_seg;
+      new_fix->tc_fix_data = (void *) hppa_fix;
+      new_fix->fx_r_type = (int) R_PARISC_GNU_VTENTRY;
+    }
+}
+
+static void
+pa_vtable_inherit (ignore)
+     int ignore ATTRIBUTE_UNUSED;
+{
+  struct fix *new_fix;
+
+  new_fix = obj_elf_vtable_inherit (0);
+
+  if (new_fix)
+    {
+      struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *)
+       obstack_alloc (&notes, sizeof (struct hppa_fix_struct));
+      hppa_fix->fx_r_type = R_HPPA;
+      hppa_fix->fx_r_field = e_fsel;
+      hppa_fix->fx_r_format = 32;
+      hppa_fix->fx_arg_reloc = 0;
+      hppa_fix->segment = now_seg;
+      new_fix->tc_fix_data = (void *) hppa_fix;
+      new_fix->fx_r_type = (int) R_PARISC_GNU_VTINHERIT;
+    }
+}

 #endif
 #endif