X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-hppa.c;h=71968c0383d5f25ce27181fc0dbd25f9a6e19385;hb=a540244da620e3f71fe4c20b0a24ad60751b6639;hp=63e87b41b0edac3b0bd673b4e5e3ca8b16543f14;hpb=65fab780c5f93a6d2783a5b0a2689e5eaf1a52c1;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 63e87b41b0..71968c0383 100644 --- a/gas/config/tc-hppa.c +++ b/gas/config/tc-hppa.c @@ -1,6 +1,6 @@ /* tc-hppa.c -- Assemble for the PA - Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999 - Free Software Foundation, Inc. + Copyright 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,21 +16,18 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ /* HP PA-RISC support was contributed by the Center for Software Science at the University of Utah. */ -#include -#include - #include "as.h" +#include "safe-ctype.h" #include "subsegs.h" +#include "dw2gencfi.h" #include "bfd/libhppa.h" -#include "bfd/libbfd.h" /* Be careful, this file includes data *declarations*. */ #include "opcode/hppa.h" @@ -44,23 +41,25 @@ error only one of OBJ_ELF and OBJ_SOM can be defined then we want to use the assembler support for compact line numbers. */ #ifdef OBJ_ELF #include "dwarf2dbg.h" -struct dwarf2_line_info debug_line; -#endif -/* A "convient" place to put object file dependencies which do +/* A "convenient" 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. */ -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; +#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 +#define elf_hppa_reloc_final_type elf64_hppa_reloc_final_type #else #define hppa_gen_reloc_type _bfd_elf32_hppa_gen_reloc_type +#define elf_hppa_reloc_final_type elf32_hppa_reloc_final_type #endif /* ELF objects can have versions, but apparently do not have anywhere @@ -69,7 +68,7 @@ typedef elf_symbol_type obj_symbol_type; #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. */ @@ -90,12 +89,13 @@ typedef int reloc_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 -#endif #ifndef R_N0SEL #define R_N0SEL 0xd8 @@ -104,6 +104,13 @@ typedef som_symbol_type obj_symbol_type; #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. */ @@ -133,6 +140,31 @@ struct unwind_desc 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 @@ -219,7 +251,7 @@ struct pa_it /* 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; @@ -230,7 +262,6 @@ struct pa_it /* PA-89 floating point registers are arranged like this: - +--------------+--------------+ | 0 or 16L | 16 or 16R | +--------------+--------------+ @@ -247,23 +278,7 @@ struct pa_it | 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 @@ -347,6 +362,9 @@ struct default_subspace_dict /* Nonzero if this subspace contains only code. */ char code_only; + /* Nonzero if this is a comdat subspace. */ + char comdat; + /* Nonzero if this is a common subspace. */ char common; @@ -438,7 +456,7 @@ struct hppa_fix_struct int fx_r_format; /* Argument relocation bits. */ - long fx_arg_reloc; + unsigned int fx_arg_reloc; /* The segment this fixup appears in. */ segT segment; @@ -471,111 +489,45 @@ struct selector_entry /* Prototypes for functions local to tc-hppa.c. */ #ifdef OBJ_SOM -static void pa_check_current_space_and_subspace PARAMS ((void)); +static void pa_check_current_space_and_subspace (void); #endif -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_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 int pa_get_absolute_expression PARAMS ((struct pa_it *, char **)); -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 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 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_entry PARAMS ((int)); -static void pa_equ PARAMS ((int)); -static void pa_exit PARAMS ((int)); -static void pa_export PARAMS ((int)); -static void pa_type_args PARAMS ((symbolS *, int)); -static void pa_import PARAMS ((int)); -static void pa_label PARAMS ((int)); -static void pa_leave PARAMS ((int)); -static void pa_level PARAMS ((int)); -static void pa_origin PARAMS ((int)); -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 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 label_symbol_struct *pa_get_label PARAMS ((void)); +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) +static void pa_text (int); +static void pa_data (int); +static void pa_comm (int); +#endif #ifdef OBJ_SOM -static void pa_compiler PARAMS ((int)); -static void pa_align PARAMS ((int)); -static void pa_space PARAMS ((int)); -static void pa_spnum PARAMS ((int)); -static void pa_subspace PARAMS ((int)); -static sd_chain_struct *create_new_space PARAMS ((char *, int, int, +static int exact_log2 (int); +static void pa_compiler (int); +static void pa_align (int); +static void pa_space (int); +static void pa_spnum (int); +static void pa_subspace (int); +static sd_chain_struct *create_new_space (char *, int, int, int, int, int, - asection *, int)); -static ssd_chain_struct *create_new_subspace PARAMS ((sd_chain_struct *, + asection *, int); +static ssd_chain_struct *create_new_subspace (sd_chain_struct *, char *, int, int, - int, int, int, int, int, int, int, - int, asection *)); -static ssd_chain_struct *update_subspace PARAMS ((sd_chain_struct *, + int, int, int, int, + int, asection *); +static ssd_chain_struct *update_subspace (sd_chain_struct *, char *, int, int, int, int, int, int, int, - int, int, int, - asection *)); -static sd_chain_struct *is_defined_space PARAMS ((char *)); -static ssd_chain_struct *is_defined_subspace PARAMS ((char *)); -static sd_chain_struct *pa_segment_to_space PARAMS ((asection *)); -static ssd_chain_struct *pa_subsegment_to_subspace PARAMS ((asection *, - subsegT)); -static sd_chain_struct *pa_find_space_by_number PARAMS ((int)); -static unsigned int pa_subspace_start PARAMS ((sd_chain_struct *, int)); -static sd_chain_struct *pa_parse_space_stmt PARAMS ((char *, int)); -static int pa_next_subseg PARAMS ((sd_chain_struct *)); -static void pa_spaces_begin PARAMS ((void)); -#endif -static void pa_ip PARAMS ((char *)); -static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *, - long, expressionS *, int, - bfd_reloc_code_real_type, - enum hppa_reloc_field_selector_type_alt, - int, long, 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 log2 PARAMS ((int)); -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 *)); + int, int, int, int, + asection *); +static sd_chain_struct *is_defined_space (char *); +static ssd_chain_struct *is_defined_subspace (char *); +static sd_chain_struct *pa_segment_to_space (asection *); +static ssd_chain_struct *pa_subsegment_to_subspace (asection *, + subsegT); +static sd_chain_struct *pa_find_space_by_number (int); +static unsigned int pa_subspace_start (sd_chain_struct *, int); +static sd_chain_struct *pa_parse_space_stmt (char *, int); #endif -/* File and gloally scoped variable declarations. */ +/* File and globally scoped variable declarations. */ #ifdef OBJ_SOM /* Root and final entry in the space chain. */ @@ -601,91 +553,10 @@ static struct call_desc last_call_desc; /* 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? */ -const pseudo_typeS md_pseudo_table[] = -{ - /* align pseudo-ops on the PA specify the actual alignment requested, - not the log2 of the requested alignment. */ -#ifdef OBJ_SOM - {"align", pa_align, 8}, -#endif -#ifdef OBJ_ELF - {"align", s_align_bytes, 8}, -#endif - {"begin_brtab", pa_brtab, 1}, - {"begin_try", pa_try, 1}, - {"block", pa_block, 1}, - {"blockz", pa_block, 0}, - {"byte", pa_cons, 1}, - {"call", pa_call, 0}, - {"callinfo", pa_callinfo, 0}, - {"code", pa_code, 0}, - {"comm", pa_comm, 0}, -#ifdef OBJ_SOM - {"compiler", pa_compiler, 0}, -#endif - {"copyright", pa_copyright, 0}, - {"data", pa_data, 0}, - {"double", pa_float_cons, 'd'}, - {"dword", pa_cons, 8}, - {"end", pa_end, 0}, - {"end_brtab", pa_brtab, 0}, - {"end_try", pa_try, 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 }, -#endif - {"fill", pa_fill, 0}, - {"float", pa_float_cons, 'f'}, - {"half", pa_cons, 2}, - {"import", pa_import, 0}, - {"int", pa_cons, 4}, - {"label", pa_label, 0}, - {"lcomm", pa_lcomm, 0}, - {"leave", pa_leave, 0}, - {"level", pa_level, 0}, -#ifdef OBJ_ELF - { "loc", dwarf2_directive_loc }, -#endif - {"long", pa_cons, 4}, - {"lsym", pa_lsym, 0}, -#ifdef OBJ_SOM - {"nsubspa", pa_subspace, 1}, -#endif - {"octa", pa_cons, 16}, - {"org", pa_origin, 0}, - {"origin", pa_origin, 0}, - {"param", pa_param, 0}, - {"proc", pa_proc, 0}, - {"procend", pa_procend, 0}, - {"quad", pa_cons, 8}, - {"reg", pa_equ, 1}, - {"short", pa_cons, 2}, - {"single", pa_float_cons, 'f'}, -#ifdef OBJ_SOM - {"space", pa_space, 0}, - {"spnum", pa_spnum, 0}, -#endif - {"string", pa_stringer, 0}, - {"stringz", pa_stringer, 1}, -#ifdef OBJ_SOM - {"subspa", pa_subspace, 0}, -#endif - {"text", pa_text, 0}, - {"version", pa_version, 0}, - {"word", pa_cons, 4}, - {NULL, 0, 0} -}; +/* These characters can be suffixes of opcode names and they may be + followed by meaningful whitespace. We don't include `,' and `!' + as they never appear followed by meaningful whitespace. */ +const char hppa_symbol_chars[] = "*?=<>"; /* This array holds the chars that only start a comment at the beginning of a line. If the line seems to have the form '# 123 filename' @@ -695,9 +566,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. - Also note that C style comments will always work. */ + Also note that C style comments will always work. */ 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[] = "!"; @@ -714,7 +589,7 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP"; static struct pa_it the_insn; -/* Points to the end of an expression just parsed by get_expressoin +/* Points to the end of an expression just parsed by get_expression and friends. FIXME. This shouldn't be handled with a file-global variable. */ static char *expr_end; @@ -728,18 +603,31 @@ static int within_entry_exit; /* 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; -/* Nonzero when strict syntax checking is enabled. Zero otherwise. +/* Nonzero when strict matching is enabled. Zero otherwise. + + Each opcode in the table has a flag which indicates whether or + not strict matching should be enabled for that instruction. + + Mainly, strict causes errors to be ignored when a match failure + occurs. However, it also affects the parsing of register fields + by pa_parse_number. */ +static int strict; - 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. */ @@ -766,6 +654,7 @@ static int print_errors = 1; %r26 - %r23 have %arg0 - %arg3 as synonyms %r28 - %r29 have %ret0 - %ret1 as synonyms + %fr4 - %fr7 have %farg0 - %farg3 as synonyms %r30 has %sp as a synonym %r27 has %dp as a synonym %r2 has %rp as a synonym @@ -773,206 +662,224 @@ static int print_errors = 1; 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[] = { - {"%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}, + {"%farg0", 4 + FP_REG_BASE}, + {"%farg1", 5 + FP_REG_BASE}, + {"%farg2", 6 + FP_REG_BASE}, + {"%farg3", 7 + FP_REG_BASE}, + {"%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}, + {"%fret", 4}, + {"%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}, - {"%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}, + {"%t1", 22}, + {"%t2", 21}, + {"%t3", 20}, + {"%t4", 19}, + {"%tf1", 11}, + {"%tf2", 10}, + {"%tf3", 9}, + {"%tf4", 8}, + {"%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 @@ -1056,12 +963,12 @@ static const struct selector_entry selector_table[] = static struct default_subspace_dict pa_def_subspaces[] = { - {"$CODE$", 1, 1, 1, 0, 0, 0, 24, 0x2c, 0, 8, 0, 0, SUBSEG_CODE}, - {"$DATA$", 1, 1, 0, 0, 0, 0, 24, 0x1f, 1, 8, 1, 1, SUBSEG_DATA}, - {"$LIT$", 1, 1, 0, 0, 0, 0, 16, 0x2c, 0, 8, 0, 0, SUBSEG_LIT}, - {"$MILLICODE$", 1, 1, 0, 0, 0, 0, 8, 0x2c, 0, 8, 0, 0, SUBSEG_MILLI}, - {"$BSS$", 1, 1, 0, 0, 0, 1, 80, 0x1f, 1, 8, 1, 1, SUBSEG_BSS}, - {NULL, 0, 1, 0, 0, 0, 0, 255, 0x1f, 0, 4, 0, 0, 0} + {"$CODE$", 1, 1, 1, 0, 0, 0, 0, 24, 0x2c, 0, 8, 0, 0, SUBSEG_CODE}, + {"$DATA$", 1, 1, 0, 0, 0, 0, 0, 24, 0x1f, 1, 8, 1, 1, SUBSEG_DATA}, + {"$LIT$", 1, 1, 0, 0, 0, 0, 0, 16, 0x2c, 0, 8, 0, 0, SUBSEG_LIT}, + {"$MILLICODE$", 1, 1, 0, 0, 0, 0, 0, 8, 0x2c, 0, 8, 0, 0, SUBSEG_MILLI}, + {"$BSS$", 1, 1, 0, 0, 0, 0, 1, 80, 0x1f, 1, 8, 1, 1, SUBSEG_BSS}, + {NULL, 0, 1, 0, 0, 0, 0, 0, 255, 0x1f, 0, 4, 0, 0, 0} }; static struct default_space_dict pa_def_spaces[] = @@ -1097,7 +1004,7 @@ static struct default_space_dict pa_def_spaces[] = continue; \ } -/* Simple range checking for FIELD againt HIGH and LOW bounds. +/* Simple range checking for FIELD against HIGH and LOW bounds. IGNORE is used to suppress the error message. */ #define CHECK_FIELD(FIELD, HIGH, LOW, IGNORE) \ @@ -1111,6 +1018,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 against 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) @@ -1119,6 +1054,26 @@ static struct default_space_dict pa_def_spaces[] = ((exp).X_op == O_subtract \ && strcmp (S_GET_NAME ((exp).X_op_symbol), "$PIC_pcrel$0") == 0) +#define is_tls_gdidx(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_gdidx$") == 0) + +#define is_tls_ldidx(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_ldidx$") == 0) + +#define is_tls_dtpoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_dtpoff$") == 0) + +#define is_tls_ieoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_ieoff$") == 0) + +#define is_tls_leoff(exp) \ + ((exp).X_op == O_subtract \ + && strcmp (S_GET_NAME ((exp).X_op_symbol), "$tls_leoff$") == 0) + /* We need some complex handling for stabs (sym1 - sym2). Luckily, we'll always be able to reduce the expression to a constant, so we don't need real complex handling yet. */ @@ -1131,7 +1086,7 @@ static struct default_space_dict pa_def_spaces[] = proc/procend pairs match. */ void -pa_check_eof () +pa_check_eof (void) { if (within_entry_exit) as_fatal (_("Missing .exit\n")); @@ -1144,7 +1099,7 @@ pa_check_eof () or NULL if no label_symbol_struct exists for the current space. */ static label_symbol_struct * -pa_get_label () +pa_get_label (void) { label_symbol_struct *label_chain; @@ -1169,8 +1124,7 @@ pa_get_label () this function will replace it with the new label. */ void -pa_define_label (symbol) - symbolS *symbol; +pa_define_label (symbolS *symbol) { label_symbol_struct *label_chain = pa_get_label (); @@ -1179,8 +1133,7 @@ pa_define_label (symbol) else { /* Create a new label entry and add it to the head of the chain. */ - label_chain - = (label_symbol_struct *) xmalloc (sizeof (label_symbol_struct)); + label_chain = xmalloc (sizeof (label_symbol_struct)); label_chain->lss_label = symbol; #ifdef OBJ_SOM label_chain->lss_space = current_space; @@ -1195,13 +1148,17 @@ pa_define_label (symbol) label_symbols_rootp = label_chain; } + +#ifdef OBJ_ELF + dwarf2_emit_label (symbol); +#endif } /* Removes a label definition for the current space. If there is no label_symbol_struct entry, then no action is taken. */ static void -pa_undefine_label () +pa_undefine_label (void) { label_symbol_struct *label_chain; label_symbol_struct *prev_label_chain = NULL; @@ -1212,10 +1169,10 @@ pa_undefine_label () { if (1 #ifdef OBJ_SOM - && current_space == label_chain->lss_space && label_chain->lss_label + && current_space == label_chain->lss_space && label_chain->lss_label #endif #ifdef OBJ_ELF - && now_seg == label_chain->lss_segment && label_chain->lss_label + && now_seg == label_chain->lss_segment && label_chain->lss_label #endif ) { @@ -1232,7 +1189,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 @@ -1241,25 +1197,21 @@ pa_undefine_label () tc_fix_data field. */ static void -fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, - r_type, r_field, r_format, arg_reloc, unwind_bits) - fragS *frag; - int where; - int size; - symbolS *add_symbol; - long offset; - 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; +fix_new_hppa (fragS *frag, + int where, + int size, + symbolS *add_symbol, + 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, + unsigned int arg_reloc, + int unwind_bits ATTRIBUTE_UNUSED) { fixS *new_fix; - - struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) - obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); + struct hppa_fix_struct *hppa_fix = obstack_alloc (¬es, sizeof (struct hppa_fix_struct)); if (exp != NULL) new_fix = fix_new_exp (frag, where, size, exp, pcrel, r_type); @@ -1273,4158 +1225,4579 @@ 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) - 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 - 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 - && !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 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_gdidx$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_ldidx$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_dtpoff$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_ieoff$") == 0 + || strcmp (S_GET_NAME (new_fix->fx_subsy), "$tls_leoff$") == 0)) new_fix->fx_subsy = NULL; } -/* Parse a .byte, .word, .long expression for the HPPA. Called by - cons via the TC_PARSE_CONS_EXPRESSION macro. */ - -void -parse_cons_expression_hppa (exp) - expressionS *exp; -{ - hppa_field_selector = pa_chk_field_selector (&input_line_pointer); - expression (exp); -} - /* This fix_new is called by cons via TC_CONS_FIX_NEW. hppa_field_selector is set by the parse_cons_expression_hppa. */ void -cons_fix_new_hppa (frag, where, size, exp) - fragS *frag; - int where; - int size; - expressionS *exp; +cons_fix_new_hppa (fragS *frag, int where, int size, expressionS *exp) { unsigned int rel_type; /* Get a base relocation type. */ if (is_DP_relative (*exp)) rel_type = R_HPPA_GOTOFF; + else if (is_PC_relative (*exp)) + rel_type = R_HPPA_PCREL_CALL; +#ifdef OBJ_ELF + else if (is_tls_gdidx (*exp)) + rel_type = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (*exp)) + rel_type = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (*exp)) + rel_type = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (*exp)) + rel_type = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (*exp)) + rel_type = R_PARISC_TLS_LE21L; +#endif else if (is_complex (*exp)) rel_type = R_HPPA_COMPLEX; else 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, - 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; } -/* This function is called once, at assembler startup time. It should - set up all the tables, etc. that the MD part of the assembler will need. */ +/* Mark (via expr_end) the end of an expression (I think). FIXME. */ -void -md_begin () +static void +get_expression (char *str) { - const char *retval = NULL; - int lose = 0; - unsigned int i = 0; - - last_call_info = NULL; - call_info_root = NULL; - - /* Set the default machine type. */ - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10)) - as_warn (_("could not set architecture and machine")); + char *save_in; + asection *seg; - /* Folding of text and data segments fails miserably on the PA. - Warn user and disable "-R" option. */ - if (flag_readonly_data_in_text) + save_in = input_line_pointer; + input_line_pointer = str; + seg = expression (&the_insn.exp); + if (!(seg == absolute_section + || seg == undefined_section + || SEG_NORMAL (seg))) { - as_warn (_("-R option not supported on this target.")); - flag_readonly_data_in_text = 0; + as_warn (_("Bad segment in expression.")); + expr_end = input_line_pointer; + input_line_pointer = save_in; + return; } + expr_end = input_line_pointer; + input_line_pointer = save_in; +} -#ifdef OBJ_SOM - pa_spaces_begin (); -#endif +/* Parse a PA nullification completer (,n). Return nonzero if the + completer was found; return zero if no completer was found. */ - op_hash = hash_new (); +static int +pa_parse_nullif (char **s) +{ + int nullif; - while (i < NUMOPCODES) + nullif = 0; + if (**s == ',') { - const char *name = pa_opcodes[i].name; - retval = hash_insert (op_hash, name, (struct pa_opcode *) &pa_opcodes[i]); - if (retval != NULL && *retval != '\0') - { - as_fatal (_("Internal error: can't hash `%s': %s\n"), name, retval); - lose = 1; - } - do + *s = *s + 1; + if (strncasecmp (*s, "n", 1) == 0) + nullif = 1; + else { - if ((pa_opcodes[i].match & pa_opcodes[i].mask) - != pa_opcodes[i].match) - { - fprintf (stderr, _("internal error: losing opcode: `%s' \"%s\"\n"), - pa_opcodes[i].name, pa_opcodes[i].args); - lose = 1; - } - ++i; + as_bad (_("Invalid Nullification: (%c)"), **s); + nullif = 0; } - while (i < NUMOPCODES && !strcmp (pa_opcodes[i].name, name)); + *s = *s + 1; } - if (lose) - as_fatal (_("Broken assembler. No assembly attempted.")); + return nullif; +} -#ifdef OBJ_SOM - /* SOM will change text_section. To make sure we never put - anything into the old one switch to the new one now. */ - subseg_set (text_section, 0); -#endif +/* Turn a string in input_line_pointer into a floating point constant of type + type, and store the appropriate bytes in *litP. The number of LITTLENUMS + emitted is stored in *sizeP . An error message or NULL is returned. */ -#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); -#endif -} +#define MAX_LITTLENUMS 6 -/* Assemble a single instruction storing it into a frag. */ -void -md_assemble (str) - char *str; +char * +md_atof (int type, char *litP, int *sizeP) { - char *to; - - /* The had better be something to assemble. */ - assert (str); - - /* If we are within a procedure definition, make sure we've - defined a label for the procedure; handle case where the - label was defined after the .PROC directive. + int prec; + LITTLENUM_TYPE words[MAX_LITTLENUMS]; + LITTLENUM_TYPE *wordP; + char *t; - Note there's not need to diddle with the segment or fragment - for the label symbol in this case. We have already switched - into the new $CODE$ subspace at this point. */ - if (within_procedure && last_call_info->start_symbol == NULL) + switch (type) { - label_symbol_struct *label_symbol = pa_get_label (); - - if (label_symbol) - { - if (label_symbol->lss_label) - { - last_call_info->start_symbol = label_symbol->lss_label; - symbol_get_bfdsym (label_symbol->lss_label)->flags - |= BSF_FUNCTION; -#ifdef OBJ_SOM - /* Also handle allocation of a fixup to hold the unwind - information when the label appears after the proc/procend. */ - if (within_entry_exit) - { - char *where = frag_more (0); - - 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); - } -#endif - } - else - as_bad (_("Missing function name for .PROC (corrupted label chain)")); - } - else - as_bad (_("Missing function name for .PROC")); - } - /* Assemble the instruction. Results are saved into "the_insn". */ - pa_ip (str); + case 'f': + case 'F': + case 's': + case 'S': + prec = 2; + break; - /* Get somewhere to put the assembled instrution. */ - to = frag_more (4); + case 'd': + case 'D': + case 'r': + case 'R': + prec = 4; + break; - /* Output the opcode. */ - md_number_to_chars (to, the_insn.opcode, 4); + case 'x': + case 'X': + prec = 6; + break; - /* If necessary output more stuff. */ - if (the_insn.reloc != R_HPPA_NONE) - 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); + case 'p': + case 'P': + prec = 6; + break; -#ifdef OBJ_ELF - if (debug_type == DEBUG_DWARF2) + default: + *sizeP = 0; + return _("Bad call to MD_ATOF()"); + } + t = atof_ieee (input_line_pointer, type, words); + if (t) + input_line_pointer = t; + *sizeP = prec * sizeof (LITTLENUM_TYPE); + for (wordP = words; prec--;) { - bfd_vma addr; - - /* First update the notion of the current source line. */ - dwarf2_where (&debug_line); - - /* We want the offset of the start of this instruction within the - the current frag. */ - addr = frag_now->fr_address + frag_now_fix () - 4; - - /* And record the information. */ - dwarf2_gen_line_info (addr, &debug_line); + md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE)); + litP += sizeof (LITTLENUM_TYPE); } -#endif + return NULL; } -/* Do the real work for assembling a single instruction. Store results - into the global "the_insn" variable. */ +/* Write out big-endian. */ -static void -pa_ip (str) - char *str; +void +md_number_to_chars (char *buf, valueT val, int n) { - char *error_message = ""; - char *s, c, *argstart, *name, *save_s; - const char *args; - int match = FALSE; - int comma = 0; - int cmpltr, nullif, flag, cond, num; - unsigned long opcode; - struct pa_opcode *insn; - -#ifdef OBJ_SOM - /* We must have a valid space and subspace. */ - pa_check_current_space_and_subspace (); -#endif - - /* 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); + number_to_chars_bigendian (buf, val, n); +} - /* Skip to something interesting. */ - for (s = str; isupper (*s) || islower (*s) || (*s >= '0' && *s <= '3'); ++s) - ; +/* Translate internal representation of relocation info to BFD target + format. */ - switch (*s) - { +arelent ** +tc_gen_reloc (asection *section, fixS *fixp) +{ + arelent *reloc; + struct hppa_fix_struct *hppa_fixp; + static arelent *no_relocs = NULL; + arelent **relocs; + reloc_type **codes; + reloc_type code; + int n_relocs; + int i; - case '\0': - break; + hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data; + if (fixp->fx_addsy == 0) + return &no_relocs; - case ',': - comma = 1; + assert (hppa_fixp != 0); + assert (section != 0); - /*FALLTHROUGH */ + reloc = xmalloc (sizeof (arelent)); - case ' ': - *s++ = '\0'; - break; + reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + codes = hppa_gen_reloc_type (stdoutput, + fixp->fx_r_type, + hppa_fixp->fx_r_format, + hppa_fixp->fx_r_field, + fixp->fx_subsy != NULL, + symbol_get_bfdsym (fixp->fx_addsy)); - default: - as_fatal (_("Unknown opcode: `%s'"), str); + if (codes == NULL) + { + as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup")); + abort (); } - save_s = str; + for (n_relocs = 0; codes[n_relocs]; n_relocs++) + ; - /* Look up the opcode in the has table. */ - if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL) - { - as_bad ("Unknown opcode: `%s'", str); - return; - } + relocs = xmalloc (sizeof (arelent *) * n_relocs + 1); + reloc = xmalloc (sizeof (arelent) * n_relocs); + for (i = 0; i < n_relocs; i++) + relocs[i] = &reloc[i]; - if (comma) - { - *--s = ','; - } + relocs[n_relocs] = NULL; - /* Mark the location where arguments for the instruction start, then - start processing them. */ - argstart = s; - for (;;) +#ifdef OBJ_ELF + switch (fixp->fx_r_type) { - /* Do some initialization. */ - opcode = insn->match; - strict = (insn->flags & FLAG_STRICT); - memset (&the_insn, 0, sizeof (the_insn)); + default: + assert (n_relocs == 1); - the_insn.reloc = R_HPPA_NONE; + code = *codes[0]; - /* If this instruction is specific to a particular architecture, - then set a new architecture. */ - /* But do not automatically promote to pa2.0. The automatic promotion - crud is for compatability with HP's old assemblers only. */ - if (insn->arch < 20 - && bfd_get_mach (stdoutput) < insn->arch) - { - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, insn->arch)) - as_warn (_("could not update architecture and machine")); - } - else if (bfd_get_mach (stdoutput) < insn->arch) + /* Now, do any processing that is dependent on the relocation type. */ + switch (code) { - match = FALSE; - goto failed; - } + case R_PARISC_DLTREL21L: + case R_PARISC_DLTREL14R: + case R_PARISC_DLTREL14F: + case R_PARISC_PLABEL32: + case R_PARISC_PLABEL21L: + case R_PARISC_PLABEL14R: + /* For plabel relocations, the addend of the + relocation should be either 0 (no static link) or 2 + (static link required). This adjustment is done in + bfd/elf32-hppa.c:elf32_hppa_relocate_section. - /* Build the opcode, checking as we go to make - sure that the operands match. */ - for (args = insn->args;; ++args) - { - /* Absorb white space in instruction. */ - while (*s == ' ' || *s == '\t') - s++; + We also slam a zero addend into the DLT relative relocs; + it doesn't make a lot of sense to use any addend since + it gets you a different (eg unknown) DLT entry. */ + reloc->addend = 0; + break; - switch (*args) - { +#ifdef ELF_ARG_RELOC + case R_PARISC_PCREL17R: + case R_PARISC_PCREL17F: + case R_PARISC_PCREL17C: + 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; +#endif - /* End of arguments. */ - case '\0': - if (*s == '\0') - match = TRUE; - break; + case R_PARISC_DIR32: + /* Facilitate hand-crafted unwind info. */ + if (strcmp (section->name, UNWIND_SECTION_NAME) == 0) + code = R_PARISC_SEGREL32; + /* Fall thru */ - case '+': - if (*s == '+') - { - ++s; - continue; - } - if (*s == '-') - continue; - break; + default: + reloc->addend = fixp->fx_offset; + break; + } - /* These must match exactly. */ - case '(': - case ')': - case ',': - case ' ': - if (*s++ == *args) - continue; - break; + reloc->sym_ptr_ptr = 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; - /* Handle a 5 bit register or control register field at 10. */ - case 'b': - case '^': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 31, 0, 0); - INSERT_FIELD_AND_CONTINUE (opcode, num, 21); + assert (reloc->howto && (unsigned int) code == reloc->howto->type); + break; + } +#else /* OBJ_SOM */ - /* 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; + /* Walk over reach relocation returned by the BFD backend. */ + for (i = 0; i < n_relocs; i++) + { + code = *codes[i]; - if (!strncasecmp(s, "%sar", 4)) - { - s += 4; - continue; - } - else if (!strncasecmp(s, "%cr11", 5)) - { - s += 5; - continue; - } - break; + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + 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; - /* Handle a 5 bit register field at 15. */ - case 'x': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 31, 0, 0); - INSERT_FIELD_AND_CONTINUE (opcode, num, 16); + switch (code) + { + case R_COMP2: + /* The only time we ever use a R_COMP2 fixup is for the difference + of two symbols. With that in mind we fill in all four + relocs now and break out of the loop. */ + assert (i == 1); + relocs[0]->sym_ptr_ptr + = (asymbol **) bfd_abs_section_ptr->symbol_ptr_ptr; + 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 = xmalloc (sizeof (asymbol *)); + *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + 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 = xmalloc (sizeof (asymbol *)); + *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy); + 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_section_ptr->symbol_ptr_ptr; + 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_section_ptr->symbol_ptr_ptr; + 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; + case R_PCREL_CALL: + case R_ABS_CALL: + relocs[i]->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0); + break; - /* Handle a 5 bit register field at 31. */ - case 't': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 31, 0, 0); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + case R_DLT_REL: + case R_DATA_PLABEL: + case R_CODE_PLABEL: + /* For plabel relocations, the addend of the + relocation should be either 0 (no static link) or 2 + (static link required). - /* Handle a 5 bit register field at 10 and 15. */ - case 'a': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 31, 0, 0); - opcode |= num << 16; - INSERT_FIELD_AND_CONTINUE (opcode, num, 21); + FIXME: We always assume no static link! - /* 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); + We also slam a zero addend into the DLT relative relocs; + it doesn't make a lot of sense to use any addend since + it gets you a different (eg unknown) DLT entry. */ + relocs[i]->addend = 0; + break; - /* 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; - /* 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); - low_sign_unext (num, 5, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 16); + case R_N_MODE: + case R_S_MODE: + case R_D_MODE: + case R_R_MODE: + case R_FSEL: + case R_LSEL: + case R_RSEL: + case R_BEGIN_BRTAB: + case R_END_BRTAB: + case R_BEGIN_TRY: + case R_N0SEL: + case R_N1SEL: + /* There is no symbol or addend associated with these fixups. */ + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); + relocs[i]->addend = 0; + break; - /* 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; - /* 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) - low_sign_unext (num, 5, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + case R_END_TRY: + case R_ENTRY: + case R_EXIT: + /* There is no symbol associated with these fixups. */ + relocs[i]->sym_ptr_ptr = xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); + relocs[i]->addend = fixp->fx_offset; + break; - /* 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; - CHECK_FIELD (num, 31, 0, 0); - INSERT_FIELD_AND_CONTINUE (opcode, num, strict); + default: + relocs[i]->addend = fixp->fx_offset; + } + } - /* 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; - CHECK_FIELD (num, 31, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 16); + done: +#endif - /* 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); + return relocs; +} - /* Handle a 2 bit space identifier at 17. */ - case 's': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 3, 0, 1); - INSERT_FIELD_AND_CONTINUE (opcode, num, 14); +/* Process any machine dependent frag types. */ - /* Handle a 3 bit space identifier at 18. */ - case 'S': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 7, 0, 1); - dis_assemble_3 (num, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 13); +void +md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec ATTRIBUTE_UNUSED, + fragS *fragP) +{ + unsigned int address; - /* Handle all completers. */ - case 'c': - switch (*++args) - { + if (fragP->fr_type == rs_machine_dependent) + { + switch ((int) fragP->fr_subtype) + { + case 0: + fragP->fr_type = rs_fill; + know (fragP->fr_var == 1); + know (fragP->fr_next); + address = fragP->fr_address + fragP->fr_fix; + if (address % fragP->fr_offset) + { + fragP->fr_offset = + fragP->fr_next->fr_address + - fragP->fr_address + - fragP->fr_fix; + } + else + fragP->fr_offset = 0; + break; + } + } +} - /* Handle a completer for an indexing load or store. */ - case 'x': - { - int uu = 0; - int m = 0; - int i = 0; - while (*s == ',' && i < 2) - { - 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", 1) == 0) - uu = 1; - /* When in strict mode this is a match failure. */ - else if (strict) - break; - 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); - } +/* Round up a section size to the appropriate boundary. */ - /* Handle a short load/store completer. */ - case 'm': - case 'q': - case 'J': - 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; - } - /* When in strict mode this is a match failure. */ - else if (strict) - break; - else - as_bad (_("Invalid Short Load/Store Completer.")); - s += 2; - } - /* If we did not get a ma/mb completer, then we do not - consider this a positive match for 'cc'. */ - else if (*args == 'c') - break; +valueT +md_section_align (asection *segment, valueT size) +{ + int align = bfd_get_section_alignment (stdoutput, segment); + int align2 = (1 << align) - 1; - /* 'J', 'm' and 'q' are the same, except for where they - encode the before/after field. */ - if (*args == 'm') - { - opcode |= m << 5; - INSERT_FIELD_AND_CONTINUE (opcode, a, 13); - } - else if (*args == 'q') - { - opcode |= m << 3; - INSERT_FIELD_AND_CONTINUE (opcode, a, 2); - } - else if (*args == 'J') - { - /* M bit is explicit in the major opcode. */ - INSERT_FIELD_AND_CONTINUE (opcode, a, 2); - } - else if (*args == 'c') - { - /* Gross! Hide these values in the immediate field - of the instruction, then pull them out later. */ - opcode |= m << 8; - opcode |= a << 9; - continue; - } - } - - /* Handle a stbys completer. */ - case 's': - { - 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; - /* When in strict mode this is a match failure. */ - else if (strict) - break; - else - as_bad (_("Invalid Store Bytes Short Completer")); - s++; - i++; - } - if (i > 2) - as_bad (_("Invalid Store Bytes Short Completer")); - opcode |= m << 5; - INSERT_FIELD_AND_CONTINUE (opcode, a, 13); - } + return (size + align2) & ~align2; +} - /* Handle a local processor completer. */ - case 'L': - if (strncasecmp (s, ",l", 2) != 0) - break; - s += 2; - continue; +/* Return the approximate size of a frag before relaxation has occurred. */ - /* 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; - } +int +md_estimate_size_before_relax (fragS *fragP, asection *segment ATTRIBUTE_UNUSED) +{ + int size; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); + size = 0; - /* Handle MFCTL wide completer. */ - case 'W': - if (strncasecmp (s, ",w", 2) != 0) - break; - s += 2; - continue; + while ((fragP->fr_fix + size) % fragP->fr_offset) + size++; - /* Handle an RFI restore completer. */ - case 'r': - flag = 0; - if (!strncasecmp (s, ",r", 2)) - { - flag = 5; - s += 2; - } + return size; +} + +#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 - INSERT_FIELD_AND_CONTINUE (opcode, flag, 5); +struct option md_longopts[] = +{ +#ifdef WARN_COMMENTS + {"warn-comment", no_argument, NULL, 'c'}, +#endif + {NULL, no_argument, NULL, 0} +}; +size_t md_longopts_size = sizeof (md_longopts); - /* Handle a system control completer. */ - case 'Z': - if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M')) - { - flag = 1; - s += 2; - } - else - flag = 0; +int +md_parse_option (int c, char *arg ATTRIBUTE_UNUSED) +{ + switch (c) + { + default: + return 0; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 5); +#ifdef OBJ_ELF + case 'V': + print_version_id (); + break; +#endif +#ifdef WARN_COMMENTS + case 'c': + warn_comment = 1; + break; +#endif + } - /* Handle intermediate/final completer for DCOR. */ - case 'i': - flag = 0; - if (!strncasecmp (s, ",i", 2)) - { - flag = 1; - s += 2; - } + return 1; +} - INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); +void +md_show_usage (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 +} + +/* We have no need to default values of symbols. */ - /* Handle zero/sign extension completer. */ - case 'z': - flag = 1; - if (!strncasecmp (s, ",z", 2)) - { - flag = 0; - s += 2; - } +symbolS * +md_undefined_symbol (char *name ATTRIBUTE_UNUSED) +{ + return NULL; +} - INSERT_FIELD_AND_CONTINUE (opcode, flag, 10); +#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 - /* 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); +/* Apply a fixup to an instruction. */ - /* 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; +void +md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) +{ + char *fixpos; + struct hppa_fix_struct *hppa_fixP; + offsetT new_val; + int insn, val, fmt; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + /* 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. */ +#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) + return; - /* 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; + /* Disgusting. We must set fx_offset ourselves -- R_HPPA_END_TRY + fixups are considered not adjustable, which in turn causes + adjust_reloc_syms to not set fx_offset. Ugh. */ + if (fixP->fx_r_type == R_HPPA_END_TRY) + { + fixP->fx_offset = * valP; + return; + } +#endif +#ifdef OBJ_ELF + if (fixP->fx_r_type == (int) R_PARISC_GNU_VTENTRY + || fixP->fx_r_type == (int) R_PARISC_GNU_VTINHERIT) + return; +#endif - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) + fixP->fx_done = 1; - /* Handle trap on signed overflow. */ - case 'v': - flag = 0; - if (!strncasecmp (s, ",tsv", 4)) - { - flag = 1; - s += 4; - } + /* There should be a HPPA specific fixup associated with the GAS fixup. */ + hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data; + if (hppa_fixP == NULL) + { + as_bad_where (fixP->fx_file, fixP->fx_line, + _("no hppa_fixup entry for fixup type 0x%x"), + fixP->fx_r_type); + return; + } - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + fixpos = fixP->fx_frag->fr_literal + fixP->fx_where; - /* 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; + if (fixP->fx_size != 4 || hppa_fixP->fx_r_format == 32) + { + /* Handle constant output. */ + number_to_chars_bigendian (fixpos, *valP, fixP->fx_size); + return; + } - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + insn = bfd_get_32 (stdoutput, fixpos); + fmt = bfd_hppa_insn2fmt (stdoutput, insn); - /* 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; + /* 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 + && fmt != 32 +#endif + ) + new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); +#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); +#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 +#ifdef OBJ_SOM + && (* valP - 8 + 262144 < 524288 + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) +#endif + && !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); + } - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + switch (fmt) + { + case 10: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* 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; + 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; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); + 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; - /* Handle trap condition completer for UADDCM. */ - case 'T': - flag = 0; - if (!strncasecmp (s, ",tc", 3)) - { - flag = 1; - s += 3; - } + insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); + break; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); + /* 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; - /* 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; - } + insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); + break; - INSERT_FIELD_AND_CONTINUE (opcode, sign, 10); - } + /* 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 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")); + insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); + break; - s++; - INSERT_FIELD_AND_CONTINUE (opcode, lr, 13); - } - else - as_bad(_("Invalid left/right combination completer")); - 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; - /* 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; - } + insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); + break; - INSERT_FIELD_AND_CONTINUE (opcode, sat, 6); - } + /* Handle some of the opcodes with the 'W' operand type. */ + case 17: + { + offsetT distance = * valP; - /* Handle permutation completer. */ - case '*': - if (*s++ == ',') - { - int permloc[4] = {13,10,8,6}; - int perm = 0; - int i = 0; - 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; + /* 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); - default: - abort (); - } - break; + CHECK_FIELD_WHERE (new_val - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; - /* 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); + insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); + break; + } - /* Handle an add condition. */ - case 'A': - case 'a': - cmpltr = 0; - flag = 0; - if (*s == ',') - { - s++; + case 22: + { + offsetT distance = * valP; - /* 64 bit conditions. */ - if (*args == 'A') - { - if (*s == '*') - s++; - else - break; - } - else if (*s == '*') - break; - name = s; + /* 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); - 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) - { - 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 == 'a') - as_bad (_("Invalid Add Condition: %s"), name); - *s = c; - } - opcode |= cmpltr << 13; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); + CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; - /* Handle non-negated add and branch condition. */ - case 'd': - cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1); - if (cmpltr < 0) - { - as_bad (_("Invalid Compare/Subtract Condition: %c"), *s); - cmpltr = 0; - } - INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); + insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); + break; + } - /* Handle negated add and branch condition. */ - case 'D': - abort (); + case -10: + val = new_val; + insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); + break; - /* Handle wide-mode non-negated add and branch condition. */ - case 'w': - abort (); + case -16: + val = new_val; + insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); + break; - /* Handle wide-mode negated add and branch condition. */ - case 'W': - abort(); + case 16: + val = new_val; + insn = (insn & ~ 0xffff) | re_assemble_16 (val); + break; - /* 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) - { - 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; - } - } - INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); + case 32: + insn = new_val; + break; - /* Handle branch on bit conditions. */ - case 'B': - case 'b': - cmpltr = 0; - if (*s == ',') - { - s++; + default: + as_bad_where (fixP->fx_file, fixP->fx_line, + _("Unknown relocation encountered in md_apply_fix.")); + return; + } - if (*args == 'B') - { - if (*s == '*') - s++; - else - break; - } - else if (*s == '*') - break; +#ifdef OBJ_ELF + switch (fixP->fx_r_type) + { + case R_PARISC_TLS_GD21L: + case R_PARISC_TLS_GD14R: + case R_PARISC_TLS_LDM21L: + case R_PARISC_TLS_LDM14R: + case R_PARISC_TLS_LE21L: + case R_PARISC_TLS_LE14R: + case R_PARISC_TLS_IE21L: + case R_PARISC_TLS_IE14R: + if (fixP->fx_addsy) + S_SET_THREAD_LOCAL (fixP->fx_addsy); + break; + default: + break; + } +#endif - 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); + /* Insert the relocation. */ + bfd_put_32 (stdoutput, insn, fixpos); +} - /* Handle a compare/subtract condition. */ - case 'S': - case 's': - cmpltr = 0; - flag = 0; - if (*s == ',') - { - s++; +/* Exactly what point is a PC-relative offset relative TO? + On the PA, they're relative to the address of the offset. */ - /* 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); +long +md_pcrel_from (fixS *fixP) +{ + return fixP->fx_where + fixP->fx_frag->fr_address; +} - /* Handle a non-negated compare condition. */ - case 't': - cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1); - if (cmpltr < 0) - { - as_bad (_("Invalid Compare/Subtract Condition: %c"), *s); - cmpltr = 0; - } - INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); +/* Return nonzero if the input line pointer is at the end of + a statement. */ - /* 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 - condition. */ - case 'n': - save_s = s; - cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1); - if (cmpltr < 0) - { - s = save_s; - cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1); - if (cmpltr < 0) - { - as_bad (_("Invalid Compare/Subtract Condition.")); - cmpltr = 0; - } - else - { - /* Negated condition requires an opcode change. */ - opcode |= 1 << 27; - } - } - - INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); +static int +is_end_of_statement (void) +{ + return ((*input_line_pointer == '\n') + || (*input_line_pointer == ';') + || (*input_line_pointer == '!')); +} - /* Handle a logical instruction condition. */ - case 'L': - case 'l': - cmpltr = 0; - flag = 0; - if (*s == ',') - { - s++; +#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg)) - /* 64 bit conditions. */ - if (*args == 'L') - { - 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, "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, "ev") == 0) - { - cmpltr = 7; - flag = 1; - } - /* ",*" is a valid condition. */ - else if (*args != 'L') - as_bad (_("Invalid Logical Instruction Condition.")); - *s = c; - } - opcode |= cmpltr << 13; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); +/* Given NAME, find the register number associated with that name, return + the integer value associated with the given name or -1 on failure. */ - /* Handle a shift/extract/deposit condition. */ - case 'X': - case 'x': - case 'y': - cmpltr = 0; - if (*s == ',') - { - save_s = s++; +static int +reg_name_search (char *name) +{ + int middle, low, high; + int cmp; - /* 64 bit conditions. */ - if (*args == 'X') - { - 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 (strcasecmp (name, "od") == 0) - cmpltr = 3; - else if (strcasecmp (name, "tr") == 0) - cmpltr = 4; - else if (strcmp (name, "<>") == 0) - cmpltr = 5; - else if (strcmp (name, ">=") == 0) - cmpltr = 6; - else if (strcasecmp (name, "ev") == 0) - cmpltr = 7; - /* Handle movb,n. Put things back the way they were. - This includes moving s back to where it started. */ - else if (strcasecmp (name, "n") == 0 && *args == 'y') - { - *s = c; - s = save_s; - continue; - } - /* ",*" is a valid condition. */ - else if (*args != 'X') - as_bad (_("Invalid Shift/Extract/Deposit Condition.")); - *s = c; - } - INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); - - /* Handle a unit instruction condition. */ - case 'U': - case 'u': - cmpltr = 0; - flag = 0; - if (*s == ',') - { - s++; - - /* 64 bit conditions. */ - if (*args == 'U') - { - if (*s == '*') - s++; - else - break; - } - else if (*s == '*') - break; - - if (strncasecmp (s, "sbz", 3) == 0) - { - cmpltr = 2; - s += 3; - } - else if (strncasecmp (s, "shz", 3) == 0) - { - cmpltr = 3; - s += 3; - } - else if (strncasecmp (s, "sdc", 3) == 0) - { - cmpltr = 4; - s += 3; - } - else if (strncasecmp (s, "sbc", 3) == 0) - { - cmpltr = 6; - s += 3; - } - else if (strncasecmp (s, "shc", 3) == 0) - { - cmpltr = 7; - s += 3; - } - else if (strncasecmp (s, "tr", 2) == 0) - { - cmpltr = 0; - flag = 1; - s += 2; - } - else if (strncasecmp (s, "nbz", 3) == 0) - { - cmpltr = 2; - flag = 1; - s += 3; - } - else if (strncasecmp (s, "nhz", 3) == 0) - { - cmpltr = 3; - flag = 1; - s += 3; - } - else if (strncasecmp (s, "ndc", 3) == 0) - { - cmpltr = 4; - flag = 1; - s += 3; - } - else if (strncasecmp (s, "nbc", 3) == 0) - { - cmpltr = 6; - flag = 1; - s += 3; - } - else if (strncasecmp (s, "nhc", 3) == 0) - { - cmpltr = 7; - flag = 1; - s += 3; - } - /* ",*" is a valid condition. */ - else if (*args != 'U') - as_bad (_("Invalid Unit Instruction Condition.")); - } - opcode |= cmpltr << 13; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); + low = 0; + high = REG_NAME_CNT - 1; - default: - abort (); - } - break; - } + do + { + middle = (low + high) / 2; + cmp = strcasecmp (name, pre_defined_registers[middle].name); + if (cmp < 0) + high = middle - 1; + else if (cmp > 0) + low = middle + 1; + else + return pre_defined_registers[middle].value; + } + while (low <= high); - /* Handle a nullification completer for branch instructions. */ - case 'n': - nullif = pa_parse_nullif (&s); - INSERT_FIELD_AND_CONTINUE (opcode, nullif, 1); + return -1; +} - /* Handle a nullification completer for copr and spop insns. */ - case 'N': - nullif = pa_parse_nullif (&s); - INSERT_FIELD_AND_CONTINUE (opcode, nullif, 5); +/* Read a number from S. The number might come in one of many forms, + the most common will be a hex or decimal constant, but it could be + a pre-defined register (Yuk!), or an absolute symbol. - /* Handle ,gate completer for new syntax branches. */ - case 'g': - if (*s == ',' && strcasecmp (s + 1, "gate") == 0) - s += 5; - else - break; - continue; + 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'. - /* Handle ,l completer for new syntax branches. */ - case 'l': - if (*s == ',' && strcasecmp (s + 1, "l") == 0) - s += 2; - else - break; - continue; + 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. - /* Handle ,push completer for new syntax branches. */ - case 'M': - if (*s == ',' && strcasecmp (s + 1, "push") == 0) - s += 5; - else - break; - continue; + pa_parse_number can not handle negative constants and will fail + horribly if it is passed such a constant. */ - /* Handle ,pop completer for new syntax branches. */ - case 'B': - if (*s == ',' && strcasecmp (s + 1, "pop") == 0) - s += 4; - else - break; - continue; +static int +pa_parse_number (char **s, int is_float) +{ + int num; + char *name; + char c; + symbolS *sym; + int status; + char *p = *s; + bfd_boolean have_prefix; - /* Handle ,%r2 completer for new syntax branches. */ - case 'L': - if (*s == ',' && strcasecmp (s + 1, "%r2") == 0) - s += 4; - else if (*s == ',' && strcasecmp (s + 1, "%rp") == 0) - s += 4; - else - break; - continue; + /* Skip whitespace before the number. */ + while (*p == ' ' || *p == '\t') + p = p + 1; - /* 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; + pa_number = -1; + have_prefix = 0; + num = 0; + if (!strict && ISDIGIT (*p)) + { + /* Looks like a number. */ - /* Handle 3 bit entry into the fp compare array. Valid values - are 0..6 inclusive. */ - case 'm': - 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 = (num + 1) ^ 1; - INSERT_FIELD_AND_CONTINUE (opcode, num, 13); - } + if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X')) + { + /* The number is specified in hex. */ + p += 2; + while (ISDIGIT (*p) || ((*p >= 'a') && (*p <= 'f')) + || ((*p >= 'A') && (*p <= 'F'))) + { + if (ISDIGIT (*p)) + num = num * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') + num = num * 16 + *p - 'a' + 10; else - as_bad (_("Invalid CBit Specification: %s"), s); + num = num * 16 + *p - 'A' + 10; + ++p; + } + } + else + { + /* The number is specified in decimal. */ + while (ISDIGIT (*p)) + { + num = num * 10 + *p - '0'; + ++p; + } + } - /* Handle graphics test completers for ftest */ - case '=': - { - num = pa_parse_ftest_gfx_completer (&s); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - } + pa_number = num; - /* Handle a 11 bit immediate at 31. */ - case 'i': - the_insn.field_selector = pa_chk_field_selector (&s); - get_expression (s); - s = expr_end; - if (the_insn.exp.X_op == O_constant) + /* Check for a `l' or `r' suffix. */ + if (is_float) + { + pa_number += FP_REG_BASE; + if (! (is_float & 2)) + { + if (IS_R_SELECT (p)) { - num = evaluate_absolute (&the_insn); - CHECK_FIELD (num, 1023, -1024, 0); - low_sign_unext (num, 11, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + pa_number += FP_REG_RSEL; + ++p; } - else + else if (IS_L_SELECT (p)) { - 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 = 11; - continue; + ++p; } + } + } + } + else if (*p == '%') + { + /* The number might be a predefined register. */ + 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 + slow. */ + if (c == 'r') + { + p++; + if (*p == 'e' && *(p + 1) == 't' + && (*(p + 2) == '0' || *(p + 2) == '1')) + { + p += 2; + num = *p - '0' + 28; + p++; + } + else if (*p == 'p') + { + num = 2; + p++; + } + else if (!ISDIGIT (*p)) + { + if (print_errors) + as_bad (_("Undefined register: '%s'."), name); + num = -1; + } + else + { + do + num = num * 10 + *p++ - '0'; + while (ISDIGIT (*p)); + } + } + else + { + /* Do a normal register search. */ + while (is_part_of_name (c)) + { + p = p + 1; + c = *p; + } + *p = 0; + status = reg_name_search (name); + if (status >= 0) + num = status; + else + { + if (print_errors) + as_bad (_("Undefined register: '%s'."), name); + num = -1; + } + *p = c; + } - /* 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) - { - int a, m; + pa_number = num; + } + else + { + /* And finally, it could be a symbol in the absolute section which + is effectively a constant, or a register alias symbol. */ + name = p; + c = *p; + while (is_part_of_name (c)) + { + p = p + 1; + c = *p; + } + *p = 0; + if ((sym = symbol_find (name)) != NULL) + { + 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); + else if (!strict) + { + if (print_errors) + as_bad (_("Non-absolute symbol: '%s'."), name); + num = -1; + } + } + else if (!strict) + { + /* There is where we'd come for an undefined symbol + or for an empty string. For an empty string we + will return zero. That's a concession made for + compatibility with the braindamaged HP assemblers. */ + if (*name == 0) + num = 0; + else + { + if (print_errors) + as_bad (_("Undefined absolute constant: '%s'."), name); + num = -1; + } + } + *p = c; - /* XXX the completer stored away tibits 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. */ - m = (opcode & (1 << 8)) != 0; - a = (opcode & (1 << 9)) != 0; - opcode &= ~ (3 << 8); - num = evaluate_absolute (&the_insn); - if (a == 1 && num >= 0 || (a == 0 && num < 0)) - break; - CHECK_FIELD (num, 8191, -8192, 0); - low_sign_unext (num, 14, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - } - else - { - break; - } + pa_number = num; + } - /* 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) - { - int a, m; + if (!strict || have_prefix) + { + *s = p; + return 1; + } + return 0; +} - /* XXX the completer stored away tibits 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. */ - m = (opcode & (1 << 8)) != 0; - a = (opcode & (1 << 9)) != 0; - opcode &= ~ (3 << 8); - num = evaluate_absolute (&the_insn); - if (a == 1 && num < 0 || (a == 0 && num > 0)) - break; - if (num % 4) - break; - CHECK_FIELD (num, 8191, -8192, 0); - if (num < 0) - opcode |= 1; - num &= 0x1fff; - num >>= 2; - INSERT_FIELD_AND_CONTINUE (opcode, num, 3); - } - else - { - break; - } +/* Return nonzero if the given INSN and L/R information will require + a new PA-1.1 opcode. */ - /* Handle 14 bit immediated, 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; - } +static int +need_pa11_opcode (void) +{ + 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 (bfd_get_mach (stdoutput) < pa11) + { + if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, pa11)) + as_warn (_("could not update architecture and machine")); + } + return TRUE; + } + else + return FALSE; +} + +/* Parse a condition for a fcmp instruction. Return the numerical + code associated with the condition. */ + +static int +pa_parse_fp_cmp_cond (char **s) +{ + int cond, i; + + cond = 0; + + for (i = 0; i < 32; i++) + { + if (strncasecmp (*s, fp_cond_map[i].string, + strlen (fp_cond_map[i].string)) == 0) + { + cond = fp_cond_map[i].cond; + *s += strlen (fp_cond_map[i].string); + /* If not a complete match, back up the input string and + report an error. */ + if (**s != ' ' && **s != '\t') + { + *s -= strlen (fp_cond_map[i].string); break; + } + while (**s == ' ' || **s == '\t') + *s = *s + 1; + return cond; + } + } - /* 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; - } + as_bad (_("Invalid FP Compare Condition: %s"), *s); - /* 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); - low_sign_unext (num, 14, &num); - 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; - } + /* Advance over the bogus completer. */ + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; - /* 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); - dis_assemble_21 (num, &num); - 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; - } + return 0; +} - /* 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 (!strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), "L$0\001")) - { - unsigned int w1, w, result; +/* Parse a graphics test complete for ftest. */ + +static int +pa_parse_ftest_gfx_completer (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); + } - num = evaluate_absolute (&the_insn); - if (num % 4) - { - 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); - } - else - { - the_insn.reloc = R_HPPA_PCREL_CALL; - the_insn.format = 12; - the_insn.arg_reloc = last_call_desc.arg_reloc; - memset (&last_call_desc, 0, sizeof (struct call_desc)); - s = expr_end; - continue; - } + return value; +} - /* Handle a 17 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")) - { - unsigned int w2, w1, w, result; +/* Parse an FP operand format completer returning the completer + type. */ - num = evaluate_absolute (&the_insn); - if (num % 4) - { - as_bad (_("Branch to unaligned address")); - break; - } - CHECK_FIELD (num, 262143, -262144, 0); +static fp_operand_format +pa_parse_fp_cnv_format (char **s) +{ + int format; - if (the_insn.exp.X_add_symbol) - num -= 8; + 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); + } + } - sign_unext (num >> 2, 17, &result); - dis_assemble_17 (result, &w1, &w2, &w); - INSERT_FIELD_AND_CONTINUE (opcode, - ((w2 << 2) | (w1 << 16) | w), 0); - } - 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; - } + return format; +} - /* 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")) - { - unsigned int w3, w2, w1, w, result; +/* Parse an FP operand format completer returning the completer + type. */ - num = evaluate_absolute (&the_insn); - if (num % 4) - { - as_bad (_("Branch to unaligned address")); - break; - } - CHECK_FIELD (num, 8388607, -8388608, 0); +static fp_operand_format +pa_parse_fp_format (char **s) +{ + int format; - if (the_insn.exp.X_add_symbol) - num -= 8; + 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 + { + format = ILLEGAL_FMT; + as_bad (_("Invalid FP Operand Format: %3s"), *s); + } + } - sign_unext (num >> 2, 22, &result); - dis_assemble_22 (result, &w3, &w1, &w2, &w); - INSERT_FIELD_AND_CONTINUE (opcode, - ((w3 << 21) | (w2 << 2) - | (w1 << 16) | w), - 0); - } - else - { - the_insn.reloc = R_HPPA_PCREL_CALL; - the_insn.format = 22; - the_insn.arg_reloc = last_call_desc.arg_reloc; - memset (&last_call_desc, 0, sizeof (struct call_desc)); - continue; - } + return format; +} - /* Handle an absolute 17 bit branch target. */ - case 'z': - the_insn.field_selector = pa_chk_field_selector (&s); - get_expression (s); - s = expr_end; - the_insn.pcrel = 0; - if (!the_insn.exp.X_add_symbol - || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), - "L$0\001")) - { - unsigned int w2, w1, w, result; +/* Convert from a selector string into a selector type. */ - num = evaluate_absolute (&the_insn); - if (num % 4) - { - as_bad (_("Branch to unaligned address")); - break; - } - CHECK_FIELD (num, 262143, -262144, 0); +static int +pa_chk_field_selector (char **str) +{ + int middle, low, high; + int cmp; + char name[4]; - if (the_insn.exp.X_add_symbol) - num -= 8; + /* Read past any whitespace. */ + /* FIXME: should we read past newlines and formfeeds??? */ + while (**str == ' ' || **str == '\t' || **str == '\n' || **str == '\f') + *str = *str + 1; - sign_unext (num >> 2, 17, &result); - dis_assemble_17 (result, &w1, &w2, &w); - INSERT_FIELD_AND_CONTINUE (opcode, - ((w2 << 2) | (w1 << 16) | w), 0); - } - else - { - the_insn.reloc = R_HPPA_ABS_CALL; - the_insn.format = 17; - the_insn.arg_reloc = last_call_desc.arg_reloc; - memset (&last_call_desc, 0, sizeof (struct call_desc)); - continue; - } + if ((*str)[1] == '\'' || (*str)[1] == '%') + name[0] = TOLOWER ((*str)[0]), + name[1] = 0; + else if ((*str)[2] == '\'' || (*str)[2] == '%') + name[0] = TOLOWER ((*str)[0]), + name[1] = TOLOWER ((*str)[1]), + 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[3] = 0; + else + return e_fsel; - /* 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; + low = 0; + high = sizeof (selector_table) / sizeof (struct selector_entry) - 1; - /* Handle a 2 bit shift count at 25. */ - 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, 3, 1, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 6); + do + { + middle = (low + high) / 2; + cmp = strcmp (name, selector_table[middle].prefix); + if (cmp < 0) + high = middle - 1; + else if (cmp > 0) + low = middle + 1; + else + { + *str += strlen (name) + 1; +#ifndef OBJ_SOM + if (selector_table[middle].field_selector == e_nsel) + return e_fsel; +#endif + return selector_table[middle].field_selector; + } + } + while (low <= high); - /* Handle a 4 bit shift count at 25. */ - 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, 15, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 6); + return e_fsel; +} - /* Handle a 5 bit shift count 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, 31 - num, 5); +/* Parse a .byte, .word, .long expression for the HPPA. Called by + cons via the TC_PARSE_CONS_EXPRESSION macro. */ - /* 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); +void +parse_cons_expression_hppa (expressionS *exp) +{ + hppa_field_selector = pa_chk_field_selector (&input_line_pointer); + expression (exp); +} - /* 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); +/* Evaluate an absolute expression EXP which may be modified by + the selector FIELD_SELECTOR. Return the value of the expression. */ +static int +evaluate_absolute (struct pa_it *insn) +{ + offsetT value; + expressionS exp; + int field_selector = insn->field_selector; - /* 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); + exp = insn->exp; + value = exp.X_add_number; - /* 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); + return hppa_field_adjust (0, value, field_selector); +} - /* 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); +/* Mark (via expr_end) the end of an absolute expression. FIXME. */ - /* 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; - if (the_insn.exp.X_op != O_constant) - break; - s = expr_end; - CHECK_FIELD (num, 31, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 21); +static int +pa_get_absolute_expression (struct pa_it *insn, char **strp) +{ + char *save_in; - /* 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); + insn->field_selector = pa_chk_field_selector (strp); + save_in = input_line_pointer; + input_line_pointer = *strp; + expression (&insn->exp); + /* This is not perfect, but is a huge improvement over doing nothing. - /* 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, 671108864, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + The PA assembly syntax is ambiguous 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 r5? - /* Handle a 3 bit SFU identifier at 25. */ - case 'v': - 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; - CHECK_FIELD (num, 7, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 6); + If we get a modulo expression when looking for an absolute, we try + again cutting off the input string at the first whitespace character. */ + if (insn->exp.X_op == O_modulus) + { + char *s, c; + int retval; - /* 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; - CHECK_FIELD (num, 1048575, 0, strict); - num = (num & 0x1f) | ((num & 0x000fffe0) << 6); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + input_line_pointer = *strp; + s = *strp; + while (*s != ',' && *s != ' ' && *s != '\t') + s++; - /* 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; - CHECK_FIELD (num, 32767, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 11); + c = *s; + *s = 0; - /* 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; - CHECK_FIELD (num, 1023, 0, strict); - num = (num & 0x1f) | ((num & 0x000003e0) << 6); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + retval = pa_get_absolute_expression (insn, strp); - /* 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; - CHECK_FIELD (num, 32767, 0, strict); - num = (num & 0x1f) | ((num & 0x00007fe0) << 6); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + input_line_pointer = save_in; + *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).")); + expr_end = input_line_pointer; + input_line_pointer = save_in; + return 0; + } + expr_end = input_line_pointer; + input_line_pointer = save_in; + return evaluate_absolute (insn); +} - /* Handle a 3-bit co-processor ID field. */ - case 'u': - 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; - CHECK_FIELD (num, 7, 0, strict); - INSERT_FIELD_AND_CONTINUE (opcode, num, 6); +/* Given an argument location specification return the associated + argument location number. */ - /* 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; - CHECK_FIELD (num, 4194303, 0, strict); - num = (num & 0x1f) | ((num & 0x003fffe0) << 4); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); +static unsigned int +pa_build_arg_reloc (char *type_name) +{ - /* 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); + if (strncasecmp (type_name, "no", 2) == 0) + return 0; + if (strncasecmp (type_name, "gr", 2) == 0) + return 1; + else if (strncasecmp (type_name, "fr", 2) == 0) + return 2; + else if (strncasecmp (type_name, "fu", 2) == 0) + return 3; + else + as_bad (_("Invalid argument location: %s\n"), type_name); - /* 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); + return 0; +} - /* Handle a source FP operand format completer. */ - case 'F': - flag = pa_parse_fp_format (&s); - the_insn.fpof1 = flag; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); +/* Encode and return an argument relocation specification for + the given register in the location specified by arg_reloc. */ - /* Handle a destination FP operand format completer. */ - case 'G': - /* pa_parse_format needs the ',' prefix. */ - s--; - flag = pa_parse_fp_format (&s); - the_insn.fpof2 = flag; - INSERT_FIELD_AND_CONTINUE (opcode, flag, 13); +static unsigned int +pa_align_arg_reloc (unsigned int reg, unsigned int arg_reloc) +{ + unsigned int new_reloc; - /* 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); + new_reloc = arg_reloc; + switch (reg) + { + case 0: + new_reloc <<= 8; + break; + case 1: + new_reloc <<= 6; + break; + case 2: + new_reloc <<= 4; + break; + case 3: + new_reloc <<= 2; + break; + default: + as_bad (_("Invalid argument description: %d"), reg); + } - /* 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; + return new_reloc; +} - case QUAD: - case ILLEGAL_FMT: - default: - as_bad (_("Invalid Floating Point Operand Format.")); - } - break; +/* Parse a non-negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ - /* Handle all floating point registers. */ - case 'f': - switch (*++args) - { - /* Float target register. */ - case 't': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - num = pa_parse_number (&s, 0); - CHECK_FIELD (num, 31, 0, 0); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); +static int +pa_parse_nonneg_cmpsub_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; - /* Float target register with L/R selection. */ - case 'T': - { - struct pa_11_fp_reg_struct result; + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - opcode |= result.number_part; + 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; + } - /* 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; + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; - INSERT_FIELD_AND_CONTINUE (opcode, result.l_r_select & 1, 6); - } + return cmpltr; +} - /* Float operand 1. */ - case 'a': - { - struct pa_11_fp_reg_struct result; +/* Parse a negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ + +static int +pa_parse_neg_cmpsub_cmpltr (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; + } - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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)) - { - opcode |= (result.l_r_select & 1) << 7; - opcode |= 1 << 27; - } - continue; - } + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; - /* Float operand 1 with L/R selection. */ - case 'X': - case 'A': - { - struct pa_11_fp_reg_struct result; + return cmpltr; +} - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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; - } +/* Parse a 64 bit compare and branch completer returning the number (for + encoding in instructions) of the given completer. - /* Float operand 2. */ - case 'b': - { - struct pa_11_fp_reg_struct result; + Nonnegated comparisons are returned as 0-7, negated comparisons are + returned as 8-15. */ - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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)) - { - opcode |= (result.l_r_select & 1) << 12; - opcode |= 1 << 27; - } - continue; - } +static int +pa_parse_cmpb_64_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; - /* Float operand 2 with L/R selection. */ - case 'B': - { - struct pa_11_fp_reg_struct result; + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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; - } + 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; + } - /* Float operand 3 for fmpyfadd, fmpynfadd. */ - case 'C': - { - struct pa_11_fp_reg_struct result; - int regnum; + return cmpltr; +} - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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; - } +/* Parse a 64 bit compare immediate and branch completer returning the number + (for encoding in instructions) of the given completer. */ - /* Float mult operand 1 for fmpyadd, fmpysub */ - case 'i': - { - struct pa_11_fp_reg_struct result; +static int +pa_parse_cmpib_64_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - if (the_insn.fpof1 == SGL) - { - if (result.number_part < 16) - { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; - } + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; - } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 21); - } + 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 = c; + } - /* Float mult operand 2 for fmpyadd, fmpysub */ - case 'j': - { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - if (the_insn.fpof1 == SGL) - { - if (result.number_part < 16) - { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; - } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; - } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 16); - } + return cmpltr; +} - /* Float mult target for fmpyadd, fmpysub */ - case 'k': - { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - if (the_insn.fpof1 == SGL) - { - if (result.number_part < 16) - { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; - } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; - } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 0); - } +/* Parse a non-negated addition completer returning the number + (for encoding in instructions) of the given completer. */ - /* Float add operand 1 for fmpyadd, fmpysub */ - case 'l': - { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - if (the_insn.fpof1 == SGL) - { - if (result.number_part < 16) - { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; - } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; - } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 6); - } +static int +pa_parse_nonneg_add_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; - /* Float add target for fmpyadd, fmpysub */ - case 'm': - { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - if (the_insn.fpof1 == SGL) - { - if (result.number_part < 16) - { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; - } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; - } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 11); - } + 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 (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; + } + /* 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; + } - /* Handle L/R register halves like 'x'. */ - case 'e': - { - struct pa_11_fp_reg_struct result; + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; - if (strict && *s != '%') - break; - 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)) - { - opcode |= (result.l_r_select & 1) << 1; - } - continue; - default: - abort (); - } - break; + return cmpltr; +} - /* Handle L/R register halves like 'x'. */ - case 'e': - { - struct pa_11_fp_reg_struct result; +/* Parse a negated addition completer returning the number + (for encoding in instructions) of the given completer. */ - /* This should be more strict. Small steps. */ - if (strict && *s != '%') - break; - 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)) - { - opcode |= (result.l_r_select & 1) << 1; - } - continue; - } +static int +pa_parse_neg_add_cmpltr (char **s) +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; - default: - abort (); - } - break; + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + if (strcasecmp (name, "tr") == 0) + { + cmpltr = 0; } - - failed: - /* Check if the args matched. */ - if (match == FALSE) + else if (strcmp (name, "<>") == 0) { - if (&insn[1] - pa_opcodes < (int) NUMOPCODES - && !strcmp (insn->name, insn[1].name)) - { - ++insn; - s = argstart; - continue; - } - else - { - as_bad (_("Invalid operands %s"), error_message); - return; - } + cmpltr = 1; } - break; + else if (strcmp (name, ">=") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, ">") == 0) + { + cmpltr = 3; + } + else if (strcasecmp (name, "uv") == 0) + { + cmpltr = 4; + } + else if (strcasecmp (name, "vnz") == 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; } - the_insn.opcode = opcode; -} + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; -/* Turn a string in input_line_pointer into a floating point constant of type - type, and store the appropriate bytes in *litP. The number of LITTLENUMS - emitted is stored in *sizeP . An error message or NULL is returned. */ + return cmpltr; +} -#define MAX_LITTLENUMS 6 +/* Parse a 64 bit wide mode add and branch completer returning the number (for + encoding in instructions) of the given completer. */ -char * -md_atof (type, litP, sizeP) - char type; - char *litP; - int *sizeP; +static int +pa_parse_addb_64_cmpltr (char **s) { - int prec; - LITTLENUM_TYPE words[MAX_LITTLENUMS]; - LITTLENUM_TYPE *wordP; - char *t; + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; - switch (type) + 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 (strcasecmp (name, "nuv") == 0) + { + cmpltr = 4; + } + else if (strcasecmp (name, "*=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*<") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*<=") == 0) + { + cmpltr = 7; + } + else if (strcmp (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 (strcasecmp (name, "uv") == 0) + { + cmpltr = 12; + } + else if (strcasecmp (name, "*<>") == 0) + { + cmpltr = 13; + } + else if (strcasecmp (name, "*>=") == 0) + { + cmpltr = 14; + } + else if (strcasecmp (name, "*>") == 0) + { + cmpltr = 15; + } + /* 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; + } - case 'f': - case 'F': - case 's': - case 'S': - prec = 2; - break; + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; - case 'd': - case 'D': - case 'r': - case 'R': - prec = 4; - break; + return cmpltr; +} - case 'x': - case 'X': - prec = 6; - break; +/* Do the real work for assembling a single instruction. Store results + into the global "the_insn" variable. */ - case 'p': - case 'P': - prec = 6; - break; +static void +pa_ip (char *str) +{ + char *error_message = ""; + char *s, c, *argstart, *name, *save_s; + const char *args; + int match = FALSE; + int comma = 0; + int cmpltr, nullif, flag, cond, num; + unsigned long opcode; + struct pa_opcode *insn; - default: - *sizeP = 0; - return _("Bad call to MD_ATOF()"); - } - t = atof_ieee (input_line_pointer, type, words); - if (t) - input_line_pointer = t; - *sizeP = prec * sizeof (LITTLENUM_TYPE); - for (wordP = words; prec--;) +#ifdef OBJ_SOM + /* We must have a valid space and subspace. */ + pa_check_current_space_and_subspace (); +#endif + + /* Convert everything up to the first whitespace character into lower + case. */ + for (s = str; *s != ' ' && *s != '\t' && *s != '\n' && *s != '\0'; s++) + *s = TOLOWER (*s); + + /* Skip to something interesting. */ + for (s = str; + ISUPPER (*s) || ISLOWER (*s) || (*s >= '0' && *s <= '3'); + ++s) + ; + + switch (*s) { - md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE)); - litP += sizeof (LITTLENUM_TYPE); + + case '\0': + break; + + case ',': + comma = 1; + + /*FALLTHROUGH */ + + case ' ': + *s++ = '\0'; + break; + + default: + as_bad (_("Unknown opcode: `%s'"), str); + return; } - return NULL; -} -/* Write out big-endian. */ + /* Look up the opcode in the has table. */ + if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL) + { + as_bad ("Unknown opcode: `%s'", str); + return; + } -void -md_number_to_chars (buf, val, n) - char *buf; - valueT val; - int n; -{ - number_to_chars_bigendian (buf, val, n); -} + if (comma) + *--s = ','; -/* Translate internal representation of relocation info to BFD target - format. */ + /* Mark the location where arguments for the instruction start, then + start processing them. */ + argstart = s; + for (;;) + { + /* Do some initialization. */ + opcode = insn->match; + strict = (insn->flags & FLAG_STRICT); + memset (&the_insn, 0, sizeof (the_insn)); -arelent ** -tc_gen_reloc (section, fixp) - asection *section; - fixS *fixp; -{ - arelent *reloc; - struct hppa_fix_struct *hppa_fixp; - bfd_reloc_code_real_type code; - static arelent *no_relocs = NULL; - arelent **relocs; - bfd_reloc_code_real_type **codes; - int n_relocs; - int i; + the_insn.reloc = R_HPPA_NONE; - 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); + if (insn->arch >= pa20 + && bfd_get_mach (stdoutput) < insn->arch) + goto failed; - reloc = (arelent *) xmalloc (sizeof (arelent)); + /* Build the opcode, checking as we go to make + sure that the operands match. */ + for (args = insn->args;; ++args) + { + /* Absorb white space in instruction. */ + while (*s == ' ' || *s == '\t') + s++; - 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, - fixp->fx_r_type, - hppa_fixp->fx_r_format, - hppa_fixp->fx_r_field, - fixp->fx_subsy != NULL, - symbol_get_bfdsym (fixp->fx_addsy)); + switch (*args) + { + /* End of arguments. */ + case '\0': + if (*s == '\0') + match = TRUE; + break; - if (codes == NULL) - abort (); + case '+': + if (*s == '+') + { + ++s; + continue; + } + if (*s == '-') + continue; + break; - for (n_relocs = 0; codes[n_relocs]; n_relocs++) - ; + /* These must match exactly. */ + case '(': + case ')': + case ',': + case ' ': + if (*s++ == *args) + continue; + break; - relocs = (arelent **) xmalloc (sizeof (arelent *) * n_relocs + 1); - reloc = (arelent *) xmalloc (sizeof (arelent) * n_relocs); - for (i = 0; i < n_relocs; i++) - relocs[i] = &reloc[i]; + /* Handle a 5 bit register or control register field at 10. */ + case 'b': + case '^': + if (!pa_parse_number (&s, 0)) + break; + num = pa_number; + CHECK_FIELD (num, 31, 0, 0); + INSERT_FIELD_AND_CONTINUE (opcode, num, 21); - relocs[n_relocs] = NULL; + /* 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; -#ifdef OBJ_ELF - switch (fixp->fx_r_type) - { - default: - assert (n_relocs == 1); + if (!strncasecmp (s, "%sar", 4)) + { + s += 4; + continue; + } + else if (!strncasecmp (s, "%cr11", 5)) + { + s += 5; + continue; + } + break; - code = *codes[0]; + /* Handle a 5 bit register field at 15. */ + case 'x': + if (!pa_parse_number (&s, 0)) + break; + num = pa_number; + CHECK_FIELD (num, 31, 0, 0); + INSERT_FIELD_AND_CONTINUE (opcode, num, 16); - 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 */ + /* Handle a 5 bit register field at 31. */ + case 't': + if (!pa_parse_number (&s, 0)) + break; + num = pa_number; + CHECK_FIELD (num, 31, 0, 0); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - assert (reloc->howto && code == reloc->howto->type); + /* 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); - /* Now, do any processing that is dependent on the relocation type. */ - switch (code) - { - case R_PARISC_DLTREL21L: - case R_PARISC_DLTREL14R: - case R_PARISC_DLTREL14F: - case R_PARISC_PLABEL32: - case R_PARISC_PLABEL21L: - case R_PARISC_PLABEL14R: - /* For plabel relocations, the addend of the - relocation should be either 0 (no static link) or 2 - (static link required). + /* 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); - FIXME: We always assume no static link! + /* 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; + /* 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); - We also slam a zero addend into the DLT relative relocs; - it doesn't make a lot of sense to use any addend since - it gets you a different (eg unknown) DLT entry. */ - reloc->addend = 0; - break; + /* 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; + /* 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); - case R_PARISC_PCREL21L: - 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); - break; - default: - reloc->addend = fixp->fx_offset; - break; - } - break; - } -#else /* OBJ_SOM */ + /* 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; + CHECK_FIELD (num, 31, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - /* Walk over reach relocation returned by the BFD backend. */ - for (i = 0; i < n_relocs; i++) - { - code = *codes[i]; + /* 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; + CHECK_FIELD (num, 31, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 16); - 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]->address = fixp->fx_frag->fr_address + fixp->fx_where; + /* 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); - switch (code) - { - case R_COMP2: - /* The only time we ever use a R_COMP2 fixup is for the difference - of two symbols. With that in mind we fill in all four - 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]->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]->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]->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]->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]->address = fixp->fx_frag->fr_address + fixp->fx_where; - relocs[4]->addend = 0; - goto done; - case R_PCREL_CALL: - case R_ABS_CALL: - relocs[i]->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0); - break; + /* Handle a 2 bit space identifier at 17. */ + case 's': + if (!pa_parse_number (&s, 0)) + break; + num = pa_number; + CHECK_FIELD (num, 3, 0, 1); + INSERT_FIELD_AND_CONTINUE (opcode, num, 14); - case R_DLT_REL: - case R_DATA_PLABEL: - case R_CODE_PLABEL: - /* For plabel relocations, the addend of the - relocation should be either 0 (no static link) or 2 - (static link required). + /* Handle a 3 bit space identifier at 18. */ + case 'S': + if (!pa_parse_number (&s, 0)) + break; + num = pa_number; + CHECK_FIELD (num, 7, 0, 1); + opcode |= re_assemble_3 (num); + continue; - FIXME: We always assume no static link! + /* Handle all completers. */ + case 'c': + switch (*++args) + { - We also slam a zero addend into the DLT relative relocs; - it doesn't make a lot of sense to use any addend since - it gets you a different (eg unknown) DLT entry. */ - relocs[i]->addend = 0; - break; + /* Handle a completer for an indexing load or store. */ + case 'X': + case 'x': + { + int uu = 0; + int m = 0; + int i = 0; + while (*s == ',' && i < 2) + { + 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; + else if (strict) + { + /* This is a match failure. */ + s--; + break; + } + 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); + } - case R_N_MODE: - case R_S_MODE: - case R_D_MODE: - case R_R_MODE: - case R_FSEL: - case R_LSEL: - case R_RSEL: - case R_BEGIN_BRTAB: - case R_END_BRTAB: - case R_BEGIN_TRY: - case R_N0SEL: - case R_N1SEL: - /* There is no symbol or addend associated with these fixups. */ - relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); - relocs[i]->addend = 0; - break; + /* Handle a short load/store completer. */ + case 'M': + case 'm': + case 'q': + case 'J': + case 'e': + { + int a = 0; + int m = 0; + if (*s == ',') + { + s++; + if (strncasecmp (s, "ma", 2) == 0) + { + a = 0; + m = 1; + s += 2; + } + else if (strncasecmp (s, "mb", 2) == 0) + { + a = 1; + m = 1; + s += 2; + } + else if (strict) + /* This is a match failure. */ + s--; + else + { + as_bad (_("Invalid Short Load/Store Completer.")); + s += 2; + } + } + /* 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; - case R_END_TRY: - case R_ENTRY: - case R_EXIT: - /* There is no symbol associated with these fixups. */ - relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); - relocs[i]->addend = fixp->fx_offset; - break; + /* 'J', 'm', 'M' and 'q' are the same, except for where they + encode the before/after field. */ + if (*args == 'm' || *args == 'M') + { + opcode |= m << 5; + INSERT_FIELD_AND_CONTINUE (opcode, a, 13); + } + else if (*args == 'q') + { + opcode |= m << 3; + INSERT_FIELD_AND_CONTINUE (opcode, a, 2); + } + 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; + } + } - default: - relocs[i]->addend = fixp->fx_offset; - } - } + /* Handle a stbys completer. */ + case 'A': + case 's': + { + 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 ", 2) == 0) + || (strncasecmp (s, "b,", 2) == 0)) + a = 0; + else if (strncasecmp (s, "e", 1) == 0) + a = 1; + /* In strict mode, this is a match failure. */ + else if (strict) + { + s--; + break; + } + else + as_bad (_("Invalid Store Bytes Short Completer")); + s++; + i++; + } + if (i > 2) + as_bad (_("Invalid Store Bytes Short Completer")); + opcode |= m << 5; + INSERT_FIELD_AND_CONTINUE (opcode, a, 13); + } - done: -#endif + /* 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); - return relocs; -} + /* 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); -/* Process any machine dependent frag types. */ + /* 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); -void -md_convert_frag (abfd, sec, fragP) - register bfd *abfd; - register asection *sec; - register fragS *fragP; -{ - unsigned int address; + /* Handle load ordering completer. */ + case 'o': + if (strncmp (s, ",o", 2) != 0) + break; + s += 2; + continue; - if (fragP->fr_type == rs_machine_dependent) - { - switch ((int) fragP->fr_subtype) - { - case 0: - fragP->fr_type = rs_fill; - know (fragP->fr_var == 1); - know (fragP->fr_next); - address = fragP->fr_address + fragP->fr_fix; - if (address % fragP->fr_offset) - { - fragP->fr_offset = - fragP->fr_next->fr_address - - fragP->fr_address - - fragP->fr_fix; - } - else - fragP->fr_offset = 0; - break; - } - } -} + /* Handle a branch gate completer. */ + case 'g': + if (strncasecmp (s, ",gate", 5) != 0) + break; + s += 5; + continue; -/* Round up a section size to the appropriate boundary. */ + /* Handle a branch link and push completer. */ + case 'p': + if (strncasecmp (s, ",l,push", 7) != 0) + break; + s += 7; + continue; -valueT -md_section_align (segment, size) - asection *segment; - valueT size; -{ - int align = bfd_get_section_alignment (stdoutput, segment); - int align2 = (1 << align) - 1; + /* Handle a branch link completer. */ + case 'l': + if (strncasecmp (s, ",l", 2) != 0) + break; + s += 2; + continue; - return (size + align2) & ~align2; -} + /* Handle a branch pop completer. */ + case 'P': + if (strncasecmp (s, ",pop", 4) != 0) + break; + s += 4; + continue; -/* Return the approximate size of a frag before relaxation has occurred. */ -int -md_estimate_size_before_relax (fragP, segment) - register fragS *fragP; - asection *segment; -{ - int size; + /* Handle a local processor completer. */ + case 'L': + if (strncasecmp (s, ",l", 2) != 0) + break; + s += 2; + continue; - size = 0; + /* 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; + } - while ((fragP->fr_fix + size) % fragP->fr_offset) - size++; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); - return size; -} - -CONST char *md_shortopts = ""; -struct option md_longopts[] = { - {NULL, no_argument, NULL, 0} -}; -size_t md_longopts_size = sizeof(md_longopts); + /* Handle MFCTL wide completer. */ + case 'W': + if (strncasecmp (s, ",w", 2) != 0) + break; + s += 2; + continue; -int -md_parse_option (c, arg) - int c; - char *arg; -{ - return 0; -} + /* Handle an RFI restore completer. */ + case 'r': + flag = 0; + if (!strncasecmp (s, ",r", 2)) + { + flag = 5; + s += 2; + } -void -md_show_usage (stream) - FILE *stream; -{ -} - -/* We have no need to default values of symbols. */ + INSERT_FIELD_AND_CONTINUE (opcode, flag, 5); -symbolS * -md_undefined_symbol (name) - char *name; -{ - return 0; -} + /* Handle a system control completer. */ + case 'Z': + if (*s == ',' && (*(s + 1) == 'm' || *(s + 1) == 'M')) + { + flag = 1; + s += 2; + } + else + flag = 0; -/* Apply a fixup to an instruction. */ + INSERT_FIELD_AND_CONTINUE (opcode, flag, 5); -int -md_apply_fix (fixP, valp) - fixS *fixP; - valueT *valp; -{ - char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; - struct hppa_fix_struct *hppa_fixP; - long new_val, result = 0; - unsigned int w1, w2, w, resulti; + /* Handle intermediate/final completer for DCOR. */ + case 'i': + flag = 0; + if (!strncasecmp (s, ",i", 2)) + { + flag = 1; + s += 2; + } - 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. */ -#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) - return 1; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); - /* Disgusting. We must set fx_offset ourselves -- R_HPPA_END_TRY - fixups are considered not adjustable, which in turn causes - adjust_reloc_syms to not set fx_offset. Ugh. */ - if (fixP->fx_r_type == R_HPPA_END_TRY) - { - fixP->fx_offset = *valp; - return 1; - } -#endif + /* Handle zero/sign extension completer. */ + case 'z': + flag = 1; + if (!strncasecmp (s, ",z", 2)) + { + flag = 0; + s += 2; + } - /* There should have been an HPPA specific fixup associated - with the GAS fixup. */ - if (hppa_fixP) - { - 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) -#ifdef OBJ_SOM - && fmt != 32 -#endif - ) - new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); -#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); -#endif - else - new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field); + INSERT_FIELD_AND_CONTINUE (opcode, flag, 10); - /* 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 - && !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) -#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; + /* 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; + } - /* Handle all opcodes with the 'k' operand type. */ - case 21: - CHECK_FIELD (new_val, 2097152, 0, 0); + INSERT_FIELD_AND_CONTINUE (opcode, flag, 10); - /* 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; + /* 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; - /* Handle all the opcodes with the 'i' operand type. */ - case 11: - CHECK_FIELD (new_val, 1023, -1023, 0); + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); - /* 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; + /* 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; - /* Handle all the opcodes with the 'w' operand type. */ - case 12: - CHECK_FIELD (new_val, 8199, -8184, 0); + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); - /* 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); + /* Handle trap on signed overflow. */ + case 'v': + flag = 0; + if (!strncasecmp (s, ",tsv", 4)) + { + flag = 1; + s += 4; + } - dis_assemble_12 (resulti, &w1, &w); - result = ((w1 << 2) | w); - break; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); - /* 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; - } + /* 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; - case 22: - { - int distance = *valp, w3; - - CHECK_FIELD (new_val, 8388607, -8388608, 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 > 8388607 || distance < -8388608) - && (bfd_get_32 (stdoutput, buf) & 0xffe00000) == 0xe8000000) - CHECK_FIELD (distance, 8388607, -8388608, 0); - - /* Mask off 22 bits to be changed. */ - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xfc00e002, - buf); - sign_unext ((new_val - 8) >> 2, 22, &resulti); - dis_assemble_22 (resulti, &w3, &w1, &w2, &w); - result = ((w3 << 21) | (w2 << 2) | (w1 << 16) | w); - break; - } + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); - case 32: - result = 0; - bfd_put_32 (stdoutput, new_val, buf); - break; + /* 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; - default: - as_bad (_("Unknown relocation encountered in md_apply_fix.")); - return 0; - } + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); - /* 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); - return 0; - } -} + /* 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; -/* Exactly what point is a PC-relative offset relative TO? - On the PA, they're relative to the address of the offset. */ + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); -long -md_pcrel_from (fixP) - fixS *fixP; -{ - return fixP->fx_where + fixP->fx_frag->fr_address; -} + /* Handle trap condition completer for UADDCM. */ + case 'T': + flag = 0; + if (!strncasecmp (s, ",tc", 3)) + { + flag = 1; + s += 3; + } -/* Return nonzero if the input line pointer is at the end of - a statement. */ + INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); -static int -is_end_of_statement () -{ - return ((*input_line_pointer == '\n') - || (*input_line_pointer == ';') - || (*input_line_pointer == '!')); -} + /* 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; + } -/* Read a number from S. The number might come in one of many forms, - the most common will be a hex or decimal constant, but it could be - a pre-defined register (Yuk!), or an absolute symbol. + 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")); - Return a number or -1 for failure. + s++; + INSERT_FIELD_AND_CONTINUE (opcode, lr, 13); + } + else + as_bad (_("Invalid left/right combination completer")); + break; - 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. + /* 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; + } - pa_parse_number can not handle negative constants and will fail - horribly if it is passed such a constant. */ + INSERT_FIELD_AND_CONTINUE (opcode, sat, 6); + } -static int -pa_parse_number (s, result) - char **s; - struct pa_11_fp_reg_struct *result; -{ - int num; - char *name; - char c; - symbolS *sym; - int status; - char *p = *s; + /* 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; - /* Skip whitespace before the number. */ - while (*p == ' ' || *p == '\t') - p = p + 1; + default: + abort (); + } + break; - /* Store info in RESULT if requested by caller. */ - if (result) - { - result->number_part = -1; - result->l_r_select = -1; - } - num = -1; + /* 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); - if (isdigit (*p)) - { - /* Looks like a number. */ - num = 0; + /* Handle an add condition. */ + case 'A': + case 'a': + cmpltr = 0; + flag = 0; + if (*s == ',') + { + s++; - if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X')) - { - /* The number is specified in hex. */ - p += 2; - while (isdigit (*p) || ((*p >= 'a') && (*p <= 'f')) - || ((*p >= 'A') && (*p <= 'F'))) - { - if (isdigit (*p)) - num = num * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') - num = num * 16 + *p - 'a' + 10; - else - num = num * 16 + *p - 'A' + 10; - ++p; - } - } - else - { - /* The number is specified in decimal. */ - while (isdigit (*p)) - { - num = num * 10 + *p - '0'; - ++p; - } - } + /* 64 bit conditions. */ + if (*args == 'A') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; - /* Store info in RESULT if requested by the caller. */ - if (result) - { - result->number_part = num; + 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) + { + 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 == 'a' || *name) + as_bad (_("Invalid Add Condition: %s"), name); + *s = c; + } + opcode |= cmpltr << 13; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); - if (IS_R_SELECT (p)) - { - result->l_r_select = 1; - ++p; - } - else if (IS_L_SELECT (p)) - { - result->l_r_select = 0; - ++p; - } - else - result->l_r_select = 0; - } - } - else if (*p == '%') - { - /* The number might be a predefined register. */ - num = 0; - 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. */ - if (c == 'r') - { - p++; - if (*p == 'e' && *(p + 1) == 't' - && (*(p + 2) == '0' || *(p + 2) == '1')) - { - p += 2; - num = *p - '0' + 28; - p++; - } - else if (*p == 'p') - { - num = 2; - p++; - } - else if (!isdigit (*p)) - { - if (print_errors) - as_bad (_("Undefined register: '%s'."), name); - num = -1; - } - else - { - do - num = num * 10 + *p++ - '0'; - while (isdigit (*p)); - } - } - else - { - /* Do a normal register search. */ - while (is_part_of_name (c)) - { - p = p + 1; - c = *p; - } - *p = 0; - status = reg_name_search (name); - if (status >= 0) - num = status; - else - { - if (print_errors) - as_bad (_("Undefined register: '%s'."), name); - num = -1; - } - *p = c; - } + /* Handle non-negated add and branch condition. */ + case 'd': + cmpltr = pa_parse_nonneg_add_cmpltr (&s); + if (cmpltr < 0) + { + as_bad (_("Invalid Add and Branch Condition")); + cmpltr = 0; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); - /* 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; - } - } - else - { - /* And finally, it could be a symbol in the absolute section which - is effectively a constant. */ - num = 0; - name = p; - c = *p; - while (is_part_of_name (c)) - { - p = p + 1; - c = *p; - } - *p = 0; - if ((sym = symbol_find (name)) != NULL) - { - if (S_GET_SEGMENT (sym) == &bfd_abs_section) - num = S_GET_VALUE (sym); - else - { - if (print_errors) - as_bad (_("Non-absolute symbol: '%s'."), name); - num = -1; - } - } - else - { - /* There is where we'd come for an undefined symbol - or for an empty string. For an empty string we - will return zero. That's a concession made for - compatability with the braindamaged HP assemblers. */ - if (*name == 0) - num = 0; - else - { - if (print_errors) - as_bad (_("Undefined absolute constant: '%s'."), name); - num = -1; - } - } - *p = c; + /* 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); - /* 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; - } - } + /* Handle a negated or non-negated add and branch + condition. */ + case '@': + save_s = s; + cmpltr = pa_parse_nonneg_add_cmpltr (&s); + if (cmpltr < 0) + { + s = save_s; + cmpltr = pa_parse_neg_add_cmpltr (&s); + if (cmpltr < 0) + { + as_bad (_("Invalid Compare/Subtract Condition")); + cmpltr = 0; + } + else + { + /* Negated condition requires an opcode change. */ + opcode |= 1 << 27; + } + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); - *s = p; - return num; -} + /* Handle branch on bit conditions. */ + case 'B': + case 'b': + cmpltr = 0; + if (*s == ',') + { + s++; -#define REG_NAME_CNT (sizeof(pre_defined_registers) / sizeof(struct pd_reg)) + if (*args == 'B') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; -/* Given NAME, find the register number associated with that name, return - the integer value associated with the given name or -1 on failure. */ + 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); -static int -reg_name_search (name) - char *name; -{ - int middle, low, high; - int cmp; + /* Handle a compare/subtract condition. */ + case 'S': + case 's': + cmpltr = 0; + flag = 0; + if (*s == ',') + { + s++; - low = 0; - high = REG_NAME_CNT - 1; + /* 64 bit conditions. */ + if (*args == 'S') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; - do - { - middle = (low + high) / 2; - cmp = strcasecmp (name, pre_defined_registers[middle].name); - if (cmp < 0) - high = middle - 1; - else if (cmp > 0) - low = middle + 1; - else - return pre_defined_registers[middle].value; - } - while (low <= high); + 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' || *name) + as_bad (_("Invalid Compare/Subtract Condition: %s"), + name); + *s = c; + } + opcode |= cmpltr << 13; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); - return -1; -} + /* 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); -/* Return nonzero if the given INSN and L/R information will require - a new PA-1.1 opcode. */ + /* 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; -static int -need_pa11_opcode (insn, result) - struct pa_it *insn; - struct pa_11_fp_reg_struct *result; -{ - if (result->l_r_select == 1 && !(insn->fpof1 == DBL && insn->fpof2 == DBL)) - { - /* If this instruction is specific to a particular architecture, - then set a new architecture. */ - if (bfd_get_mach (stdoutput) < pa11) - { - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, pa11)) - as_warn (_("could not update architecture and machine")); - } - return TRUE; - } - else - return FALSE; -} + 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; -/* Parse a condition for a fcmp instruction. Return the numerical - code associated with the condition. */ + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); -static int -pa_parse_fp_cmp_cond (s) - char **s; -{ - int cond, i; + /* Handle a logical instruction condition. */ + case 'L': + case 'l': + cmpltr = 0; + flag = 0; + if (*s == ',') + { + s++; - cond = 0; + /* 64 bit conditions. */ + if (*args == 'L') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; - for (i = 0; i < 32; i++) - { - if (strncasecmp (*s, fp_cond_map[i].string, - strlen (fp_cond_map[i].string)) == 0) - { - cond = fp_cond_map[i].cond; - *s += strlen (fp_cond_map[i].string); - /* If not a complete match, back up the input string and - report an error. */ - if (**s != ' ' && **s != '\t') - { - *s -= strlen (fp_cond_map[i].string); - break; - } - while (**s == ' ' || **s == '\t') - *s = *s + 1; - return cond; - } - } + name = s; + while (*s != ',' && *s != ' ' && *s != '\t') + s += 1; + c = *s; + *s = 0x00; - as_bad (_("Invalid FP Compare Condition: %s"), *s); + if (strcmp (name, "=") == 0) + cmpltr = 1; + else if (strcmp (name, "<") == 0) + cmpltr = 2; + else if (strcmp (name, "<=") == 0) + cmpltr = 3; + 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, "ev") == 0) + { + cmpltr = 7; + flag = 1; + } + /* ",*" is a valid condition. */ + else if (*args != 'L' || *name) + as_bad (_("Invalid Logical Instruction Condition.")); + *s = c; + } + opcode |= cmpltr << 13; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); - /* Advance over the bogus completer. */ - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; + /* Handle a shift/extract/deposit condition. */ + case 'X': + case 'x': + case 'y': + cmpltr = 0; + if (*s == ',') + { + save_s = s++; - return 0; -} + /* 64 bit conditions. */ + if (*args == 'X') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; -/* Parse a graphics test complete for ftest. */ + 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 (strcasecmp (name, "od") == 0) + cmpltr = 3; + else if (strcasecmp (name, "tr") == 0) + cmpltr = 4; + else if (strcmp (name, "<>") == 0) + cmpltr = 5; + else if (strcmp (name, ">=") == 0) + cmpltr = 6; + else if (strcasecmp (name, "ev") == 0) + cmpltr = 7; + /* Handle movb,n. Put things back the way they were. + This includes moving s back to where it started. */ + else if (strcasecmp (name, "n") == 0 && *args == 'y') + { + *s = c; + s = save_s; + continue; + } + /* ",*" is a valid condition. */ + else if (*args != 'X' || *name) + as_bad (_("Invalid Shift/Extract/Deposit Condition.")); + *s = c; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); -static int -pa_parse_ftest_gfx_completer (s) - char **s; -{ - int value; + /* Handle a unit instruction condition. */ + case 'U': + case 'u': + cmpltr = 0; + flag = 0; + if (*s == ',') + { + s++; - 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); - } + /* 64 bit conditions. */ + if (*args == 'U') + { + if (*s == '*') + s++; + else + break; + } + else if (*s == '*') + break; - return value; -} + if (strncasecmp (s, "sbz", 3) == 0) + { + cmpltr = 2; + s += 3; + } + else if (strncasecmp (s, "shz", 3) == 0) + { + cmpltr = 3; + s += 3; + } + else if (strncasecmp (s, "sdc", 3) == 0) + { + cmpltr = 4; + s += 3; + } + else if (strncasecmp (s, "sbc", 3) == 0) + { + cmpltr = 6; + s += 3; + } + else if (strncasecmp (s, "shc", 3) == 0) + { + cmpltr = 7; + s += 3; + } + else if (strncasecmp (s, "tr", 2) == 0) + { + cmpltr = 0; + flag = 1; + s += 2; + } + else if (strncasecmp (s, "nbz", 3) == 0) + { + cmpltr = 2; + flag = 1; + s += 3; + } + else if (strncasecmp (s, "nhz", 3) == 0) + { + cmpltr = 3; + flag = 1; + s += 3; + } + else if (strncasecmp (s, "ndc", 3) == 0) + { + cmpltr = 4; + flag = 1; + s += 3; + } + else if (strncasecmp (s, "nbc", 3) == 0) + { + cmpltr = 6; + flag = 1; + s += 3; + } + else if (strncasecmp (s, "nhc", 3) == 0) + { + cmpltr = 7; + 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' || (*s != ' ' && *s != '\t')) + as_bad (_("Invalid Unit Instruction Condition.")); + } + opcode |= cmpltr << 13; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 12); -/* Parse an FP operand format completer returning the completer - type. */ + default: + abort (); + } + break; + } -static fp_operand_format -pa_parse_fp_cnv_format (s) - char **s; -{ - int format; + /* Handle a nullification completer for branch instructions. */ + case 'n': + nullif = pa_parse_nullif (&s); + INSERT_FIELD_AND_CONTINUE (opcode, nullif, 1); - 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); - } - } + /* Handle a nullification completer for copr and spop insns. */ + case 'N': + nullif = pa_parse_nullif (&s); + INSERT_FIELD_AND_CONTINUE (opcode, nullif, 5); - return format; -} + /* 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; -/* Parse an FP operand format completer returning the completer - type. */ + /* 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; -static fp_operand_format -pa_parse_fp_format (s) - char **s; -{ - int format; + /* 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; - 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 - { - format = ILLEGAL_FMT; - as_bad (_("Invalid FP Operand Format: %3s"), *s); - } - } + /* Handle graphics test completers for ftest */ + case '=': + { + num = pa_parse_ftest_gfx_completer (&s); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + } - return format; -} + /* Handle a 11 bit immediate at 31. */ + case 'i': + 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, 1023, -1024, 0); + num = low_sign_unext (num, 11); + 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 11; + continue; + } -/* Convert from a selector string into a selector type. */ + /* 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) + { + int mb; -static int -pa_chk_field_selector (str) - char **str; -{ - int middle, low, high; - int cmp; - char name[4]; + /* 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); + if (mb != (num < 0)) + break; + CHECK_FIELD (num, 8191, -8192, 0); + num = low_sign_unext (num, 14); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + } + break; - /* Read past any whitespace. */ - /* FIXME: should we read past newlines and formfeeds??? */ - while (**str == ' ' || **str == '\t' || **str == '\n' || **str == '\f') - *str = *str + 1; + /* 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) + { + int mb; - if ((*str)[1] == '\'' || (*str)[1] == '%') - name[0] = tolower ((*str)[0]), - name[1] = 0; - else if ((*str)[2] == '\'' || (*str)[2] == '%') - name[0] = tolower ((*str)[0]), - name[1] = tolower ((*str)[1]), - 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[3] = 0; - else - return e_fsel; + mb = opcode & 1; + opcode -= mb; + num = evaluate_absolute (&the_insn); + 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); + } + break; - low = 0; - high = sizeof (selector_table) / sizeof (struct selector_entry) - 1; + /* 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; - do - { - middle = (low + high) / 2; - cmp = strcmp (name, selector_table[middle].prefix); - if (cmp < 0) - high = middle - 1; - else if (cmp > 0) - low = middle + 1; - else - { - *str += strlen (name) + 1; -#ifndef OBJ_SOM - if (selector_table[middle].field_selector == e_nsel) - return e_fsel; -#endif - return selector_table[middle].field_selector; - } - } - while (low <= high); + mb = opcode & 1; + opcode -= mb; + num = evaluate_absolute (&the_insn); + if (mb != (num < 0)) + break; + CHECK_FIELD (num, 32767, -32768, 0); + num = re_assemble_16 (num); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + } + break; - return e_fsel; -} + /* 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; -/* Mark (via expr_end) the end of an expression (I think). FIXME. */ + 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; -static int -get_expression (str) - char *str; -{ - char *save_in; - asection *seg; + /* Handle 14 bit immediate, shifted left three times. */ + case '#': + if (bfd_get_mach (stdoutput) != pa20) + break; + 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } + break; - save_in = input_line_pointer; - input_line_pointer = str; - seg = expression (&the_insn.exp); - if (!(seg == absolute_section - || seg == undefined_section - || SEG_NORMAL (seg))) - { - as_warn (_("Bad segment in expression.")); - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 1; - } - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 0; -} + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } -/* Mark (via expr_end) the end of an absolute expression. FIXME. */ -static int -pa_get_absolute_expression (insn, strp) - struct pa_it *insn; - char **strp; -{ - char *save_in; + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } - insn->field_selector = pa_chk_field_selector (strp); - save_in = input_line_pointer; - input_line_pointer = *strp; - expression (&insn->exp); - /* This is not perfect, but is a huge improvement over doing nothing. + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 21; + continue; + } - 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? + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } - 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 (insn->exp.X_op == O_modulus) - { - char *s, c; - int retval; + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } - input_line_pointer = *strp; - s = *strp; - while (*s != ',' && *s != ' ' && *s != '\t') - s++; + /* 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; +#ifdef OBJ_ELF + else if (is_tls_gdidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_GD21L; + else if (is_tls_ldidx (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDM21L; + else if (is_tls_dtpoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LDO21L; + else if (is_tls_ieoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_IE21L; + else if (is_tls_leoff (the_insn.exp)) + the_insn.reloc = R_PARISC_TLS_LE21L; +#endif + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } - c = *s; - *s = 0; + /* 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), + FAKE_LABEL_NAME)) + { + 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, 8191, -8192, 0); + opcode |= re_assemble_12 (num >> 2); + continue; + } + else + { + the_insn.reloc = R_HPPA_PCREL_CALL; + the_insn.format = 12; + the_insn.arg_reloc = last_call_desc.arg_reloc; + memset (&last_call_desc, 0, sizeof (struct call_desc)); + s = expr_end; + continue; + } - retval = pa_get_absolute_expression (insn, strp); + /* Handle a 17 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), + FAKE_LABEL_NAME)) + { + 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); + 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; + } - input_line_pointer = save_in; - *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).")); - expr_end = input_line_pointer; - input_line_pointer = save_in; - return 0; - } - expr_end = input_line_pointer; - input_line_pointer = save_in; - return evaluate_absolute (insn); -} + /* 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), + FAKE_LABEL_NAME)) + { + 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, 8388607, -8388608, 0); + opcode |= re_assemble_22 (num >> 2); + } + else + { + the_insn.reloc = R_HPPA_PCREL_CALL; + the_insn.format = 22; + the_insn.arg_reloc = last_call_desc.arg_reloc; + memset (&last_call_desc, 0, sizeof (struct call_desc)); + continue; + } -/* Evaluate an absolute expression EXP which may be modified by - the selector FIELD_SELECTOR. Return the value of the expression. */ -static int -evaluate_absolute (insn) - struct pa_it *insn; -{ - int value; - expressionS exp; - int field_selector = insn->field_selector; + /* Handle an absolute 17 bit branch target. */ + case 'z': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + the_insn.pcrel = 0; + if (!the_insn.exp.X_add_symbol + || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), + FAKE_LABEL_NAME)) + { + 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); + opcode |= re_assemble_17 (num >> 2); + continue; + } + else + { + the_insn.reloc = R_HPPA_ABS_CALL; + the_insn.format = 17; + the_insn.arg_reloc = last_call_desc.arg_reloc; + memset (&last_call_desc, 0, sizeof (struct call_desc)); + continue; + } - exp = insn->exp; - value = exp.X_add_number; + /* 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; - switch (field_selector) - { - /* No change. */ - case e_fsel: - break; + /* Handle '%sr0,%r31' implicit operand of be,l instruction. */ + case 'Y': + if (strncasecmp (s, "%sr0,%r31", 9) != 0) + break; + s += 9; + continue; - /* 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; + /* Handle immediate value of 0 for ordered load/store instructions. */ + case '@': + if (*s != '0') + break; + s++; + continue; - /* Sign extend from bit 21. */ - case e_rssel: - if (value & 0x00000400) - value |= 0xfffff800; - else - value &= 0x7ff; - break; + /* Handle a 2 bit shift count at 25. */ + 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, 3, 1, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 6); - /* Arithmetic shift right 11 bits. */ - case e_lsel: - value = (value & 0xfffff800) >> 11; - break; + /* Handle a 4 bit shift count at 25. */ + 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, 15, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 6); - /* Set bits 0-20 to zero. */ - case e_rsel: - value = value & 0x7ff; - break; + /* Handle a 5 bit shift count 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, 31 - num, 5); - /* Add 0x800 and arithmetic shift right 11 bits. */ - case e_ldsel: - value += 0x800; - value = (value & 0xfffff800) >> 11; - break; + /* 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); - /* Set bitgs 0-21 to one. */ - case e_rdsel: - value |= 0xfffff800; - break; + /* 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); -#define RSEL_ROUND(c) (((c) + 0x1000) & ~0x1fff) - case e_rrsel: - value = (RSEL_ROUND (value) & 0x7ff) + (value - RSEL_ROUND (value)); - break; + /* 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); - case e_lrsel: - value = (RSEL_ROUND (value) >> 11) & 0x1fffff; - break; -#undef RSEL_ROUND + /* 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); - default: - BAD_CASE (field_selector); - break; - } - return value; -} + /* 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); -/* Given an argument location specification return the associated - argument location number. */ + /* 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); -static unsigned int -pa_build_arg_reloc (type_name) - char *type_name; -{ + /* 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); - if (strncasecmp (type_name, "no", 2) == 0) - return 0; - if (strncasecmp (type_name, "gr", 2) == 0) - return 1; - else if (strncasecmp (type_name, "fr", 2) == 0) - return 2; - else if (strncasecmp (type_name, "fu", 2) == 0) - return 3; - else - as_bad (_("Invalid argument location: %s\n"), type_name); + /* 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); - return 0; -} + /* 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); -/* Encode and return an argument relocation specification for - the given register in the location specified by arg_reloc. */ + /* 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); -static unsigned int -pa_align_arg_reloc (reg, arg_reloc) - unsigned int reg; - unsigned int arg_reloc; -{ - unsigned int new_reloc; + /* Handle a 3 bit SFU identifier at 25. */ + case 'v': + 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; + CHECK_FIELD (num, 7, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 6); - new_reloc = arg_reloc; - switch (reg) - { - case 0: - new_reloc <<= 8; - break; - case 1: - new_reloc <<= 6; - break; - case 2: - new_reloc <<= 4; - break; - case 3: - new_reloc <<= 2; - break; - default: - as_bad (_("Invalid argument description: %d"), reg); - } + /* 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; + CHECK_FIELD (num, 1048575, 0, strict); + num = (num & 0x1f) | ((num & 0x000fffe0) << 6); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - return new_reloc; -} + /* 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; + CHECK_FIELD (num, 32767, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 11); -/* Parse a PA nullification completer (,n). Return nonzero if the - completer was found; return zero if no completer was found. */ + /* 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; + CHECK_FIELD (num, 1023, 0, strict); + num = (num & 0x1f) | ((num & 0x000003e0) << 6); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); -static int -pa_parse_nullif (s) - char **s; -{ - int nullif; + /* 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; + CHECK_FIELD (num, 32767, 0, strict); + num = (num & 0x1f) | ((num & 0x00007fe0) << 6); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); - nullif = 0; - if (**s == ',') - { - *s = *s + 1; - if (strncasecmp (*s, "n", 1) == 0) - nullif = 1; - else - { - as_bad (_("Invalid Nullification: (%c)"), **s); - nullif = 0; - } - *s = *s + 1; - } + /* Handle a 3-bit co-processor ID field. */ + case 'u': + 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; + CHECK_FIELD (num, 7, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 6); - return nullif; -} + /* 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; + CHECK_FIELD (num, 4194303, 0, strict); + num = (num & 0x1f) | ((num & 0x003fffe0) << 4); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); -/* Parse a non-negated compare/subtract completer returning the - number (for encoding in instrutions) of the given completer. + /* 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); - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ + /* Handle a source FP operand format completer. */ + case 'F': + flag = pa_parse_fp_format (&s); + the_insn.fpof1 = flag; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 11); -static int -pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) - char **s; - int isbranch; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; + /* Handle a destination FP operand format completer. */ + case 'G': + /* pa_parse_format needs the ',' prefix. */ + s--; + flag = pa_parse_fp_format (&s); + the_insn.fpof2 = flag; + INSERT_FIELD_AND_CONTINUE (opcode, flag, 13); - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; + /* 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); + /* 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; - 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 && isbranch) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } + case QUAD: + case ILLEGAL_FMT: + default: + as_bad (_("Invalid Floating Point Operand Format.")); + } + break; - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; + /* 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); + /* Float target register with L/R selection. */ + case 'T': + { + if (!pa_parse_number (&s, 1)) + break; + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + opcode |= num; - return cmpltr; -} + /* 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; -/* Parse a negated compare/subtract completer returning the - number (for encoding in instrutions) of the given completer. + opcode |= (pa_number & FP_REG_RSEL ? 1 << 6 : 0); + continue; + } - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ + /* Float operand 1. */ + case 'a': + { + 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; + } -static int -pa_parse_neg_cmpsub_cmpltr (s, isbranch) - char **s; - int isbranch; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - int nullify = 0; + /* Float operand 1 with L/R selection. */ + case 'X': + case 'A': + { + 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; + } - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; + /* Float operand 2. */ + 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; + if (need_pa11_opcode ()) + { + opcode |= (pa_number & FP_REG_RSEL ? 1 << 12 : 0); + opcode |= 1 << 27; + } + continue; + } + /* 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; + } - 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 && isbranch) - { - cmpltr = 0; - nullify = 1; - } - else - { - cmpltr = -1; - } - **s = c; - } + /* 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; + } - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (nullify) - *s = save_s; + /* Float mult operand 1 for fmpyadd, fmpysub */ + case 'i': + { + 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, 21); + } + /* Float mult operand 2 for fmpyadd, fmpysub */ + case 'j': + { + 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, 16); + } - return cmpltr; -} + /* 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); + } + + /* Float add operand 1 for fmpyadd, fmpysub */ + case 'l': + { + 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, 6); + } + /* 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); + } -/* Parse a non-negated addition completer returning the number - (for encoding in instrutions) of the given completer. + /* Handle L/R register halves like 'x'. */ + case 'E': + case 'e': + { + 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 ()) + { + opcode |= (pa_number & FP_REG_RSEL ? 1 << 1 : 0); + } + continue; + } - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ + /* 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); -static int -pa_parse_nonneg_add_cmpltr (s, isbranch) - char **s; - int isbranch; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; + default: + abort (); + } + break; - 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 (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; + default: + abort (); + } + break; } - /* If we have something like addb,n then there is no condition - completer. */ - else if (strcasecmp (name, "n") == 0 && isbranch) + + /* If this instruction is specific to a particular architecture, + then set a new architecture. This automatic promotion crud is + for compatibility with HP's old assemblers only. */ + if (match == TRUE + && bfd_get_mach (stdoutput) < insn->arch + && !bfd_set_arch_mach (stdoutput, bfd_arch_hppa, insn->arch)) { - cmpltr = 0; + as_warn (_("could not update architecture and machine")); + match = FALSE; } - else + + failed: + /* Check if the args matched. */ + if (!match) { - cmpltr = -1; + if (&insn[1] - pa_opcodes < (int) NUMOPCODES + && !strcmp (insn->name, insn[1].name)) + { + ++insn; + s = argstart; + continue; + } + else + { + as_bad (_("Invalid operands %s"), error_message); + return; + } } - **s = c; + break; } - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (cmpltr == 0 && *name == 'n' && isbranch) - *s = save_s; - - return cmpltr; + the_insn.opcode = opcode; } -/* 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). */ +/* Assemble a single instruction storing it into a frag. */ -static int -pa_parse_neg_add_cmpltr (s, isbranch) - char **s; - int isbranch; +void +md_assemble (char *str) { - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; + char *to; - cmpltr = 0; - if (**s == ',') + /* The had better be something to assemble. */ + assert (str); + + /* If we are within a procedure definition, make sure we've + defined a label for the procedure; handle case where the + label was defined after the .PROC directive. + + Note there's not need to diddle with the segment or fragment + for the label symbol in this case. We have already switched + into the new $CODE$ subspace at this point. */ + if (within_procedure && last_call_info->start_symbol == NULL) { - *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 (strcasecmp (name, "uv") == 0) - { - cmpltr = 4; - } - else if (strcasecmp (name, "vnz") == 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 && isbranch) + label_symbol_struct *label_symbol = pa_get_label (); + + if (label_symbol) { - cmpltr = 0; + if (label_symbol->lss_label) + { + last_call_info->start_symbol = label_symbol->lss_label; + symbol_get_bfdsym (label_symbol->lss_label)->flags + |= BSF_FUNCTION; +#ifdef OBJ_SOM + /* Also handle allocation of a fixup to hold the unwind + information when the label appears after the proc/procend. */ + if (within_entry_exit) + { + 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, + 0, R_HPPA_ENTRY, e_fsel, 0, 0, u); + } +#endif + } + else + as_bad (_("Missing function name for .PROC (corrupted label chain)")); } else - { - cmpltr = -1; - } - **s = c; + as_bad (_("Missing function name for .PROC")); } - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (cmpltr == 0 && *name == 'n' && isbranch) - *s = save_s; + /* Assemble the instruction. Results are saved into "the_insn". */ + pa_ip (str); - return cmpltr; + /* Get somewhere to put the assembled instruction. */ + to = frag_more (4); + + /* Output the opcode. */ + md_number_to_chars (to, the_insn.opcode, 4); + + /* If necessary output more stuff. */ + if (the_insn.reloc != R_HPPA_NONE) + 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, 0); + +#ifdef OBJ_ELF + dwarf2_emit_insn (4); +#endif } #ifdef OBJ_SOM /* Handle an alignment directive. Special so that we can update the alignment of the subspace if necessary. */ static void -pa_align (bytes) +pa_align (int bytes) { /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); @@ -5434,21 +5807,17 @@ pa_align (bytes) /* If bytes is a power of 2, then update the current subspace's alignment if necessary. */ - if (log2 (bytes) != -1) - record_alignment (current_subspace->ssd_seg, log2 (bytes)); + if (exact_log2 (bytes) != -1) + record_alignment (current_subspace->ssd_seg, exact_log2 (bytes)); } #endif /* Handle a .BLOCK type pseudo-op. */ static void -pa_block (z) - int z; +pa_block (int z ATTRIBUTE_UNUSED) { - char *p; - long int temp_fill; unsigned int temp_size; - unsigned int i; #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5457,20 +5826,16 @@ pa_block (z) temp_size = get_absolute_expression (); - /* Always fill with zeros, that's what the HP assembler does. */ - temp_fill = 0; - - p = frag_var (rs_fill, (int) temp_size, (int) temp_size, - (relax_substateT) 0, (symbolS *) 0, (offsetT) 1, NULL); - memset (p, 0, temp_size); - - /* Convert 2 bytes at a time. */ - - for (i = 0; i < temp_size; i += 2) + if (temp_size > 0x3FFFFFFF) { - md_number_to_chars (p + i, - (valueT) temp_fill, - (int) ((temp_size - i) > 2 ? 2 : (temp_size - i))); + as_bad (_("Argument to .BLOCK/.BLOCKZ must be between 0 and 0x3fffffff")); + temp_size = 0; + } + else + { + /* Always fill with zeros, that's what the HP assembler does. */ + char *p = frag_var (rs_fill, 1, 1, 0, NULL, temp_size, NULL); + *p = 0; } pa_undefine_label (); @@ -5480,19 +5845,18 @@ pa_block (z) /* Handle a .begin_brtab and .end_brtab pseudo-op. */ static void -pa_brtab (begin) - int begin; +pa_brtab (int begin ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM - /* The BRTAB relocations are only availble in SOM (to denote + /* The BRTAB relocations are only available in SOM (to denote the beginning and end of branch tables). */ char *where = frag_more (0); 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 (); @@ -5501,8 +5865,7 @@ pa_brtab (begin) /* Handle a .begin_try and .end_try pseudo-op. */ static void -pa_try (begin) - int begin; +pa_try (int begin ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM expressionS exp; @@ -5511,41 +5874,23 @@ pa_try (begin) if (! begin) expression (&exp); - /* The TRY relocations are only availble in SOM (to denote + /* The TRY relocations are only available in SOM (to denote the beginning and end of exception handling regions). */ 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 (); } -/* Handle a .CALL pseudo-op. This involves storing away information - about where arguments are to be found so the linker can detect - (and correct) argument location mismatches between caller and callee. */ - -static void -pa_call (unused) - int unused; -{ -#ifdef OBJ_SOM - /* We must have a valid space and subspace. */ - pa_check_current_space_and_subspace (); -#endif - - pa_call_args (&last_call_desc); - demand_empty_rest_of_line (); -} - /* Do the dirty work of building a call descriptor which describes where the caller placed arguments to a function call. */ static void -pa_call_args (call_desc) - struct call_desc *call_desc; +pa_call_args (struct call_desc *call_desc) { char *name, c, *p; unsigned int temp, arg_reloc; @@ -5588,24 +5933,38 @@ pa_call_args (call_desc) } } +/* Handle a .CALL pseudo-op. This involves storing away information + about where arguments are to be found so the linker can detect + (and correct) argument location mismatches between caller and callee. */ + +static void +pa_call (int unused ATTRIBUTE_UNUSED) +{ +#ifdef OBJ_SOM + /* We must have a valid space and subspace. */ + pa_check_current_space_and_subspace (); +#endif + + pa_call_args (&last_call_desc); + demand_empty_rest_of_line (); +} + /* Return TRUE if FRAG1 and FRAG2 are the same. */ -static int -is_same_frag (frag1, frag2) - fragS *frag1; - fragS *frag2; +static bfd_boolean +is_same_frag (fragS *frag1, fragS *frag2) { if (frag1 == NULL) - return (FALSE); + return FALSE; else if (frag2 == NULL) - return (FALSE); + return FALSE; else if (frag1 == frag2) - return (TRUE); + return TRUE; else if (frag2->fr_type == rs_fill && frag2->fr_fix == 0) return (is_same_frag (frag1, frag2->fr_next)); else - return (FALSE); + return FALSE; } #ifdef OBJ_ELF @@ -5615,55 +5974,47 @@ is_same_frag (frag1, frag2) of the unwind spaces. */ static void -pa_build_unwind_subspace (call_info) - struct call_info *call_info; +pa_build_unwind_subspace (struct call_info *call_info) { - char *unwind; 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 (now_seg != text_section) + if ((bfd_get_section_flags (stdoutput, now_seg) + & (SEC_ALLOC | SEC_LOAD | SEC_READONLY)) + != (SEC_ALLOC | SEC_LOAD | SEC_READONLY)) return; - if (bfd_get_arch_info (stdoutput)->bits_per_address == 32) - reloc = R_PARISC_DIR32; - else - reloc = R_PARISC_SEGREL32; - + 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) { - 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); } - save_seg = now_seg; - save_subseg = now_subseg; subseg_set (seg, 0); - /* 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. */ + 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, - 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. @@ -5672,21 +6023,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. */ - - 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, - e_fsel, 32, 0, NULL); + e_fsel, 32, 0, 0); + + /* Dump the descriptor. */ + unwind = UNWIND_LOW32 (&call_info->ci_unwind.descriptor); + md_number_to_chars (p + 8, unwind, 4); - /* 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); - } - } + 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); @@ -5698,8 +6046,7 @@ pa_build_unwind_subspace (call_info) .ENTER and .LEAVE. */ static void -pa_callinfo (unused) - int unused; +pa_callinfo (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; int temp; @@ -5838,21 +6185,37 @@ pa_callinfo (unused) demand_empty_rest_of_line (); } -/* Switch into the code subspace. */ +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) +/* Switch to the text space. Like s_text, but delete our + label when finished. */ static void -pa_code (unused) - int unused; +pa_text (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 + s_text (0); pa_undefine_label (); } +/* Switch to the data space. As usual delete our label. */ + +static void +pa_data (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: @@ -5874,8 +6237,7 @@ pa_code (unused) This also makes error detection all but impossible. */ static void -pa_comm (unused) - int unused; +pa_comm (int unused ATTRIBUTE_UNUSED) { unsigned int size; symbolS *symbol; @@ -5891,8 +6253,9 @@ pa_comm (unused) if (symbol) { + symbol_get_bfdsym (symbol)->flags |= BSF_OBJECT; S_SET_VALUE (symbol, size); - S_SET_SEGMENT (symbol, bfd_und_section_ptr); + S_SET_SEGMENT (symbol, bfd_com_section_ptr); S_SET_EXTERNAL (symbol); /* colon() has already set the frag to the current location in the @@ -5902,20 +6265,20 @@ pa_comm (unused) } demand_empty_rest_of_line (); } +#endif /* !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) */ /* Process a .END pseudo-op. */ static void -pa_end (unused) - int unused; +pa_end (int unused ATTRIBUTE_UNUSED) { demand_empty_rest_of_line (); } /* Process a .ENTER pseudo-op. This is not supported. */ + static void -pa_enter (unused) - int unused; +pa_enter (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5927,10 +6290,10 @@ pa_enter (unused) } /* Process a .ENTRY pseudo-op. .ENTRY marks the beginning of the - procesure. */ + procedure. */ + static void -pa_entry (unused) - int unused; +pa_entry (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5959,21 +6322,42 @@ pa_entry (unused) 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, - 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 } +/* 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 (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 -pa_equ (reg) - int reg; +pa_equ (int reg) { label_symbol_struct *label_symbol = pa_get_label (); symbolS *symbol; @@ -5982,10 +6366,32 @@ pa_equ (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 - 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 { @@ -5999,12 +6405,75 @@ pa_equ (reg) demand_empty_rest_of_line (); } +#ifdef OBJ_ELF +/* Mark the end of a function so that it's possible to compute + the size of the function in elf_hppa_final_processing. */ + +static void +hppa_elf_mark_end_of_function (void) +{ + /* ELF does not have EXIT relocations. All we do is create a + temporary symbol marking the end of the function. */ + 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 = xmalloc (strlen ("L$\001end_") + + strlen (S_GET_NAME (last_call_info->start_symbol)) + + 1); + if (name) + { + symbolS *symbolP; + + strcpy (name, "L$\001end_"); + strcat (name, S_GET_NAME (last_call_info->start_symbol)); + + /* If we have a .exit followed by a .procend, then the + symbol will have already been defined. */ + symbolP = symbol_find (name); + if (symbolP) + { + /* The symbol has already been defined! This can + happen if we have a .exit followed by a .procend. + + This is *not* an error. All we want to do is free + the memory we just allocated for the name and continue. */ + xfree (name); + } + else + { + /* symbol value should be the offset of the + last instruction of the function */ + symbolP = symbol_new (name, now_seg, (valueT) (frag_now_fix () - 4), + frag_now); + + assert (symbolP); + S_CLEAR_EXTERNAL (symbolP); + symbol_table_insert (symbolP); + } + + if (symbolP) + last_call_info->end_symbol = symbolP; + else + as_bad (_("Symbol '%s' could not be created."), name); + + } + else + as_bad (_("No memory for symbol name.")); +} +#endif + /* Helper function. Does processing for the end of a function. This usually involves creating some relocations or building special symbols to mark the end of the function. */ static void -process_exit () +process_exit (void) { char *where; @@ -6029,15 +6498,14 @@ 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, - (int *) &last_call_info->ci_unwind.descriptor + 1); + UNWIND_HIGH32 (&last_call_info->ci_unwind.descriptor)); #endif } /* Process a .EXIT pseudo-op. */ static void -pa_exit (unused) - int unused; +pa_exit (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6064,60 +6532,20 @@ pa_exit (unused) demand_empty_rest_of_line (); } -/* Process a .EXPORT directive. This makes functions external - and provides information such as argument relocation entries - to callers. */ - -static void -pa_export (unused) - int unused; -{ - char *name, c, *p; - symbolS *symbol; - - name = input_line_pointer; - c = get_symbol_end (); - /* Make sure the given symbol exists. */ - if ((symbol = symbol_find_or_make (name)) == NULL) - { - as_bad (_("Cannot define export symbol: %s\n"), name); - p = input_line_pointer; - *p = c; - input_line_pointer++; - } - else - { - /* OK. Set the external bits and process argument relocations. */ - S_SET_EXTERNAL (symbol); - p = input_line_pointer; - *p = c; - if (!is_end_of_statement ()) - { - input_line_pointer++; - pa_type_args (symbol, 1); - } - } - - demand_empty_rest_of_line (); -} - /* Helper function to process arguments to a .EXPORT pseudo-op. */ static void -pa_type_args (symbolP, is_export) - symbolS *symbolP; - int is_export; +pa_type_args (symbolS *symbolP, int is_export) { 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; - symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION; + bfdsym->flags &= ~BSF_FUNCTION; S_SET_SEGMENT (symbolP, bfd_abs_section_ptr); type = SYMBOL_TYPE_ABSOLUTE; } @@ -6136,50 +6564,58 @@ pa_type_args (symbolP, is_export) 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 { - 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; - symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION; - symbol_get_bfdsym (symbolP)->flags |= BSF_OBJECT; + 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; - 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; - 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; - 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; - 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; - symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION; + bfdsym->flags |= BSF_FUNCTION; type = SYMBOL_TYPE_SEC_PROG; } @@ -6187,7 +6623,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 - 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, @@ -6208,8 +6644,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)); -#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; } @@ -6222,12 +6658,12 @@ pa_type_args (symbolP, is_export) 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; } - /* Privelege level. */ + /* Privilege level. */ else if ((strncasecmp (name, "priv_lev", 8)) == 0) { p = input_line_pointer; @@ -6235,7 +6671,7 @@ pa_type_args (symbolP, is_export) 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; @@ -6251,13 +6687,53 @@ pa_type_args (symbolP, is_export) } } +/* Process a .EXPORT directive. This makes functions external + and provides information such as argument relocation entries + to callers. */ + +static void +pa_export (int unused ATTRIBUTE_UNUSED) +{ + char *name, c, *p; + symbolS *symbol; + + name = input_line_pointer; + c = get_symbol_end (); + /* Make sure the given symbol exists. */ + if ((symbol = symbol_find_or_make (name)) == NULL) + { + as_bad (_("Cannot define export symbol: %s\n"), name); + p = input_line_pointer; + *p = c; + input_line_pointer++; + } + else + { + /* 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); + symbol_get_bfdsym (symbol)->flags |= BSF_GLOBAL; + p = input_line_pointer; + *p = c; + if (!is_end_of_statement ()) + { + input_line_pointer++; + pa_type_args (symbol, 1); + } + } + + demand_empty_rest_of_line (); +} + /* Handle an .IMPORT pseudo-op. Any symbol referenced in a given assembly file must either be defined in the assembly file, or explicitly IMPORTED from another. */ static void -pa_import (unused) - int unused; +pa_import (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; symbolS *symbol; @@ -6282,9 +6758,9 @@ pa_import (unused) } else { - /* Sigh. To be compatable with the HP assembler and to help + /* Sigh. To be compatible with the HP assembler and to help poorly written assembly code, we assign a type based on - the the current segment. Note only BSF_FUNCTION really + the current segment. Note only BSF_FUNCTION really matters, we do not need to set the full SYMBOL_TYPE_* info. */ if (now_seg == text_section) symbol_get_bfdsym (symbol)->flags |= BSF_FUNCTION; @@ -6308,8 +6784,7 @@ pa_import (unused) /* Handle a .LABEL pseudo-op. */ static void -pa_label (unused) - int unused; +pa_label (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; @@ -6338,8 +6813,7 @@ pa_label (unused) /* Handle a .LEAVE pseudo-op. This is not supported yet. */ static void -pa_leave (unused) - int unused; +pa_leave (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6353,8 +6827,7 @@ pa_leave (unused) /* Handle a .LEVEL pseudo-op. */ static void -pa_level (unused) - int unused; +pa_level (int unused ATTRIBUTE_UNUSED) { char *level; @@ -6394,8 +6867,7 @@ pa_level (unused) /* Handle a .ORIGIN pseudo-op. */ static void -pa_origin (unused) - int unused; +pa_origin (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6410,8 +6882,7 @@ pa_origin (unused) is for static functions. FIXME. Should share more code with .EXPORT. */ static void -pa_param (unused) - int unused; +pa_param (int unused ATTRIBUTE_UNUSED) { char *name, c, *p; symbolS *symbol; @@ -6442,11 +6913,10 @@ pa_param (unused) } /* 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) - int unused; +pa_proc (int unused ATTRIBUTE_UNUSED) { struct call_info *call_info; @@ -6463,7 +6933,7 @@ pa_proc (unused) within_procedure = TRUE; /* Create another call_info structure. */ - call_info = (struct call_info *) xmalloc (sizeof (struct call_info)); + call_info = xmalloc (sizeof (struct call_info)); if (!call_info) as_fatal (_("Cannot allocate unwind descriptor\n")); @@ -6511,14 +6981,12 @@ pa_proc (unused) demand_empty_rest_of_line (); } -/* Process the syntatical end of a procedure. Make sure all the +/* Process the syntactical end of a procedure. Make sure all the appropriate pseudo-ops were found within the procedure. */ static void -pa_procend (unused) - int unused; +pa_procend (int unused ATTRIBUTE_UNUSED) { - #ifdef OBJ_SOM /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); @@ -6547,12 +7015,14 @@ pa_procend (unused) 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, - 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 } @@ -6583,12 +7053,12 @@ pa_procend (unused) 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. */ static int -log2 (value) - int value; +exact_log2 (int value) { int shift = 0; @@ -6601,12 +7071,10 @@ log2 (value) return shift; } - -#ifdef OBJ_SOM /* Check to make sure we have a valid space and subspace. */ static void -pa_check_current_space_and_subspace () +pa_check_current_space_and_subspace (void) { if (current_space == NULL) as_fatal (_("Not in a space.\n")); @@ -6620,17 +7088,15 @@ pa_check_current_space_and_subspace () by the parameters to the .SPACE directive. */ static sd_chain_struct * -pa_parse_space_stmt (space_name, create_flag) - char *space_name; - int create_flag; +pa_parse_space_stmt (char *space_name, int create_flag) { char *name, *ptemp, c; char loadable, defined, private, sort; - int spnum, temp; + int spnum; asection *seg = NULL; sd_chain_struct *space; - /* load default values */ + /* Load default values. */ spnum = 0; sort = 0; loadable = TRUE; @@ -6660,10 +7126,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. */ - 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 @@ -6718,7 +7185,7 @@ pa_parse_space_stmt (space_name, create_flag) /* If create_flag is nonzero, then create the new space with the attributes computed above. Else set the values in an already existing space -- this can only happen for - the first occurence of a built-in space. */ + the first occurrence of a built-in space. */ if (create_flag) space = create_new_space (space_name, spnum, loadable, defined, private, sort, seg, 1); @@ -6741,11 +7208,9 @@ pa_parse_space_stmt (space_name, create_flag) given space, creating the new space if necessary. */ static void -pa_space (unused) - int unused; +pa_space (int unused ATTRIBUTE_UNUSED) { char *name, c, *space_name, *save_s; - int temp; sd_chain_struct *sd_chain; if (within_procedure) @@ -6823,9 +7288,11 @@ pa_space (unused) /* 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; @@ -6860,8 +7327,7 @@ pa_space (unused) /* Switch to a new space. (I think). FIXME. */ static void -pa_spnum (unused) - int unused; +pa_spnum (int unused ATTRIBUTE_UNUSED) { char *name; char c; @@ -6890,11 +7356,10 @@ pa_spnum (unused) they're broken up into subroutines. */ static void -pa_subspace (create_new) - int create_new; +pa_subspace (int create_new) { char *name, *ss_name, c; - char loadable, code_only, common, dup_common, zero, sort; + char loadable, code_only, comdat, common, dup_common, zero, sort; int i, access, space_index, alignment, quadrant, applicable, flags; sd_chain_struct *space; ssd_chain_struct *ssd; @@ -6920,6 +7385,7 @@ pa_subspace (create_new) sort = 0; access = 0x7f; loadable = 1; + comdat = 0; common = 0; dup_common = 0; code_only = 0; @@ -6954,6 +7420,7 @@ pa_subspace (create_new) if (strcasecmp (pa_def_subspaces[i].name, ss_name) == 0) { loadable = pa_def_subspaces[i].loadable; + comdat = pa_def_subspaces[i].comdat; common = pa_def_subspaces[i].common; dup_common = pa_def_subspaces[i].dup_common; code_only = pa_def_subspaces[i].code_only; @@ -6989,7 +7456,7 @@ pa_subspace (create_new) *input_line_pointer = c; input_line_pointer++; alignment = get_absolute_expression (); - if (log2 (alignment) == -1) + if (exact_log2 (alignment) == -1) { as_bad (_("Alignment must be a power of 2")); alignment = 1; @@ -7017,6 +7484,11 @@ pa_subspace (create_new) *input_line_pointer = c; loadable = 0; } + else if ((strncasecmp (name, "comdat", 6) == 0)) + { + *input_line_pointer = c; + comdat = 1; + } else if ((strncasecmp (name, "common", 6) == 0)) { *input_line_pointer = c; @@ -7049,8 +7521,17 @@ pa_subspace (create_new) flags |= (SEC_ALLOC | SEC_LOAD); if (code_only) flags |= SEC_CODE; - if (common || dup_common) - flags |= SEC_IS_COMMON; + + /* These flags are used to implement various flavors of initialized + common. The SOM linker discards duplicate subspaces when they + have the same "key" symbol name. This support is more like + GNU linkonce than BFD common. Further, pc-relative relocations + are converted to section relative relocations in BFD common + sections. This complicates the handling of relocations in + common sections containing text and isn't currently supported + correctly in the SOM BFD backend. */ + if (comdat || common || dup_common) + flags |= SEC_LINK_ONCE; flags |= SEC_RELOC | SEC_HAS_CONTENTS; @@ -7081,7 +7562,7 @@ pa_subspace (create_new) bfd_set_section_flags (stdoutput, section, applicable); /* Record any alignment request for this section. */ - record_alignment (section, log2 (alignment)); + record_alignment (section, exact_log2 (alignment)); /* Set the starting offset for this section. */ bfd_set_section_vma (stdoutput, section, @@ -7092,16 +7573,16 @@ pa_subspace (create_new) if (ssd) current_subspace = update_subspace (space, ss_name, loadable, - code_only, common, dup_common, - sort, zero, access, space_index, - alignment, quadrant, + code_only, comdat, common, + dup_common, sort, zero, access, + space_index, alignment, quadrant, section); else current_subspace = create_new_subspace (space, ss_name, loadable, - code_only, common, + code_only, comdat, common, dup_common, zero, sort, access, space_index, - alignment, quadrant, section); + alignment, quadrant, section); demand_empty_rest_of_line (); current_subspace->ssd_seg = section; @@ -7110,11 +7591,10 @@ pa_subspace (create_new) SUBSPACE_DEFINED (current_subspace) = 1; } - /* Create default space and subspace dictionaries. */ static void -pa_spaces_begin () +pa_spaces_begin (void) { int i; @@ -7153,7 +7633,6 @@ pa_spaces_begin () /* 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. */ @@ -7176,7 +7655,6 @@ pa_spaces_begin () | SEC_RELOC | SEC_HAS_CONTENTS)); - } else if (!strcmp (pa_def_subspaces[i].name, "$BSS$")) { @@ -7225,6 +7703,7 @@ pa_spaces_begin () create_new_subspace (space, name, pa_def_subspaces[i].loadable, pa_def_subspaces[i].code_only, + pa_def_subspaces[i].comdat, pa_def_subspaces[i].common, pa_def_subspaces[i].dup_common, pa_def_subspaces[i].zero, @@ -7238,31 +7717,27 @@ pa_spaces_begin () } } - - /* Create a new space NAME, with the appropriate flags as defined by the given parameters. */ static sd_chain_struct * -create_new_space (name, spnum, loadable, defined, private, - sort, seg, user_defined) - char *name; - int spnum; - int loadable; - int defined; - int private; - int sort; - asection *seg; - int user_defined; +create_new_space (char *name, + int spnum, + int loadable ATTRIBUTE_UNUSED, + int defined, + int private, + int sort, + asection *seg, + int user_defined) { sd_chain_struct *chain_entry; - chain_entry = (sd_chain_struct *) xmalloc (sizeof (sd_chain_struct)); + chain_entry = xmalloc (sizeof (sd_chain_struct)); if (!chain_entry) as_fatal (_("Out of memory: could not allocate new space chain entry: %s\n"), name); - SPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1); + SPACE_NAME (chain_entry) = xmalloc (strlen (name) + 1); strcpy (SPACE_NAME (chain_entry), name); SPACE_DEFINED (chain_entry) = defined; SPACE_USER_DEFINED (chain_entry) = user_defined; @@ -7328,26 +7803,28 @@ create_new_space (name, spnum, loadable, defined, private, order as defined by the SORT entries. */ static ssd_chain_struct * -create_new_subspace (space, name, loadable, code_only, common, - dup_common, is_zero, sort, access, space_index, - alignment, quadrant, seg) - sd_chain_struct *space; - char *name; - int loadable, code_only, common, dup_common, is_zero; - int sort; - int access; - int space_index; - int alignment; - int quadrant; - asection *seg; +create_new_subspace (sd_chain_struct *space, + char *name, + int loadable ATTRIBUTE_UNUSED, + int code_only ATTRIBUTE_UNUSED, + int comdat, + int common, + int dup_common, + int is_zero ATTRIBUTE_UNUSED, + int sort, + int access, + int space_index ATTRIBUTE_UNUSED, + int alignment ATTRIBUTE_UNUSED, + int quadrant, + asection *seg) { ssd_chain_struct *chain_entry; - chain_entry = (ssd_chain_struct *) xmalloc (sizeof (ssd_chain_struct)); + chain_entry = xmalloc (sizeof (ssd_chain_struct)); if (!chain_entry) as_fatal (_("Out of memory: could not allocate new subspace chain entry: %s\n"), name); - SUBSPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1); + SUBSPACE_NAME (chain_entry) = xmalloc (strlen (name) + 1); strcpy (SUBSPACE_NAME (chain_entry), name); /* Initialize subspace_defined. When we hit a .subspace directive @@ -7390,8 +7867,8 @@ create_new_subspace (space, name, loadable, code_only, common, } #ifdef obj_set_subsection_attributes - obj_set_subsection_attributes (seg, space->sd_seg, access, - sort, quadrant); + obj_set_subsection_attributes (seg, space->sd_seg, access, sort, + quadrant, comdat, common, dup_common); #endif return chain_entry; @@ -7401,29 +7878,28 @@ create_new_subspace (space, name, loadable, code_only, common, various arguments. Return the modified subspace chain entry. */ static ssd_chain_struct * -update_subspace (space, name, loadable, code_only, common, dup_common, sort, - zero, access, space_index, alignment, quadrant, section) - sd_chain_struct *space; - char *name; - int loadable; - int code_only; - int common; - int dup_common; - int zero; - int sort; - int access; - int space_index; - int alignment; - int quadrant; - asection *section; +update_subspace (sd_chain_struct *space, + char *name, + int loadable ATTRIBUTE_UNUSED, + int code_only ATTRIBUTE_UNUSED, + int comdat, + int common, + int dup_common, + int sort, + int zero ATTRIBUTE_UNUSED, + int access, + int space_index ATTRIBUTE_UNUSED, + int alignment ATTRIBUTE_UNUSED, + int quadrant, + asection *section) { ssd_chain_struct *chain_entry; chain_entry = is_defined_subspace (name); #ifdef obj_set_subsection_attributes - obj_set_subsection_attributes (section, space->sd_seg, access, - sort, quadrant); + obj_set_subsection_attributes (section, space->sd_seg, access, sort, + quadrant, comdat, common, dup_common); #endif return chain_entry; @@ -7433,18 +7909,15 @@ update_subspace (space, name, loadable, code_only, common, dup_common, sort, NULL if no such space exists. */ static sd_chain_struct * -is_defined_space (name) - char *name; +is_defined_space (char *name) { sd_chain_struct *chain_pointer; for (chain_pointer = space_dict_root; chain_pointer; chain_pointer = chain_pointer->sd_next) - { - if (strcmp (SPACE_NAME (chain_pointer), name) == 0) - return chain_pointer; - } + if (strcmp (SPACE_NAME (chain_pointer), name) == 0) + return chain_pointer; /* No mapping from segment to space was found. Return NULL. */ return NULL; @@ -7457,8 +7930,7 @@ is_defined_space (name) so a linear exhaustive search is OK here. */ static sd_chain_struct * -pa_segment_to_space (seg) - asection *seg; +pa_segment_to_space (asection *seg) { sd_chain_struct *space_chain; @@ -7466,25 +7938,27 @@ pa_segment_to_space (seg) for (space_chain = space_dict_root; space_chain; space_chain = space_chain->sd_next) - { - if (space_chain->sd_seg == seg) - return space_chain; - } + if (space_chain->sd_seg == seg) + return space_chain; /* Mapping was not found. Return NULL. */ return NULL; } -/* Return the space chain entry for the subspace with the name NAME or - NULL if no such subspace exists. +/* Return the first space chain entry for the subspace with the name + NAME or NULL if no such subspace exists. + + When there are multiple subspaces with the same name, switching to + the first (i.e., default) subspace is preferable in most situations. + For example, it wouldn't be desirable to merge COMDAT data with non + COMDAT data. Uses a linear search through all the spaces and subspaces, this may not be appropriate if we ever being placing each function in its own subspace. */ static ssd_chain_struct * -is_defined_subspace (name) - char *name; +is_defined_subspace (char *name) { sd_chain_struct *space_chain; ssd_chain_struct *subspace_chain; @@ -7514,9 +7988,7 @@ is_defined_subspace (name) to become more efficient. */ static ssd_chain_struct * -pa_subsegment_to_subspace (seg, subseg) - asection *seg; - subsegT subseg; +pa_subsegment_to_subspace (asection *seg, subsegT subseg) { sd_chain_struct *space_chain; ssd_chain_struct *subspace_chain; @@ -7548,8 +8020,7 @@ pa_subsegment_to_subspace (seg, subseg) that was found or NULL on failure. */ static sd_chain_struct * -pa_find_space_by_number (number) - int number; +pa_find_space_by_number (int number) { sd_chain_struct *space_chain; @@ -7569,9 +8040,7 @@ pa_find_space_by_number (number) address is unknown then return zero. */ static unsigned int -pa_subspace_start (space, quadrant) - sd_chain_struct *space; - int quadrant; +pa_subspace_start (sd_chain_struct *space, int quadrant) { /* FIXME. Assumes everyone puts read/write data at 0x4000000, this is not correct for the PA OSF1 port. */ @@ -7583,32 +8052,16 @@ pa_subspace_start (space, quadrant) return 0; return 0; } - -/* FIXME. Needs documentation. */ -static int -pa_next_subseg (space) - sd_chain_struct *space; -{ - - space->sd_last_subseg++; - return space->sd_last_subseg; -} #endif /* Helper function for pa_stringer. Used to find the end of a string. */ static unsigned int -pa_stringer_aux (s) - char *s; +pa_stringer_aux (char *s) { 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 '\"': @@ -7623,17 +8076,21 @@ pa_stringer_aux (s) /* Handle a .STRING type pseudo-op. */ static void -pa_stringer (append_zero) - int append_zero; +pa_stringer (int append_zero) { char *s, num_buf[4]; unsigned int c; 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. */ +#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; @@ -7652,15 +8109,15 @@ pa_stringer (append_zero) 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 - && (isdigit (dg) || (dg >= 'a' && dg <= 'f') + && (ISDIGIT (dg) || (dg >= 'a' && dg <= 'f') || (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; @@ -7700,8 +8157,7 @@ pa_stringer (append_zero) /* Handle a .VERSION pseudo-op. */ static void -pa_version (unused) - int unused; +pa_version (int unused ATTRIBUTE_UNUSED) { obj_version (0); pa_undefine_label (); @@ -7712,8 +8168,7 @@ pa_version (unused) /* Handle a .COMPILER pseudo-op. */ static void -pa_compiler (unused) - int unused; +pa_compiler (int unused ATTRIBUTE_UNUSED) { obj_som_compiler (0); pa_undefine_label (); @@ -7724,8 +8179,7 @@ pa_compiler (unused) /* Handle a .COPYRIGHT pseudo-op. */ static void -pa_copyright (unused) - int unused; +pa_copyright (int unused ATTRIBUTE_UNUSED) { obj_copyright (0); pa_undefine_label (); @@ -7735,97 +8189,134 @@ pa_copyright (unused) the latest space label. */ static void -pa_cons (nbytes) - int nbytes; +pa_cons (int nbytes) { cons (nbytes); pa_undefine_label (); } -/* Switch to the data space. As usual delete our label. */ +/* Like float_cons, but we need to undefine our label. */ static void -pa_data (unused) - int unused; +pa_float_cons (int float_type) { -#ifdef OBJ_SOM - current_space = is_defined_space ("$PRIVATE$"); - current_subspace - = pa_subsegment_to_subspace (current_space->sd_seg, 0); -#endif - s_data (0); + float_cons (float_type); pa_undefine_label (); } -/* Like float_cons, but we need to undefine our label. */ +/* Like s_fill, but delete our label when finished. */ static void -pa_float_cons (float_type) - int float_type; +pa_fill (int unused ATTRIBUTE_UNUSED) { - float_cons (float_type); +#ifdef OBJ_SOM + /* We must have a valid space and subspace. */ + pa_check_current_space_and_subspace (); +#endif + + s_fill (0); pa_undefine_label (); } -/* Like s_fill, but delete our label when finished. */ +/* Like lcomm, but delete our label when finished. */ static void -pa_fill (unused) - int unused; +pa_lcomm (int needs_align) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); #endif - s_fill (0); + s_lcomm (needs_align); pa_undefine_label (); } -/* Like lcomm, but delete our label when finished. */ +/* Like lsym, but delete our label when finished. */ static void -pa_lcomm (needs_align) - int needs_align; +pa_lsym (int unused ATTRIBUTE_UNUSED) { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); #endif - s_lcomm (needs_align); - pa_undefine_label (); -} + s_lsym (0); + pa_undefine_label (); +} + +/* This function is called once, at assembler startup time. It should + set up all the tables, etc. that the MD part of the assembler will need. */ + +void +md_begin (void) +{ + const char *retval = NULL; + int lose = 0; + unsigned int i = 0; + + last_call_info = NULL; + call_info_root = NULL; + + /* Set the default machine type. */ + 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. + Warn user and disable "-R" option. */ + if (flag_readonly_data_in_text) + { + as_warn (_("-R option not supported on this target.")); + flag_readonly_data_in_text = 0; + } + +#ifdef OBJ_SOM + pa_spaces_begin (); +#endif + + op_hash = hash_new (); -/* Like lsym, but delete our label when finished. */ + while (i < NUMOPCODES) + { + const char *name = pa_opcodes[i].name; -static void -pa_lsym (unused) - int unused; -{ -#ifdef OBJ_SOM - /* We must have a valid space and subspace. */ - pa_check_current_space_and_subspace (); -#endif + retval = hash_insert (op_hash, name, (struct pa_opcode *) &pa_opcodes[i]); + if (retval != NULL && *retval != '\0') + { + as_fatal (_("Internal error: can't hash `%s': %s\n"), name, retval); + lose = 1; + } - s_lsym (0); - pa_undefine_label (); -} + do + { + if ((pa_opcodes[i].match & pa_opcodes[i].mask) + != pa_opcodes[i].match) + { + fprintf (stderr, _("internal error: losing opcode: `%s' \"%s\"\n"), + pa_opcodes[i].name, pa_opcodes[i].args); + lose = 1; + } + ++i; + } + while (i < NUMOPCODES && !strcmp (pa_opcodes[i].name, name)); + } + + if (lose) + as_fatal (_("Broken assembler. No assembly attempted.")); -/* 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); + /* SOM will change text_section. To make sure we never put + anything into the old one switch to the new one now. */ + subseg_set (text_section, 0); #endif - s_text (0); - pa_undefine_label (); +#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); +#endif } /* On the PA relocations which involve function symbols must not be @@ -7846,28 +8337,61 @@ pa_text (unused) any fixup which creates entries in the DLT (eg they use "T" field selectors). - Reject reductions involving symbols with external scope; such - 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 - right bits out of an instruction. */ + ??? Reject reductions involving symbols with external scope; such + reductions make life a living hell for object file editors. */ int -hppa_fix_adjustable (fixp) - fixS *fixp; +hppa_fix_adjustable (fixS *fixp) { +#ifdef OBJ_ELF + reloc_type code; +#endif struct hppa_fix_struct *hppa_fix; hppa_fix = (struct hppa_fix_struct *) fixp->tc_fix_data; -#ifdef OBJ_SOM - /* Reject reductions of symbols in 32bit relocs. */ - if (fixp->fx_r_type == R_HPPA && hppa_fix->fx_r_format == 32) - return 0; +#ifdef OBJ_ELF + /* LR/RR selectors are implicitly used for a number of different relocation + types. We must ensure that none of these types are adjusted (see below) + even if they occur with a different selector. */ + code = elf_hppa_reloc_final_type (stdoutput, fixp->fx_r_type, + hppa_fix->fx_r_format, + hppa_fix->fx_r_field); + + switch (code) + { + /* Relocation types which use e_lrsel. */ + case R_PARISC_DIR21L: + case R_PARISC_DLTREL21L: + case R_PARISC_DPREL21L: + case R_PARISC_PLTOFF21L: + + /* Relocation types which use e_rrsel. */ + case R_PARISC_DIR14R: + case R_PARISC_DIR14DR: + case R_PARISC_DIR14WR: + case R_PARISC_DIR17R: + case R_PARISC_DLTREL14R: + case R_PARISC_DLTREL14DR: + case R_PARISC_DLTREL14WR: + case R_PARISC_DPREL14R: + case R_PARISC_DPREL14DR: + case R_PARISC_DPREL14WR: + case R_PARISC_PLTOFF14R: + case R_PARISC_PLTOFF14DR: + case R_PARISC_PLTOFF14WR: + + /* Other types that we reject for reduction. */ + case R_PARISC_GNU_VTENTRY: + case R_PARISC_GNU_VTINHERIT: + return 0; + default: + break; + } +#endif /* 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 @@ -7875,19 +8399,42 @@ hppa_fix_adjustable (fixp) if (fixp->fx_addsy && fixp->fx_subsy && (hppa_fix->segment->flags & SEC_CODE)) - { - /* Apparently sy_used_in_reloc never gets set for sub symbols. */ - symbol_mark_used_in_reloc (fixp->fx_subsy); - return 0; - } + return 0; /* 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 + multiples 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; -#endif /* Reject reductions of symbols in DLT relative relocs, relocations with plabels. */ @@ -7899,18 +8446,15 @@ hppa_fix_adjustable (fixp) || 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. */ - 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, @@ -7918,115 +8462,87 @@ hppa_fix_adjustable (fixp) within GAS. */ int -hppa_force_relocation (fixp) - fixS *fixp; +hppa_force_relocation (struct fix *fixp) { struct hppa_fix_struct *hppa_fixp; - int distance; 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 - -#define arg_reloc_stub_needed(CALLER, CALLEE) \ - ((CALLEE) && (CALLER) && ((CALLEE) != (CALLER))) - -#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 - 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))) +#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 - 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; - - if (fixp->fx_r_type == R_HPPA_ABS_CALL) - return 1; -#undef arg_reloc_stub_needed - /* No need (yet) to force another relocations to be emitted. */ - return 0; -} + assert (fixp->fx_addsy != NULL); -/* Now for some ELF specific code. FIXME. */ -#ifdef OBJ_ELF -/* Mark the end of a function so that it's possible to compute - the size of the function in hppa_elf_final_processing. */ + /* Ensure we emit a relocation for global symbols so that dynamic + linking works. */ + if (S_FORCE_RELOC (fixp->fx_addsy, 1)) + return 1; -static void -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. */ - char *name = (char *) - xmalloc (strlen ("L$\001end_") + - strlen (S_GET_NAME (last_call_info->start_symbol)) + 1); + /* It is necessary to force PC-relative calls/jumps to have a relocation + entry if they're going to need either an argument relocation or long + call stub. */ + if (fixp->fx_pcrel + && arg_reloc_stub_needed (symbol_arg_reloc_info (fixp->fx_addsy), + hppa_fixp->fx_arg_reloc)) + return 1; - if (name) + /* Now check to see if we're going to need a long-branch stub. */ + if (fixp->fx_r_type == (int) R_HPPA_PCREL_CALL) { - symbolS *symbolP; - - strcpy (name, "L$\001end_"); - strcat (name, S_GET_NAME (last_call_info->start_symbol)); - - /* If we have a .exit followed by a .procend, then the - symbol will have already been defined. */ - symbolP = symbol_find (name); - if (symbolP) - { - /* The symbol has already been defined! This can - happen if we have a .exit followed by a .procend. - - This is *not* an error. All we want to do is free - the memory we just allocated for the name and continue. */ - xfree (name); - } - else - { - /* symbol value should be the offset of the - last instruction of the function */ - symbolP = symbol_new (name, now_seg, (valueT) (frag_now_fix () - 4), - frag_now); + long pc = md_pcrel_from (fixp); + valueT distance, min_stub_distance; - assert (symbolP); - S_CLEAR_EXTERNAL (symbolP); - symbol_table_insert (symbolP); - } + distance = fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy) - pc - 8; - if (symbolP) - last_call_info->end_symbol = symbolP; - else - as_bad (_("Symbol '%s' could not be created."), name); + /* Distance to the closest possible stub. This will detect most + but not all circumstances where a stub will not work. */ + min_stub_distance = pc + 16; +#ifdef OBJ_SOM + if (last_call_info != NULL) + min_stub_distance -= S_GET_VALUE (last_call_info->start_symbol); +#endif + if ((distance + 8388608 >= 16777216 + && min_stub_distance <= 8388608) + || (hppa_fixp->fx_r_format == 17 + && distance + 262144 >= 524288 + && min_stub_distance <= 262144) + || (hppa_fixp->fx_r_format == 12 + && distance + 8192 >= 16384 + && min_stub_distance <= 8192) + ) + return 1; } - else - as_bad (_("No memory for symbol name.")); + if (fixp->fx_r_type == (int) R_HPPA_ABS_CALL) + return 1; + + /* No need (yet) to force another relocations to be emitted. */ + return 0; } +/* Now for some ELF specific code. FIXME. */ +#ifdef OBJ_ELF /* For ELF, this function serves one purpose: to setup the st_size field of STT_FUNC symbols. To do this, we need to scan the call_info structure list, determining st_size in by taking the difference in the address of the beginning/end marker symbols. */ void -elf_hppa_final_processing () +elf_hppa_final_processing (void) { struct call_info *call_info_pointer; @@ -8042,12 +8558,178 @@ elf_hppa_final_processing () - S_GET_VALUE (call_info_pointer->start_symbol) + 4; } } + +static void +pa_vtable_entry (int ignore ATTRIBUTE_UNUSED) +{ + struct fix *new_fix; + + new_fix = obj_elf_vtable_entry (0); + + if (new_fix) + { + struct hppa_fix_struct * hppa_fix = obstack_alloc (¬es, 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 (int ignore ATTRIBUTE_UNUSED) +{ + struct fix *new_fix; + + new_fix = obj_elf_vtable_inherit (0); + + if (new_fix) + { + struct hppa_fix_struct * hppa_fix = obstack_alloc (¬es, 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 + +/* 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? */ +const pseudo_typeS md_pseudo_table[] = +{ + /* align pseudo-ops on the PA specify the actual alignment requested, + not the log2 of the requested alignment. */ +#ifdef OBJ_SOM + {"align", pa_align, 8}, +#endif +#ifdef OBJ_ELF + {"align", s_align_bytes, 8}, +#endif + {"begin_brtab", pa_brtab, 1}, + {"begin_try", pa_try, 1}, + {"block", pa_block, 1}, + {"blockz", pa_block, 0}, + {"byte", pa_cons, 1}, + {"call", pa_call, 0}, + {"callinfo", pa_callinfo, 0}, +#if defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD)) + {"code", obj_elf_text, 0}, +#else + {"code", pa_text, 0}, + {"comm", pa_comm, 0}, +#endif +#ifdef OBJ_SOM + {"compiler", pa_compiler, 0}, +#endif + {"copyright", pa_copyright, 0}, +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) + {"data", pa_data, 0}, +#endif + {"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) || defined (TE_NetBSD))) + {"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}, + {"fill", pa_fill, 0}, + {"float", pa_float_cons, 'f'}, + {"half", pa_cons, 2}, + {"import", pa_import, 0}, + {"int", pa_cons, 4}, + {"label", pa_label, 0}, + {"lcomm", pa_lcomm, 0}, + {"leave", pa_leave, 0}, + {"level", pa_level, 0}, + {"long", pa_cons, 4}, + {"lsym", pa_lsym, 0}, +#ifdef OBJ_SOM + {"nsubspa", pa_subspace, 1}, +#endif + {"octa", pa_cons, 16}, + {"org", pa_origin, 0}, + {"origin", pa_origin, 0}, + {"param", pa_param, 0}, + {"proc", pa_proc, 0}, + {"procend", pa_procend, 0}, + {"quad", pa_cons, 8}, + {"reg", pa_equ, 1}, + {"short", pa_cons, 2}, + {"single", pa_float_cons, 'f'}, +#ifdef OBJ_SOM + {"space", pa_space, 0}, + {"spnum", pa_spnum, 0}, +#endif + {"string", pa_stringer, 0}, + {"stringz", pa_stringer, 1}, +#ifdef OBJ_SOM + {"subspa", pa_subspace, 0}, +#endif +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) + {"text", pa_text, 0}, +#endif + {"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} +}; #ifdef OBJ_ELF -pa_end_of_source () +void +hppa_cfi_frame_initial_instructions (void) +{ + cfi_add_CFA_def_cfa (30, 0); +} + +int +hppa_regname_to_dw2regnum (char *regname) { - if (debug_type == DEBUG_DWARF2) - dwarf2_finish (); + unsigned int regnum = -1; + unsigned int i; + const char *p; + char *q; + static struct { char *name; int dw2regnum; } regnames[] = + { + { "sp", 30 }, { "rp", 2 }, + }; + + for (i = 0; i < ARRAY_SIZE (regnames); ++i) + if (strcmp (regnames[i].name, regname) == 0) + return regnames[i].dw2regnum; + + if (regname[0] == 'r') + { + p = regname + 1; + regnum = strtoul (p, &q, 10); + if (p == q || *q || regnum >= 32) + return -1; + } + else if (regname[0] == 'f' && regname[1] == 'r') + { + p = regname + 2; + regnum = strtoul (p, &q, 10); + if (p == q || *q || regnum <= 4 || regnum >= 32) + return -1; + regnum += 32 - 4; + } + return regnum; } #endif