X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-hppa.c;h=72abe1dedb54a4571e56cc26bbab72d17c1d3452;hb=351e2b5aa7a71258e6b682ac1a3228964de8d22c;hp=6846802a34a9f9e30e3f5dfab24fa39b9cc3869c;hpb=d3426803c579b3e53b702d95b11eff681d653209;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 6846802a34..72abe1dedb 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 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -19,18 +19,16 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - /* 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 "bfd/libhppa.h" -#include "bfd/libbfd.h" /* Be careful, this file includes data *declarations*. */ #include "opcode/hppa.h" @@ -44,23 +42,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 +69,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 +90,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 +105,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 +141,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 +252,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 +263,6 @@ struct pa_it /* PA-89 floating point registers are arranged like this: - +--------------+--------------+ | 0 or 16L | 16 or 16R | +--------------+--------------+ @@ -247,23 +279,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 +363,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 +457,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; @@ -474,15 +493,18 @@ struct selector_entry static void pa_check_current_space_and_subspace PARAMS ((void)); #endif +#if !(defined (OBJ_ELF) && (defined (TE_LINUX) || defined (TE_NetBSD))) +static void pa_text PARAMS ((int)); +static void pa_data PARAMS ((int)); +static void pa_comm PARAMS ((int)); +#endif static fp_operand_format pa_parse_fp_format PARAMS ((char **s)); static void pa_cons PARAMS ((int)); -static 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 *)); @@ -491,18 +513,19 @@ static int evaluate_absolute PARAMS ((struct pa_it *)); static unsigned int pa_build_arg_reloc PARAMS ((char *)); static unsigned int pa_align_arg_reloc PARAMS ((unsigned int, unsigned int)); static int pa_parse_nullif PARAMS ((char **)); -static int pa_parse_nonneg_cmpsub_cmpltr PARAMS ((char **, int)); -static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **, int)); -static int pa_parse_neg_add_cmpltr PARAMS ((char **, int)); -static int pa_parse_nonneg_add_cmpltr PARAMS ((char **, int)); +static int pa_parse_nonneg_cmpsub_cmpltr PARAMS ((char **)); +static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **)); +static int pa_parse_neg_add_cmpltr PARAMS ((char **)); +static int pa_parse_nonneg_add_cmpltr PARAMS ((char **)); +static int pa_parse_cmpb_64_cmpltr PARAMS ((char **)); +static int pa_parse_cmpib_64_cmpltr PARAMS ((char **)); +static int pa_parse_addb_64_cmpltr PARAMS ((char **)); static void pa_block PARAMS ((int)); static void pa_brtab PARAMS ((int)); static void pa_try PARAMS ((int)); static void pa_call PARAMS ((int)); static void pa_call_args PARAMS ((struct call_desc *)); static void pa_callinfo PARAMS ((int)); -static void pa_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)); @@ -520,11 +543,11 @@ static void pa_proc PARAMS ((int)); static void pa_procend PARAMS ((int)); static void pa_param PARAMS ((int)); static void pa_undefine_label PARAMS ((void)); -static int need_pa11_opcode PARAMS ((struct pa_it *, - struct pa_11_fp_reg_struct *)); -static int pa_parse_number PARAMS ((char **, struct pa_11_fp_reg_struct *)); +static int need_pa11_opcode PARAMS ((void)); +static int pa_parse_number PARAMS ((char **, int)); static label_symbol_struct *pa_get_label PARAMS ((void)); #ifdef OBJ_SOM +static int log2 PARAMS ((int)); static void pa_compiler PARAMS ((int)); static void pa_align PARAMS ((int)); static void pa_space PARAMS ((int)); @@ -535,13 +558,13 @@ static sd_chain_struct *create_new_space PARAMS ((char *, int, int, asection *, int)); static ssd_chain_struct *create_new_subspace PARAMS ((sd_chain_struct *, char *, int, int, - int, int, int, + int, int, int, int, int, int, int, int, int, asection *)); static ssd_chain_struct *update_subspace PARAMS ((sd_chain_struct *, char *, int, int, int, int, 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 *)); @@ -556,16 +579,15 @@ 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, + offsetT, expressionS *, int, bfd_reloc_code_real_type, enum hppa_reloc_field_selector_type_alt, - int, long, int *)); + int, unsigned int, int)); static int is_end_of_statement PARAMS ((void)); static int reg_name_search PARAMS ((char *)); static int pa_chk_field_selector PARAMS ((char **)); static int is_same_frag PARAMS ((fragS *, fragS *)); static void process_exit PARAMS ((void)); -static int 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 **)); @@ -573,9 +595,11 @@ 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 *)); +static void pa_vtable_entry PARAMS ((int)); +static void pa_vtable_inherit PARAMS ((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,9 +625,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[] = ";"; +/* 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[] = "*?=<>"; /* Table of pseudo ops for the PA. FIXME -- how many of these are now redundant with the overall GAS and the object file @@ -625,26 +650,31 @@ const pseudo_typeS md_pseudo_table[] = {"byte", pa_cons, 1}, {"call", pa_call, 0}, {"callinfo", pa_callinfo, 0}, - {"code", pa_code, 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}, -#ifdef OBJ_ELF - { "file", dwarf2_directive_file }, -#endif {"fill", pa_fill, 0}, {"float", pa_float_cons, 'f'}, {"half", pa_cons, 2}, @@ -654,9 +684,6 @@ const pseudo_typeS md_pseudo_table[] = {"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 @@ -681,8 +708,14 @@ const pseudo_typeS md_pseudo_table[] = #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} }; @@ -695,9 +728,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 +751,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,7 +765,7 @@ 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; @@ -741,6 +778,15 @@ static int hppa_field_selector; strict syntax checking should be enabled for that instruction. */ static int strict = 0; +/* pa_parse_number returns values in `pa_number'. Mostly + pa_parse_number is used to return a register number, with floating + point registers being numbered from FP_REG_BASE upwards. + The bit specified with FP_REG_RSEL is set if the floating point + register has a `r' suffix. */ +#define FP_REG_BASE 64 +#define FP_REG_RSEL 128 +static int pa_number; + #ifdef OBJ_SOM /* A dummy bfd symbol so that all relocations have symbols of some kind. */ static symbolS *dummy_symbol; @@ -773,206 +819,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", 5}, + {"%farg1", 6}, + {"%farg2", 7}, + {"%farg3", 8}, + {"%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 +1120,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 +1161,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 +1175,34 @@ static struct default_space_dict pa_def_spaces[] = } \ } +/* Variant of CHECK_FIELD for use in md_apply_fix3 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) @@ -1212,10 +1304,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 +1324,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 @@ -1247,14 +1338,14 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, int where; int size; symbolS *add_symbol; - long offset; + offsetT offset; expressionS *exp; int pcrel; bfd_reloc_code_real_type r_type; enum hppa_reloc_field_selector_type_alt r_field; int r_format; - long arg_reloc; - int* unwind_bits; + unsigned int arg_reloc; + int unwind_bits ATTRIBUTE_UNUSED; { fixS *new_fix; @@ -1273,14 +1364,15 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, hppa_fix->segment = now_seg; #ifdef OBJ_SOM if (r_type == R_ENTRY || r_type == R_EXIT) - 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)) new_fix->fx_subsy = NULL; } @@ -1310,17 +1402,22 @@ cons_fix_new_hppa (frag, where, size, exp) /* 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; 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; @@ -1340,7 +1437,7 @@ md_begin () call_info_root = NULL; /* Set the default machine type. */ - if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10)) + if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, DEFAULT_LEVEL)) as_warn (_("could not set architecture and machine")); /* Folding of text and data segments fails miserably on the PA. @@ -1392,8 +1489,8 @@ md_begin () #ifdef OBJ_SOM dummy_symbol = symbol_find_or_make ("L$dummy"); S_SET_SEGMENT (dummy_symbol, text_section); - /* Force the symbol to be converted to a real symbol. */ - (void) symbol_get_bfdsym (dummy_symbol); + /* Force the symbol to be converted to a real symbol. */ + (void) symbol_get_bfdsym (dummy_symbol); #endif } @@ -1430,12 +1527,14 @@ md_assemble (str) 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 } @@ -1449,10 +1548,10 @@ md_assemble (str) /* Assemble the instruction. Results are saved into "the_insn". */ pa_ip (str); - /* Get somewhere to put the assembled instrution. */ + /* Get somewhere to put the assembled instruction. */ to = frag_more (4); - /* Output the opcode. */ + /* Output the opcode. */ md_number_to_chars (to, the_insn.opcode, 4); /* If necessary output more stuff. */ @@ -1460,23 +1559,10 @@ md_assemble (str) fix_new_hppa (frag_now, (to - frag_now->fr_literal), 4, NULL, (offsetT) 0, &the_insn.exp, the_insn.pcrel, the_insn.reloc, the_insn.field_selector, - the_insn.format, the_insn.arg_reloc, NULL); + the_insn.format, the_insn.arg_reloc, 0); #ifdef OBJ_ELF - if (debug_type == DEBUG_DWARF2) - { - 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); - } + dwarf2_emit_insn (4); #endif } @@ -1504,11 +1590,12 @@ pa_ip (str) /* Convert everything up to the first whitespace character into lower case. */ for (s = str; *s != ' ' && *s != '\t' && *s != '\n' && *s != '\0'; s++) - if (isupper (*s)) - *s = tolower (*s); + *s = TOLOWER (*s); /* Skip to something interesting. */ - for (s = str; isupper (*s) || islower (*s) || (*s >= '0' && *s <= '3'); ++s) + for (s = str; + ISUPPER (*s) || ISLOWER (*s) || (*s >= '0' && *s <= '3'); + ++s) ; switch (*s) @@ -1530,8 +1617,6 @@ pa_ip (str) as_fatal (_("Unknown opcode: `%s'"), str); } - save_s = str; - /* Look up the opcode in the has table. */ if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL) { @@ -1559,7 +1644,7 @@ pa_ip (str) /* 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. */ + crud is for compatibility with HP's old assemblers only. */ if (insn->arch < 20 && bfd_get_mach (stdoutput) < insn->arch) { @@ -1611,10 +1696,9 @@ pa_ip (str) /* Handle a 5 bit register or control register field at 10. */ case 'b': case '^': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 31, 0, 0); INSERT_FIELD_AND_CONTINUE (opcode, num, 21); @@ -1625,12 +1709,12 @@ pa_ip (str) while (*s == ' ' || *s == '\t') s = s + 1; - if (!strncasecmp(s, "%sar", 4)) + if (!strncasecmp (s, "%sar", 4)) { s += 4; continue; } - else if (!strncasecmp(s, "%cr11", 5)) + else if (!strncasecmp (s, "%cr11", 5)) { s += 5; continue; @@ -1639,28 +1723,25 @@ pa_ip (str) /* Handle a 5 bit register field at 15. */ case 'x': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 31, 0, 0); INSERT_FIELD_AND_CONTINUE (opcode, num, 16); /* Handle a 5 bit register field at 31. */ case 't': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 31, 0, 0); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); /* Handle a 5 bit register field at 10 and 15. */ case 'a': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 31, 0, 0); opcode |= num << 16; INSERT_FIELD_AND_CONTINUE (opcode, num, 21); @@ -1683,7 +1764,7 @@ pa_ip (str) /* 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); + num = low_sign_unext (num, 5); INSERT_FIELD_AND_CONTINUE (opcode, num, 16); /* Handle a 5 bit immediate at 31. */ @@ -1694,8 +1775,8 @@ pa_ip (str) 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); + CHECK_FIELD (num, 15, -16, strict); + num = low_sign_unext (num, 5); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); /* Handle an unsigned 5 bit immediate at 31. */ @@ -1704,8 +1785,8 @@ pa_ip (str) 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); + CHECK_FIELD (num, 31, 0, strict); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); /* Handle an unsigned 5 bit immediate at 15. */ case 'R': @@ -1727,22 +1808,20 @@ pa_ip (str) /* Handle a 2 bit space identifier at 17. */ case 's': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 3, 0, 1); INSERT_FIELD_AND_CONTINUE (opcode, num, 14); /* Handle a 3 bit space identifier at 18. */ case 'S': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 0)) break; - num = pa_parse_number (&s, 0); + num = pa_number; CHECK_FIELD (num, 7, 0, 1); - dis_assemble_3 (num, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 13); + opcode |= re_assemble_3 (num); + continue; /* Handle all completers. */ case 'c': @@ -1750,6 +1829,7 @@ pa_ip (str) { /* Handle a completer for an indexing load or store. */ + case 'X': case 'x': { int uu = 0; @@ -1767,11 +1847,15 @@ pa_ip (str) } else if (strncasecmp (s, "m", 1) == 0) m = 1; - else if (strncasecmp (s, "s", 1) == 0) + else if ((strncasecmp (s, "s ", 2) == 0) + || (strncasecmp (s, "s,", 2) == 0)) uu = 1; /* When in strict mode this is a match failure. */ else if (strict) - break; + { + s--; + break; + } else as_bad (_("Invalid Indexed Load Completer.")); s++; @@ -1784,41 +1868,49 @@ pa_ip (str) } /* Handle a short load/store completer. */ + case 'M': case 'm': case 'q': case 'J': - case 'c': + case 'e': { int a = 0; int m = 0; if (*s == ',') { + int found = 0; s++; if (strncasecmp (s, "ma", 2) == 0) { a = 0; m = 1; + found = 1; } else if (strncasecmp (s, "mb", 2) == 0) { a = 1; m = 1; + found = 1; } - /* When in strict mode this is a match failure. */ - else if (strict) - break; + + /* When in strict mode, pass through for cache op. */ + if (!found && strict) + s--; else - as_bad (_("Invalid Short Load/Store Completer.")); - s += 2; + { + if (!found) + 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') + consider this a positive match for 'ce'. */ + else if (*args == 'e') break; - /* 'J', 'm' and 'q' are the same, except for where they + /* 'J', 'm', 'M' and 'q' are the same, except for where they encode the before/after field. */ - if (*args == 'm') + if (*args == 'm' || *args == 'M') { opcode |= m << 5; INSERT_FIELD_AND_CONTINUE (opcode, a, 13); @@ -1833,17 +1925,18 @@ pa_ip (str) /* M bit is explicit in the major opcode. */ INSERT_FIELD_AND_CONTINUE (opcode, a, 2); } - else if (*args == 'c') + else if (*args == 'e') { - /* Gross! Hide these values in the immediate field - of the instruction, then pull them out later. */ - opcode |= m << 8; - opcode |= a << 9; + /* Stash the ma/mb flag temporarily in the + instruction. We will use (and remove it) + later when handling 'J', 'K', '<' & '>'. */ + opcode |= a; continue; } } /* Handle a stbys completer. */ + case 'A': case 's': { int a = 0; @@ -1854,13 +1947,17 @@ pa_ip (str) s++; if (strncasecmp (s, "m", 1) == 0) m = 1; - else if (strncasecmp (s, "b", 1) == 0) + else if ((strncasecmp (s, "b ", 2) == 0) + || (strncasecmp (s, "b,", 2) == 0)) a = 0; else if (strncasecmp (s, "e", 1) == 0) a = 1; /* When in strict mode this is a match failure. */ else if (strict) - break; + { + s--; + break; + } else as_bad (_("Invalid Store Bytes Short Completer")); s++; @@ -1872,6 +1969,48 @@ pa_ip (str) INSERT_FIELD_AND_CONTINUE (opcode, a, 13); } + /* Handle load cache hint completer. */ + case 'c': + cmpltr = 0; + if (!strncmp (s, ",sl", 3)) + { + s += 3; + cmpltr = 2; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10); + + /* Handle store cache hint completer. */ + case 'C': + cmpltr = 0; + if (!strncmp (s, ",sl", 3)) + { + s += 3; + cmpltr = 2; + } + else if (!strncmp (s, ",bc", 3)) + { + s += 3; + cmpltr = 1; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10); + + /* Handle load and clear cache hint completer. */ + case 'd': + cmpltr = 0; + if (!strncmp (s, ",co", 3)) + { + s += 3; + cmpltr = 1; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 10); + + /* Handle load ordering completer. */ + case 'o': + if (strncmp (s, ",o", 2) != 0) + break; + s += 2; + continue; + /* Handle a branch gate completer. */ case 'g': if (strncasecmp (s, ",gate", 5) != 0) @@ -1924,7 +2063,7 @@ pa_ip (str) INSERT_FIELD_AND_CONTINUE (opcode, flag, 6); /* Handle MFCTL wide completer. */ - case 'W': + case 'W': if (strncasecmp (s, ",w", 2) != 0) break; s += 2; @@ -1988,7 +2127,7 @@ pa_ip (str) flag = 3; s += 4; } - + INSERT_FIELD_AND_CONTINUE (opcode, flag, 10); /* Handle 64 bit carry for ADD. */ @@ -2136,13 +2275,13 @@ pa_ip (str) else if (*s == 'l') lr = 0; else - as_bad(_("Invalid left/right combination completer")); + as_bad (_("Invalid left/right combination completer")); s++; INSERT_FIELD_AND_CONTINUE (opcode, lr, 13); } else - as_bad(_("Invalid left/right combination completer")); + as_bad (_("Invalid left/right combination completer")); break; /* Handle saturation at 24:25. */ @@ -2191,14 +2330,14 @@ pa_ip (str) perm = 3; break; default: - as_bad(_("Invalid permutation completer")); + as_bad (_("Invalid permutation completer")); } opcode |= perm << permloc[i]; } continue; } else - as_bad(_("Invalid permutation completer")); + as_bad (_("Invalid permutation completer")); break; default: @@ -2212,16 +2351,16 @@ pa_ip (str) args++; switch (*args) { - /* Handle FP compare conditions. */ - case 'f': - cond = pa_parse_fp_cmp_cond (&s); - INSERT_FIELD_AND_CONTINUE (opcode, cond, 0); + /* Handle FP compare conditions. */ + case 'f': + cond = pa_parse_fp_cmp_cond (&s); + INSERT_FIELD_AND_CONTINUE (opcode, cond, 0); /* Handle an add condition. */ case 'A': case 'a': - cmpltr = 0; - flag = 0; + cmpltr = 0; + flag = 0; if (*s == ',') { s++; @@ -2236,7 +2375,6 @@ pa_ip (str) } else if (*s == '*') break; - name = s; name = s; while (*s != ',' && *s != ' ' && *s != '\t') @@ -2298,7 +2436,7 @@ pa_ip (str) flag = 1; } /* ",*" is a valid condition. */ - else if (*args == 'a') + else if (*args == 'a' || *name) as_bad (_("Invalid Add Condition: %s"), name); *s = c; } @@ -2307,35 +2445,38 @@ pa_ip (str) /* Handle non-negated add and branch condition. */ case 'd': - cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1); + cmpltr = pa_parse_nonneg_add_cmpltr (&s); if (cmpltr < 0) { - as_bad (_("Invalid Compare/Subtract Condition: %c"), *s); + as_bad (_("Invalid Add and Branch Condition")); cmpltr = 0; } INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); - /* Handle negated add and branch condition. */ - case 'D': - abort (); - - /* Handle wide-mode non-negated add and branch condition. */ - case 'w': - abort (); - - /* Handle wide-mode negated add and branch condition. */ + /* Handle 64 bit wide-mode add and branch condition. */ case 'W': - abort(); + cmpltr = pa_parse_addb_64_cmpltr (&s); + if (cmpltr < 0) + { + as_bad (_("Invalid Add and Branch Condition")); + cmpltr = 0; + } + else + { + /* Negated condition requires an opcode change. */ + opcode |= (cmpltr & 8) << 24; + } + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr & 7, 13); - /* Handle a negated or non-negated add and branch + /* Handle a negated or non-negated add and branch condition. */ case '@': save_s = s; - cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1); + cmpltr = pa_parse_nonneg_add_cmpltr (&s); if (cmpltr < 0) { s = save_s; - cmpltr = pa_parse_neg_add_cmpltr (&s, 1); + cmpltr = pa_parse_neg_add_cmpltr (&s); if (cmpltr < 0) { as_bad (_("Invalid Compare/Subtract Condition")); @@ -2343,7 +2484,7 @@ pa_ip (str) } else { - /* Negated condition requires an opcode change. */ + /* Negated condition requires an opcode change. */ opcode |= 1 << 27; } } @@ -2393,16 +2534,15 @@ pa_ip (str) /* 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; @@ -2463,7 +2603,7 @@ pa_ip (str) flag = 1; } /* ",*" is a valid condition. */ - else if (*args != 'S') + else if (*args != 'S' || *name) as_bad (_("Invalid Compare/Subtract Condition: %s"), name); *s = c; @@ -2473,51 +2613,57 @@ pa_ip (str) /* Handle a non-negated compare condition. */ case 't': - cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1); + cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s); if (cmpltr < 0) { - as_bad (_("Invalid Compare/Subtract Condition: %c"), *s); + as_bad (_("Invalid Compare/Subtract Condition")); cmpltr = 0; } INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); - /* Handle a negated compare condition. */ - case 'T': - abort (); - - /* Handle a 64 bit non-negated compare condition. */ - case 'r': - abort (); - - /* Handle a 64 bit negated compare condition. */ - case 'R': - abort (); - - /* Handle a 64 bit cmpib condition. */ - case 'Q': - abort (); - - /* Handle a negated or non-negated compare/subtract - condition. */ + /* Handle a 32 bit compare and branch condition. */ case 'n': save_s = s; - cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1); + cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s); if (cmpltr < 0) { s = save_s; - cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1); + cmpltr = pa_parse_neg_cmpsub_cmpltr (&s); if (cmpltr < 0) { - as_bad (_("Invalid Compare/Subtract Condition.")); + as_bad (_("Invalid Compare and Branch Condition")); cmpltr = 0; } else { - /* Negated condition requires an opcode change. */ + /* Negated condition requires an opcode change. */ opcode |= 1 << 27; } } - + + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); + + /* Handle a 64 bit compare and branch condition. */ + case 'N': + cmpltr = pa_parse_cmpb_64_cmpltr (&s); + if (cmpltr >= 0) + { + /* Negated condition requires an opcode change. */ + opcode |= (cmpltr & 8) << 26; + } + else + /* Not a 64 bit cond. Give 32 bit a chance. */ + break; + + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr & 7, 13); + + /* Handle a 64 bit cmpib condition. */ + case 'Q': + cmpltr = pa_parse_cmpib_64_cmpltr (&s); + if (cmpltr < 0) + /* Not a 64 bit cond. Give 32 bit a chance. */ + break; + INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); /* Handle a logical instruction condition. */ @@ -2539,15 +2685,13 @@ pa_ip (str) } 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) @@ -2582,7 +2726,7 @@ pa_ip (str) flag = 1; } /* ",*" is a valid condition. */ - else if (*args != 'L') + else if (*args != 'L' || *name) as_bad (_("Invalid Logical Instruction Condition.")); *s = c; } @@ -2608,8 +2752,7 @@ pa_ip (str) } else if (*s == '*') break; - name = s; - + name = s; while (*s != ',' && *s != ' ' && *s != '\t') s += 1; @@ -2638,7 +2781,7 @@ pa_ip (str) continue; } /* ",*" is a valid condition. */ - else if (*args != 'X') + else if (*args != 'X' || *name) as_bad (_("Invalid Shift/Extract/Deposit Condition.")); *s = c; } @@ -2652,7 +2795,7 @@ pa_ip (str) if (*s == ',') { s++; - + /* 64 bit conditions. */ if (*args == 'U') { @@ -2663,7 +2806,7 @@ pa_ip (str) } else if (*s == '*') break; - + if (strncasecmp (s, "sbz", 3) == 0) { cmpltr = 2; @@ -2725,8 +2868,32 @@ pa_ip (str) 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') + else if (*args != 'U' || (*s != ' ' && *s != '\t')) as_bad (_("Invalid Unit Instruction Condition.")); } opcode |= cmpltr << 13; @@ -2804,7 +2971,7 @@ pa_ip (str) { num = evaluate_absolute (&the_insn); CHECK_FIELD (num, 1023, -1024, 0); - low_sign_unext (num, 11, &num); + num = low_sign_unext (num, 11); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } else @@ -2826,26 +2993,22 @@ pa_ip (str) s = expr_end; if (the_insn.exp.X_op == O_constant) { - int a, m; + int mb; - /* XXX the completer stored away tibits of information + /* 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. */ - m = (opcode & (1 << 8)) != 0; - a = (opcode & (1 << 9)) != 0; - opcode &= ~ (3 << 8); + mb = opcode & 1; + opcode -= mb; num = evaluate_absolute (&the_insn); - if ((a == 1 && num >= 0) || (a == 0 && num < 0)) + if (mb != (num < 0)) break; CHECK_FIELD (num, 8191, -8192, 0); - low_sign_unext (num, 14, &num); + num = low_sign_unext (num, 14); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } - else - { - break; - } + break; /* Handle a 14 bit immediate at 31. */ case 'K': @@ -2854,33 +3017,64 @@ pa_ip (str) s = expr_end; if (the_insn.exp.X_op == O_constant) { - int a, m; + int mb; - /* 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); + mb = opcode & 1; + opcode -= mb; num = evaluate_absolute (&the_insn); - if ((a == 1 && num < 0) || (a == 0 && num > 0)) + if (mb == (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); + num = low_sign_unext (num, 14); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } - else + break; + + /* Handle a 16 bit immediate at 31. */ + case '<': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + if (the_insn.exp.X_op == O_constant) { - break; + int mb; + + 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; + + /* Handle a 16 bit immediate at 31. */ + case '>': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + if (the_insn.exp.X_op == O_constant) + { + int mb; + + mb = opcode & 1; + opcode -= mb; + num = evaluate_absolute (&the_insn); + if (mb == (num < 0)) + break; + if (num % 4) + break; + CHECK_FIELD (num, 32767, -32768, 0); + num = re_assemble_16 (num); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } + break; - /* Handle 14 bit immediated, shifted left three times. */ + /* Handle 14 bit immediate, shifted left three times. */ case '#': the_insn.field_selector = pa_chk_field_selector (&s); get_expression (s); @@ -2948,7 +3142,7 @@ pa_ip (str) { num = evaluate_absolute (&the_insn); CHECK_FIELD (num, 8191, -8192, 0); - low_sign_unext (num, 14, &num); + num = low_sign_unext (num, 14); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } else @@ -2972,8 +3166,8 @@ pa_ip (str) { num = evaluate_absolute (&the_insn); CHECK_FIELD (num >> 11, 1048575, -1048576, 0); - dis_assemble_21 (num, &num); - INSERT_FIELD_AND_CONTINUE (opcode, num, 0); + opcode |= re_assemble_21 (num); + continue; } else { @@ -2987,34 +3181,112 @@ pa_ip (str) continue; } - /* Handle a 12 bit branch displacement. */ - case 'w': + /* 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; - the_insn.pcrel = 1; - if (!strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), "L$0\001")) + if (the_insn.exp.X_op == O_constant) { - unsigned int w1, w, result; - 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); + CHECK_FIELD (num, 32767, -32768, 0); + opcode |= re_assemble_16 (num); + 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; + /* ??? Is this valid for wide mode? */ + if (is_DP_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_GOTOFF; + else if (is_PC_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_PCREL_CALL; + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } + + /* Handle a word-aligned 16-bit imm. at 31 (PA2.0 wide). */ + case 'y': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + if (the_insn.exp.X_op == O_constant) + { + num = evaluate_absolute (&the_insn); + CHECK_FIELD (num, 32767, -32768, 0); + CHECK_ALIGN (num, 4, 0); + opcode |= re_assemble_16 (num); + continue; + } + else + { + /* ??? Is this valid for wide mode? */ + if (is_DP_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_GOTOFF; + else if (is_PC_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_PCREL_CALL; + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } + + /* Handle a dword-aligned 16-bit imm. at 31 (PA2.0 wide). */ + case '&': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + if (the_insn.exp.X_op == O_constant) + { + num = evaluate_absolute (&the_insn); + CHECK_FIELD (num, 32767, -32768, 0); + CHECK_ALIGN (num, 8, 0); + opcode |= re_assemble_16 (num); + continue; + } + else + { + /* ??? Is this valid for wide mode? */ + if (is_DP_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_GOTOFF; + else if (is_PC_relative (the_insn.exp)) + the_insn.reloc = R_HPPA_PCREL_CALL; + else + the_insn.reloc = R_HPPA; + the_insn.format = 14; + continue; + } + + /* Handle a 12 bit branch displacement. */ + case 'w': + the_insn.field_selector = pa_chk_field_selector (&s); + get_expression (s); + s = expr_end; + the_insn.pcrel = 1; + if (!the_insn.exp.X_add_symbol + || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), + 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; } @@ -3026,25 +3298,19 @@ pa_ip (str) the_insn.pcrel = 1; if (!the_insn.exp.X_add_symbol || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), - "L$0\001")) + FAKE_LABEL_NAME)) { - unsigned int w2, w1, w, result; - num = evaluate_absolute (&the_insn); if (num % 4) { as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 262143, -262144, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - - sign_unext (num >> 2, 17, &result); - dis_assemble_17 (result, &w1, &w2, &w); - INSERT_FIELD_AND_CONTINUE (opcode, - ((w2 << 2) | (w1 << 16) | w), 0); + CHECK_FIELD (num, 262143, -262144, 0); + opcode |= re_assemble_17 (num >> 2); + continue; } else { @@ -3063,27 +3329,18 @@ pa_ip (str) the_insn.pcrel = 1; if (!the_insn.exp.X_add_symbol || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), - "L$0\001")) + FAKE_LABEL_NAME)) { - unsigned int w3, w2, w1, w, result; - num = evaluate_absolute (&the_insn); if (num % 4) { as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 8388607, -8388608, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - - 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); + CHECK_FIELD (num, 8388607, -8388608, 0); + opcode |= re_assemble_22 (num >> 2); } else { @@ -3102,25 +3359,19 @@ pa_ip (str) the_insn.pcrel = 0; if (!the_insn.exp.X_add_symbol || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), - "L$0\001")) + FAKE_LABEL_NAME)) { - unsigned int w2, w1, w, result; - num = evaluate_absolute (&the_insn); if (num % 4) { as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 262143, -262144, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - - sign_unext (num >> 2, 17, &result); - dis_assemble_17 (result, &w1, &w2, &w); - INSERT_FIELD_AND_CONTINUE (opcode, - ((w2 << 2) | (w1 << 16) | w), 0); + CHECK_FIELD (num, 262143, -262144, 0); + opcode |= re_assemble_17 (num >> 2); + continue; } else { @@ -3149,6 +3400,13 @@ pa_ip (str) s += 9; continue; + /* Handle immediate value of 0 for ordered load/store instructions. */ + case '@': + if (*s != '0') + break; + s++; + continue; + /* Handle a 2 bit shift count at 25. */ case '.': num = pa_get_absolute_expression (&the_insn, &s); @@ -3231,13 +3489,25 @@ pa_ip (str) opcode |= (num & 0x20) << 6; INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 5); + /* Handle a 5 bit immediate at 10 with 'd' as the complement + of the high bit of the immediate. */ + case 'B': + num = pa_get_absolute_expression (&the_insn, &s); + if (strict && the_insn.exp.X_op != O_constant) + break; + s = expr_end; + CHECK_FIELD (num, 63, 0, strict); + if (num & 0x20) + ; + else + opcode |= (1 << 13); + INSERT_FIELD_AND_CONTINUE (opcode, num & 0x1f, 21); + /* Handle a 5 bit immediate at 10. */ case 'Q': num = pa_get_absolute_expression (&the_insn, &s); if (strict && the_insn.exp.X_op != O_constant) break; - 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); @@ -3250,7 +3520,7 @@ pa_ip (str) 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); @@ -3266,7 +3536,7 @@ pa_ip (str) if (strict && the_insn.exp.X_op != O_constant) break; s = expr_end; - CHECK_FIELD (num, 671108864, 0, strict); + CHECK_FIELD (num, 67108863, 0, strict); INSERT_FIELD_AND_CONTINUE (opcode, num, 0); /* Handle a 3 bit SFU identifier at 25. */ @@ -3373,7 +3643,7 @@ pa_ip (str) flag = QUAD; opcode |= flag << 13; if (the_insn.fpof1 == SGL - || the_insn.fpof1 == DBL + || the_insn.fpof1 == DBL || the_insn.fpof1 == QUAD) { if (the_insn.fpof2 == SGL @@ -3392,7 +3662,7 @@ pa_ip (str) abort (); } else if (the_insn.fpof1 == W - || the_insn.fpof1 == DW + || the_insn.fpof1 == DW || the_insn.fpof1 == QW) { if (the_insn.fpof2 == SGL @@ -3403,7 +3673,7 @@ pa_ip (str) abort (); } else if (the_insn.fpof1 == UW - || the_insn.fpof1 == UDW + || the_insn.fpof1 == UDW || the_insn.fpof1 == UQW) { if (the_insn.fpof2 == SGL @@ -3461,49 +3731,43 @@ pa_ip (str) { /* Float target register. */ case 't': - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 3)) break; - num = pa_parse_number (&s, 0); + 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': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); - opcode |= result.number_part; + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + opcode |= num; /* 0x30 opcodes are FP arithmetic operation opcodes and need to be turned into 0x38 opcodes. This is not necessary for loads/stores. */ - if (need_pa11_opcode (&the_insn, &result) + if (need_pa11_opcode () && ((opcode & 0xfc000000) == 0x30000000)) opcode |= 1 << 27; - INSERT_FIELD_AND_CONTINUE (opcode, result.l_r_select & 1, 6); + opcode |= (pa_number & FP_REG_RSEL ? 1 << 6 : 0); + continue; } /* Float operand 1. */ case 'a': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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)) + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + opcode |= num << 21; + if (need_pa11_opcode ()) { - opcode |= (result.l_r_select & 1) << 7; + opcode |= (pa_number & FP_REG_RSEL ? 1 << 7 : 0); opcode |= 1 << 27; } continue; @@ -3513,32 +3777,26 @@ pa_ip (str) case 'X': case 'A': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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; + 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; } /* Float operand 2. */ case 'b': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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)) + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + opcode |= num << 16; + if (need_pa11_opcode ()) { - opcode |= (result.l_r_select & 1) << 12; + opcode |= (pa_number & FP_REG_RSEL ? 1 << 12 : 0); opcode |= 1 << 27; } continue; @@ -3547,166 +3805,152 @@ pa_ip (str) /* Float operand 2 with L/R selection. */ case 'B': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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; + 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; } /* Float operand 3 for fmpyfadd, fmpynfadd. */ case 'C': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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; + 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; } /* Float mult operand 1 for fmpyadd, fmpysub */ case 'i': { - struct pa_11_fp_reg_struct result; - - /* This should be more strict. Small steps. */ - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); if (the_insn.fpof1 == SGL) { - if (result.number_part < 16) + if (num < 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; + num &= 0xF; + num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0); } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 21); + INSERT_FIELD_AND_CONTINUE (opcode, num, 21); } /* 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 != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); if (the_insn.fpof1 == SGL) { - if (result.number_part < 16) + if (num < 16) { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; + as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); + break; } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; + num &= 0xF; + num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0); } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 16); + INSERT_FIELD_AND_CONTINUE (opcode, num, 16); } /* 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 != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); if (the_insn.fpof1 == SGL) { - if (result.number_part < 16) + if (num < 16) { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; + as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); + break; } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; + num &= 0xF; + num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0); } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 0); + INSERT_FIELD_AND_CONTINUE (opcode, num, 0); } /* 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 != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); if (the_insn.fpof1 == SGL) { - if (result.number_part < 16) + if (num < 16) { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; + as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); + break; } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; + num &= 0xF; + num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0); } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 6); + INSERT_FIELD_AND_CONTINUE (opcode, num, 6); } /* 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 != '%') + if (!pa_parse_number (&s, 1)) break; - pa_parse_number (&s, &result); - CHECK_FIELD (result.number_part, 31, 0, 0); + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); if (the_insn.fpof1 == SGL) { - if (result.number_part < 16) + if (num < 16) { - as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); - break; + as_bad (_("Invalid register for single precision fmpyadd or fmpysub")); + break; } - result.number_part &= 0xF; - result.number_part |= (result.l_r_select & 1) << 4; + num &= 0xF; + num |= (pa_number & FP_REG_RSEL ? 1 << 4 : 0); } - INSERT_FIELD_AND_CONTINUE (opcode, result.number_part, 11); + INSERT_FIELD_AND_CONTINUE (opcode, num, 11); } /* Handle L/R register halves like 'x'. */ + case 'E': case 'e': { - struct pa_11_fp_reg_struct result; - - if (strict && *s != '%') + if (!pa_parse_number (&s, 1)) 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)) + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + opcode |= num << 16; + if (need_pa11_opcode ()) { - opcode |= (result.l_r_select & 1) << 1; + opcode |= (pa_number & FP_REG_RSEL ? 1 << 1 : 0); } continue; } + + /* Float target register (PA 2.0 wide). */ + case 'x': + if (!pa_parse_number (&s, 3)) + break; + num = (pa_number & ~FP_REG_RSEL) - FP_REG_BASE; + CHECK_FIELD (num, 31, 0, 0); + INSERT_FIELD_AND_CONTINUE (opcode, num, 16); + default: abort (); } @@ -3720,7 +3964,7 @@ pa_ip (str) failed: /* Check if the args matched. */ - if (match == FALSE) + if (!match) { if (&insn[1] - pa_opcodes < (int) NUMOPCODES && !strcmp (insn->name, insn[1].name)) @@ -3822,16 +4066,17 @@ tc_gen_reloc (section, 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; + reloc_type **codes; + reloc_type code; int n_relocs; int i; hppa_fixp = (struct hppa_fix_struct *) fixp->tc_fix_data; if (fixp->fx_addsy == 0) return &no_relocs; + assert (hppa_fixp != 0); assert (section != 0); @@ -3839,7 +4084,7 @@ tc_gen_reloc (section, fixp) reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - codes = (bfd_reloc_code_real_type **) hppa_gen_reloc_type (stdoutput, + codes = hppa_gen_reloc_type (stdoutput, fixp->fx_r_type, hppa_fixp->fx_r_format, hppa_fixp->fx_r_field, @@ -3847,7 +4092,10 @@ tc_gen_reloc (section, fixp) symbol_get_bfdsym (fixp->fx_addsy)); if (codes == NULL) - abort (); + { + as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup")); + abort (); + } for (n_relocs = 0; codes[n_relocs]; n_relocs++) ; @@ -3867,14 +4115,6 @@ tc_gen_reloc (section, fixp) code = *codes[0]; - reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); - *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - reloc->howto = bfd_reloc_type_lookup (stdoutput, code); - reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; - reloc->addend = 0; /* default */ - - assert (reloc->howto && code == reloc->howto->type); - /* Now, do any processing that is dependent on the relocation type. */ switch (code) { @@ -3886,9 +4126,8 @@ tc_gen_reloc (section, fixp) case R_PARISC_PLABEL14R: /* For plabel relocations, the addend of the relocation should be either 0 (no static link) or 2 - (static link required). - - FIXME: We always assume no static link! + (static link required). This adjustment is done in + bfd/elf32-hppa.c:elf32_hppa_relocate_section. We also slam a zero addend into the DLT relative relocs; it doesn't make a lot of sense to use any addend since @@ -3896,19 +4135,37 @@ tc_gen_reloc (section, fixp) reloc->addend = 0; break; - case R_PARISC_PCREL21L: +#ifdef ELF_ARG_RELOC case R_PARISC_PCREL17R: case R_PARISC_PCREL17F: case R_PARISC_PCREL17C: - case R_PARISC_PCREL14R: - case R_PARISC_PCREL14F: - /* The constant is stored in the instruction. */ - reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, 0); + case R_PARISC_DIR17R: + case R_PARISC_DIR17F: + case R_PARISC_PCREL21L: + case R_PARISC_DIR21L: + reloc->addend = HPPA_R_ADDEND (hppa_fixp->fx_arg_reloc, + fixp->fx_offset); break; +#endif + + case R_PARISC_DIR32: + /* Facilitate hand-crafted unwind info. */ + if (strcmp (section->name, UNWIND_SECTION_NAME) == 0) + code = R_PARISC_SEGREL32; + /* Fall thru */ + default: reloc->addend = fixp->fx_offset; break; } + + reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); + reloc->howto = bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) code); + reloc->address = fixp->fx_frag->fr_address + fixp->fx_where; + + assert (reloc->howto && (unsigned int) code == reloc->howto->type); break; } #else /* OBJ_SOM */ @@ -3920,7 +4177,9 @@ tc_gen_reloc (section, fixp) relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - relocs[i]->howto = bfd_reloc_type_lookup (stdoutput, code); + relocs[i]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) code); relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where; switch (code) @@ -3931,25 +4190,35 @@ tc_gen_reloc (section, fixp) relocs now and break out of the loop. */ assert (i == 1); relocs[0]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol); - relocs[0]->howto = bfd_reloc_type_lookup (stdoutput, *codes[0]); + relocs[0]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[0]); relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where; relocs[0]->addend = 0; relocs[1]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy); - relocs[1]->howto = bfd_reloc_type_lookup (stdoutput, *codes[1]); + relocs[1]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[1]); relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where; relocs[1]->addend = 0; relocs[2]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy); - relocs[2]->howto = bfd_reloc_type_lookup (stdoutput, *codes[2]); + relocs[2]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[2]); relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where; relocs[2]->addend = 0; relocs[3]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol); - relocs[3]->howto = bfd_reloc_type_lookup (stdoutput, *codes[3]); + relocs[3]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[3]); relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where; relocs[3]->addend = 0; relocs[4]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol); - relocs[4]->howto = bfd_reloc_type_lookup (stdoutput, *codes[4]); + relocs[4]->howto = + bfd_reloc_type_lookup (stdoutput, + (bfd_reloc_code_real_type) *codes[4]); relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where; relocs[4]->addend = 0; goto done; @@ -3986,8 +4255,8 @@ tc_gen_reloc (section, fixp) 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]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); relocs[i]->addend = 0; break; @@ -3995,8 +4264,8 @@ tc_gen_reloc (section, fixp) 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]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *)); + *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol); relocs[i]->addend = fixp->fx_offset; break; @@ -4015,8 +4284,8 @@ tc_gen_reloc (section, fixp) void md_convert_frag (abfd, sec, fragP) - register bfd *abfd; - register asection *sec; + register bfd *abfd ATTRIBUTE_UNUSED; + register asection *sec ATTRIBUTE_UNUSED; register fragS *fragP; { unsigned int address; @@ -4044,7 +4313,7 @@ md_convert_frag (abfd, sec, fragP) } } -/* Round up a section size to the appropriate boundary. */ +/* Round up a section size to the appropriate boundary. */ valueT md_section_align (segment, size) @@ -4061,7 +4330,7 @@ md_section_align (segment, size) int md_estimate_size_before_relax (fragP, segment) register fragS *fragP; - asection *segment; + asection *segment ATTRIBUTE_UNUSED; { int size; @@ -4073,48 +4342,98 @@ md_estimate_size_before_relax (fragP, segment) return size; } -CONST char *md_shortopts = ""; +#ifdef OBJ_ELF +# ifdef WARN_COMMENTS +const char *md_shortopts = "Vc"; +# else +const char *md_shortopts = "V"; +# endif +#else +# ifdef WARN_COMMENTS +const char *md_shortopts = "c"; +# else +const char *md_shortopts = ""; +# endif +#endif + struct option md_longopts[] = { +#ifdef WARN_COMMENTS + {"warn-comment", no_argument, NULL, 'c'}, +#endif {NULL, no_argument, NULL, 0} }; -size_t md_longopts_size = sizeof(md_longopts); +size_t md_longopts_size = sizeof (md_longopts); int md_parse_option (c, arg) - int c; - char *arg; + int c ATTRIBUTE_UNUSED; + char *arg ATTRIBUTE_UNUSED; { - return 0; + switch (c) + { + default: + return 0; + +#ifdef OBJ_ELF + case 'V': + print_version_id (); + break; +#endif +#ifdef WARN_COMMENTS + case 'c': + warn_comment = 1; + break; +#endif + } + + return 1; } void md_show_usage (stream) - FILE *stream; + FILE *stream ATTRIBUTE_UNUSED; { +#ifdef OBJ_ELF + fprintf (stream, _("\ + -Q ignored\n")); +#endif +#ifdef WARN_COMMENTS + fprintf (stream, _("\ + -c print a warning if a comment is found\n")); +#endif } /* We have no need to default values of symbols. */ symbolS * md_undefined_symbol (name) - char *name; + char *name ATTRIBUTE_UNUSED; { return 0; } +#if defined (OBJ_SOM) || defined (ELF_ARG_RELOC) +#define nonzero_dibits(x) \ + ((x) | (((x) & 0x55555555) << 1) | (((x) & 0xAAAAAAAA) >> 1)) +#define arg_reloc_stub_needed(CALLER, CALLEE) \ + (((CALLER) ^ (CALLEE)) & nonzero_dibits (CALLER) & nonzero_dibits (CALLEE)) +#else +#define arg_reloc_stub_needed(CALLER, CALLEE) 0 +#endif + /* Apply a fixup to an instruction. */ -int -md_apply_fix (fixP, valp) +void +md_apply_fix3 (fixP, valP, seg) fixS *fixP; - valueT *valp; + valueT *valP; + segT seg ATTRIBUTE_UNUSED; { - char *buf = fixP->fx_where + fixP->fx_frag->fr_literal; + unsigned char *buf; struct hppa_fix_struct *hppa_fixP; - long new_val, result = 0; - unsigned int w1, w2, w, resulti; + offsetT new_val; + int insn, val, fmt; - hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data; /* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can never be "applied" (they are just markers). Likewise for R_HPPA_BEGIN_BRTAB and R_HPPA_END_BRTAB. */ @@ -4124,194 +4443,209 @@ md_apply_fix (fixP, valp) || 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; + return; /* 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; + 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 + + if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) + fixP->fx_done = 1; /* There should have been an HPPA specific fixup associated with the GAS fixup. */ - if (hppa_fixP) + hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data; + if (hppa_fixP == NULL) { - unsigned long buf_wd = bfd_get_32 (stdoutput, buf); - unsigned char fmt = bfd_hppa_insn2fmt (buf_wd); - - /* If there is a symbol associated with this fixup, then it's something - which will need a SOM relocation (except for some PC-relative relocs). - In such cases we should treat the "val" or "addend" as zero since it - will be added in as needed from fx_offset in tc_gen_reloc. */ - if ((fixP->fx_addsy != NULL - || fixP->fx_r_type == R_HPPA_NONE) + as_bad_where (fixP->fx_file, fixP->fx_line, + _("no hppa_fixup entry for fixup type 0x%x"), + fixP->fx_r_type); + return; + } + + buf = (unsigned char *) (fixP->fx_frag->fr_literal + fixP->fx_where); + insn = bfd_get_32 (stdoutput, buf); + fmt = bfd_hppa_insn2fmt (stdoutput, insn); + + /* If there is a symbol associated with this fixup, then it's something + which will need a SOM relocation (except for some PC-relative relocs). + In such cases we should treat the "val" or "addend" as zero since it + will be added in as needed from fx_offset in tc_gen_reloc. */ + if ((fixP->fx_addsy != NULL + || fixP->fx_r_type == (int) R_HPPA_NONE) #ifdef OBJ_SOM - && fmt != 32 + && fmt != 32 #endif - ) - new_val = ((fmt == 12 || fmt == 17 || fmt == 22) ? 8 : 0); + ) + 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); + /* 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 - else - new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field); - - /* Handle pc-relative exceptions from above. */ -#define arg_reloc_stub_needed(CALLER, CALLEE) \ - ((CALLEE) && (CALLER) && ((CALLEE) != (CALLER))) - if ((fmt == 12 || fmt == 17 || fmt == 22) - && fixP->fx_addsy - && fixP->fx_pcrel #ifdef OBJ_SOM - && !arg_reloc_stub_needed ((long) ((obj_symbol_type *) - symbol_get_bfdsym (fixP->fx_addsy))->tc_data.ap.hppa_arg_reloc, - hppa_fixP->fx_arg_reloc) + && (* valP - 8 + 262144 < 524288 + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) #endif - && (((int)(*valp) > -262144 && (int)(*valp) < 262143) && fmt != 22) - && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment - && !(fixP->fx_subsy - && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment)) - - new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field); -#undef arg_reloc_stub_needed - - switch (fmt) - { - /* Handle all opcodes with the 'j' operand type. */ - case 14: - CHECK_FIELD (new_val, 8191, -8192, 0); - - /* Mask off 14 bits to be changed. */ - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xffffc000, - buf); - low_sign_unext (new_val, 14, &resulti); - result = resulti; - break; + && !S_IS_EXTERNAL (fixP->fx_addsy) + && !S_IS_WEAK (fixP->fx_addsy) + && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment + && !(fixP->fx_subsy + && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment)) + { + new_val = hppa_field_adjust (* valP, 0, hppa_fixP->fx_r_field); + } - /* Handle all opcodes with the 'k' operand type. */ - case 21: - CHECK_FIELD (new_val, 2097152, 0, 0); + switch (fmt) + { + case 10: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Mask off 21 bits to be changed. */ - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xffe00000, - buf); - dis_assemble_21 (new_val, &resulti); - result = resulti; - break; + insn = (insn & ~ 0x3ff1) | (((val & 0x1ff8) << 1) + | ((val & 0x2000) >> 13)); + break; + case -11: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Handle all the opcodes with the 'i' operand type. */ - case 11: - CHECK_FIELD (new_val, 1023, -1023, 0); + insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1) + | ((val & 0x2000) >> 13)); + break; + /* Handle all opcodes with the 'j' operand type. */ + case 14: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Mask off 11 bits to be changed. */ - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xffff800, - buf); - low_sign_unext (new_val, 11, &resulti); - result = resulti; - break; + insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); + break; - /* Handle all the opcodes with the 'w' operand type. */ - case 12: - CHECK_FIELD (new_val, 8199, -8184, 0); + /* Handle all opcodes with the 'k' operand type. */ + case 21: + CHECK_FIELD_WHERE (new_val, 1048575, -1048576, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Mask off 11 bits to be changed. */ - sign_unext ((new_val - 8) >> 2, 12, &resulti); - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xffffe002, - buf); + insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); + break; - dis_assemble_12 (resulti, &w1, &w); - result = ((w1 << 2) | w); - break; + /* Handle all the opcodes with the 'i' operand type. */ + case 11: + CHECK_FIELD_WHERE (new_val, 1023, -1024, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Handle some of the opcodes with the 'W' operand type. */ - case 17: - { - int distance = *valp; - - CHECK_FIELD (new_val, 262143, -262144, 0); - - /* If this is an absolute branch (ie no link) with an out of - range target, then we want to complain. */ - if (fixP->fx_r_type == R_HPPA_PCREL_CALL - && (distance > 262143 || distance < -262144) - && (bfd_get_32 (stdoutput, buf) & 0xffe00000) == 0xe8000000) - CHECK_FIELD (distance, 262143, -262144, 0); - - /* Mask off 17 bits to be changed. */ - bfd_put_32 (stdoutput, - bfd_get_32 (stdoutput, buf) & 0xffe0e002, - buf); - sign_unext ((new_val - 8) >> 2, 17, &resulti); - dis_assemble_17 (resulti, &w1, &w2, &w); - result = ((w2 << 2) | (w1 << 16) | w); - break; - } + insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); + break; - case 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; - } + /* 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; - case 32: - result = 0; - bfd_put_32 (stdoutput, new_val, buf); - break; + insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); + break; - default: - as_bad (_("Unknown relocation encountered in md_apply_fix.")); - return 0; - } + /* Handle some of the opcodes with the 'W' operand type. */ + case 17: + { + offsetT distance = * valP; - /* 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; + /* If this is an absolute branch (ie no link) with an out of + range target, then we want to complain. */ + if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL + && (insn & 0xffe00000) == 0xe8000000) + CHECK_FIELD_WHERE (distance - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + + CHECK_FIELD_WHERE (new_val - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; + + insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); + break; + } + + case 22: + { + offsetT distance = * valP; + + /* If this is an absolute branch (ie no link) with an out of + range target, then we want to complain. */ + if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL + && (insn & 0xffe00000) == 0xe8000000) + CHECK_FIELD_WHERE (distance - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + + CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; + + insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); + break; + } + + case -10: + val = new_val; + insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); + break; + + case -16: + val = new_val; + insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); + break; + + case 16: + val = new_val; + insn = (insn & ~ 0xffff) | re_assemble_16 (val); + break; + + case 32: + insn = new_val; + break; + + default: + as_bad_where (fixP->fx_file, fixP->fx_line, + _("Unknown relocation encountered in md_apply_fix.")); + return; } + + /* Insert the relocation. */ + bfd_put_32 (stdoutput, insn, buf); } /* Exactly what point is a PC-relative offset relative TO? @@ -4339,19 +4673,21 @@ is_end_of_statement () the most common will be a hex or decimal constant, but it could be a pre-defined register (Yuk!), or an absolute symbol. - Return a number or -1 for failure. + Return 1 on success or 0 on failure. If STRICT, then a missing + register prefix will cause a failure. The number itself is + returned in `pa_number'. - When parsing PA-89 FP register numbers RESULT will be - the address of a structure to return information about - L/R half of FP registers, store results there as appropriate. + IS_FLOAT indicates that a PA-89 FP register number should be + parsed; A `l' or `r' suffix is checked for if but 2 of IS_FLOAT is + not set. pa_parse_number can not handle negative constants and will fail horribly if it is passed such a constant. */ static int -pa_parse_number (s, result) +pa_parse_number (s, is_float) char **s; - struct pa_11_fp_reg_struct *result; + int is_float; { int num; char *name; @@ -4359,32 +4695,27 @@ pa_parse_number (s, result) symbolS *sym; int status; char *p = *s; + bfd_boolean have_prefix; /* Skip whitespace before the number. */ while (*p == ' ' || *p == '\t') p = p + 1; - /* Store info in RESULT if requested by caller. */ - if (result) - { - result->number_part = -1; - result->l_r_select = -1; - } - num = -1; - - if (isdigit (*p)) + pa_number = -1; + have_prefix = 0; + num = 0; + if (!strict && ISDIGIT (*p)) { /* Looks like a number. */ - num = 0; if (*p == '0' && (*(p + 1) == 'x' || *(p + 1) == 'X')) { /* The number is specified in hex. */ p += 2; - while (isdigit (*p) || ((*p >= 'a') && (*p <= 'f')) + while (ISDIGIT (*p) || ((*p >= 'a') && (*p <= 'f')) || ((*p >= 'A') && (*p <= 'F'))) { - if (isdigit (*p)) + if (ISDIGIT (*p)) num = num * 16 + *p - '0'; else if (*p >= 'a' && *p <= 'f') num = num * 16 + *p - 'a' + 10; @@ -4396,42 +4727,43 @@ pa_parse_number (s, result) else { /* The number is specified in decimal. */ - while (isdigit (*p)) + while (ISDIGIT (*p)) { num = num * 10 + *p - '0'; ++p; } } - /* Store info in RESULT if requested by the caller. */ - if (result) - { - result->number_part = num; + pa_number = num; - if (IS_R_SELECT (p)) - { - result->l_r_select = 1; - ++p; - } - else if (IS_L_SELECT (p)) + /* Check for a `l' or `r' suffix. */ + if (is_float) + { + pa_number += FP_REG_BASE; + if (! (is_float & 2)) { - result->l_r_select = 0; - ++p; + if (IS_R_SELECT (p)) + { + pa_number += FP_REG_RSEL; + ++p; + } + else if (IS_L_SELECT (p)) + { + ++p; + } } - else - result->l_r_select = 0; } } else if (*p == '%') { /* The number might be a predefined register. */ - num = 0; + have_prefix = 1; name = p; p++; c = *p; /* Tege hack: Special case for general registers as the general code makes a binary search with case translation, and is VERY - slow. */ + slow. */ if (c == 'r') { p++; @@ -4447,7 +4779,7 @@ pa_parse_number (s, result) num = 2; p++; } - else if (!isdigit (*p)) + else if (!ISDIGIT (*p)) { if (print_errors) as_bad (_("Undefined register: '%s'."), name); @@ -4457,7 +4789,7 @@ pa_parse_number (s, result) { do num = num * 10 + *p++ - '0'; - while (isdigit (*p)); + while (ISDIGIT (*p)); } } else @@ -4481,23 +4813,12 @@ pa_parse_number (s, result) *p = c; } - /* Store info in RESULT if requested by caller. */ - if (result) - { - result->number_part = num; - if (IS_R_SELECT (p - 1)) - result->l_r_select = 1; - else if (IS_L_SELECT (p - 1)) - result->l_r_select = 0; - else - result->l_r_select = 0; - } + pa_number = num; } else { /* And finally, it could be a symbol in the absolute section which - is effectively a constant. */ - num = 0; + is effectively a constant, or a register alias symbol. */ name = p; c = *p; while (is_part_of_name (c)) @@ -4508,21 +4829,28 @@ pa_parse_number (s, result) *p = 0; if ((sym = symbol_find (name)) != NULL) { - if (S_GET_SEGMENT (sym) == &bfd_abs_section) + if (S_GET_SEGMENT (sym) == reg_section) + { + num = S_GET_VALUE (sym); + /* Well, we don't really have one, but we do have a + register, so... */ + have_prefix = TRUE; + } + else if (S_GET_SEGMENT (sym) == &bfd_abs_section) num = S_GET_VALUE (sym); - else + else if (!strict) { if (print_errors) as_bad (_("Non-absolute symbol: '%s'."), name); num = -1; } } - else + else if (!strict) { /* There is where we'd come for an undefined symbol or for an empty string. For an empty string we will return zero. That's a concession made for - compatability with the braindamaged HP assemblers. */ + compatibility with the braindamaged HP assemblers. */ if (*name == 0) num = 0; else @@ -4534,24 +4862,18 @@ pa_parse_number (s, result) } *p = c; - /* Store info in RESULT if requested by caller. */ - if (result) - { - result->number_part = num; - if (IS_R_SELECT (p - 1)) - result->l_r_select = 1; - else if (IS_L_SELECT (p - 1)) - result->l_r_select = 0; - else - result->l_r_select = 0; - } + pa_number = num; } - *s = p; - return num; + if (!strict || have_prefix) + { + *s = p; + return 1; + } + return 0; } -#define REG_NAME_CNT (sizeof(pre_defined_registers) / sizeof(struct pd_reg)) +#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg)) /* Given NAME, find the register number associated with that name, return the integer value associated with the given name or -1 on failure. */ @@ -4582,16 +4904,14 @@ reg_name_search (name) return -1; } - /* Return nonzero if the given INSN and L/R information will require a new PA-1.1 opcode. */ static int -need_pa11_opcode (insn, result) - struct pa_it *insn; - struct pa_11_fp_reg_struct *result; +need_pa11_opcode () { - if (result->l_r_select == 1 && !(insn->fpof1 == DBL && insn->fpof2 == DBL)) + if ((pa_number & FP_REG_RSEL) != 0 + && !(the_insn.fpof1 == DBL && the_insn.fpof2 == DBL)) { /* If this instruction is specific to a particular architecture, then set a new architecture. */ @@ -4821,16 +5141,16 @@ pa_chk_field_selector (str) *str = *str + 1; if ((*str)[1] == '\'' || (*str)[1] == '%') - name[0] = tolower ((*str)[0]), + name[0] = TOLOWER ((*str)[0]), name[1] = 0; else if ((*str)[2] == '\'' || (*str)[2] == '%') - name[0] = tolower ((*str)[0]), - name[1] = tolower ((*str)[1]), + name[0] = TOLOWER ((*str)[0]), + name[1] = TOLOWER ((*str)[1]), name[2] = 0; else if ((*str)[3] == '\'' || (*str)[3] == '%') - name[0] = tolower ((*str)[0]), - name[1] = tolower ((*str)[1]), - name[2] = tolower ((*str)[2]), + name[0] = TOLOWER ((*str)[0]), + name[1] = TOLOWER ((*str)[1]), + name[2] = TOLOWER ((*str)[2]), name[3] = 0; else return e_fsel; @@ -4887,7 +5207,7 @@ get_expression (str) return 0; } -/* Mark (via expr_end) the end of an absolute expression. FIXME. */ +/* Mark (via expr_end) the end of an absolute expression. FIXME. */ static int pa_get_absolute_expression (insn, strp) struct pa_it *insn; @@ -4901,11 +5221,11 @@ pa_get_absolute_expression (insn, strp) expression (&insn->exp); /* This is not perfect, but is a huge improvement over doing nothing. - The PA assembly syntax is ambigious in a variety of ways. Consider + 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 5? + r5, or is that 4 MOD r5? - If we get a modulo expresion When looking for an absolute, we try + 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) { @@ -4915,7 +5235,7 @@ pa_get_absolute_expression (insn, strp) input_line_pointer = *strp; s = *strp; while (*s != ',' && *s != ' ' && *s != '\t') - s++; + s++; c = *s; *s = 0; @@ -4952,70 +5272,14 @@ static int evaluate_absolute (insn) struct pa_it *insn; { - int value; + offsetT value; expressionS exp; int field_selector = insn->field_selector; exp = insn->exp; value = exp.X_add_number; - switch (field_selector) - { - /* No change. */ - case e_fsel: - break; - - /* If bit 21 is on then add 0x800 and arithmetic shift right 11 bits. */ - case e_lssel: - if (value & 0x00000400) - value += 0x800; - value = (value & 0xfffff800) >> 11; - break; - - /* Sign extend from bit 21. */ - case e_rssel: - if (value & 0x00000400) - value |= 0xfffff800; - else - value &= 0x7ff; - break; - - /* Arithmetic shift right 11 bits. */ - case e_lsel: - value = (value & 0xfffff800) >> 11; - break; - - /* Set bits 0-20 to zero. */ - case e_rsel: - value = value & 0x7ff; - break; - - /* Add 0x800 and arithmetic shift right 11 bits. */ - case e_ldsel: - value += 0x800; - value = (value & 0xfffff800) >> 11; - break; - - /* Set bitgs 0-21 to one. */ - case e_rdsel: - value |= 0xfffff800; - break; - -#define RSEL_ROUND(c) (((c) + 0x1000) & ~0x1fff) - case e_rrsel: - value = (RSEL_ROUND (value) & 0x7ff) + (value - RSEL_ROUND (value)); - break; - - case e_lrsel: - value = (RSEL_ROUND (value) >> 11) & 0x1fffff; - break; -#undef RSEL_ROUND - - default: - BAD_CASE (field_selector); - break; - } - return value; + return hppa_field_adjust (0, value, field_selector); } /* Given an argument location specification return the associated @@ -5089,26 +5353,326 @@ pa_parse_nullif (s) nullif = 1; else { - as_bad (_("Invalid Nullification: (%c)"), **s); - nullif = 0; + as_bad (_("Invalid Nullification: (%c)"), **s); + nullif = 0; + } + *s = *s + 1; + } + + return nullif; +} + +/* Parse a non-negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ + +static int +pa_parse_nonneg_cmpsub_cmpltr (s) + char **s; +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "<<") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "<<=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "sv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "od") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a negated compare/subtract completer returning the + number (for encoding in instructions) of the given completer. */ + +static int +pa_parse_neg_cmpsub_cmpltr (s) + char **s; +{ + int cmpltr; + char *name = *s + 1; + char c; + char *save_s = *s; + int nullify = 0; + + cmpltr = 0; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcasecmp (name, "tr") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "<>") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, ">=") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, ">") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, ">>=") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, ">>") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "nsv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "ev") == 0) + { + cmpltr = 7; + } + /* If we have something like addb,n then there is no condition + completer. */ + else if (strcasecmp (name, "n") == 0) + { + cmpltr = 0; + nullify = 1; + } + else + { + cmpltr = -1; + } + **s = c; + } + + /* Reset pointers if this was really a ,n for a branch instruction. */ + if (nullify) + *s = save_s; + + return cmpltr; +} + +/* Parse a 64 bit compare and branch completer returning the number (for + encoding in instructions) of the given completer. + + Nonnegated comparisons are returned as 0-7, negated comparisons are + returned as 8-15. */ + +static int +pa_parse_cmpb_64_cmpltr (s) + char **s; +{ + int cmpltr; + char *name = *s + 1; + char c; + + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "*") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "*=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "*<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "*<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "*<<") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "*<<=") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*sv") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*od") == 0) + { + cmpltr = 7; + } + else if (strcasecmp (name, "*tr") == 0) + { + cmpltr = 8; + } + else if (strcmp (name, "*<>") == 0) + { + cmpltr = 9; + } + else if (strcmp (name, "*>=") == 0) + { + cmpltr = 10; + } + else if (strcmp (name, "*>") == 0) + { + cmpltr = 11; + } + else if (strcmp (name, "*>>=") == 0) + { + cmpltr = 12; + } + else if (strcmp (name, "*>>") == 0) + { + cmpltr = 13; + } + else if (strcasecmp (name, "*nsv") == 0) + { + cmpltr = 14; + } + else if (strcasecmp (name, "*ev") == 0) + { + cmpltr = 15; + } + else + { + cmpltr = -1; + } + **s = c; + } + + return cmpltr; +} + +/* Parse a 64 bit compare immediate and branch completer returning the number + (for encoding in instructions) of the given completer. */ + +static int +pa_parse_cmpib_64_cmpltr (s) + char **s; +{ + int cmpltr; + char *name = *s + 1; + char c; + + cmpltr = -1; + if (**s == ',') + { + *s += 1; + while (**s != ',' && **s != ' ' && **s != '\t') + *s += 1; + c = **s; + **s = 0x00; + + if (strcmp (name, "*<<") == 0) + { + cmpltr = 0; + } + else if (strcmp (name, "*=") == 0) + { + cmpltr = 1; + } + else if (strcmp (name, "*<") == 0) + { + cmpltr = 2; + } + else if (strcmp (name, "*<=") == 0) + { + cmpltr = 3; + } + else if (strcmp (name, "*>>=") == 0) + { + cmpltr = 4; + } + else if (strcmp (name, "*<>") == 0) + { + cmpltr = 5; + } + else if (strcasecmp (name, "*>=") == 0) + { + cmpltr = 6; + } + else if (strcasecmp (name, "*>") == 0) + { + cmpltr = 7; + } + else + { + cmpltr = -1; } - *s = *s + 1; + **s = c; } - return nullif; + return cmpltr; } -/* Parse a non-negated compare/subtract completer returning the - number (for encoding in instrutions) of the given completer. - - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ +/* Parse a non-negated addition completer returning the number + (for encoding in instructions) of the given completer. */ static int -pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) +pa_parse_nonneg_add_cmpltr (s) char **s; - int isbranch; { int cmpltr; char *name = *s + 1; @@ -5124,8 +5688,6 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) *s += 1; c = **s; **s = 0x00; - - if (strcmp (name, "=") == 0) { cmpltr = 1; @@ -5138,11 +5700,11 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) { cmpltr = 3; } - else if (strcmp (name, "<<") == 0) + else if (strcasecmp (name, "nuv") == 0) { cmpltr = 4; } - else if (strcmp (name, "<<=") == 0) + else if (strcasecmp (name, "znv") == 0) { cmpltr = 5; } @@ -5156,7 +5718,7 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) } /* If we have something like addb,n then there is no condition completer. */ - else if (strcasecmp (name, "n") == 0 && isbranch) + else if (strcasecmp (name, "n") == 0) { cmpltr = 0; nullify = 1; @@ -5172,21 +5734,15 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) if (nullify) *s = save_s; - return cmpltr; } -/* Parse a negated compare/subtract completer returning the - number (for encoding in instrutions) of the given completer. - - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ +/* Parse a negated addition completer returning the number + (for encoding in instructions) of the given completer. */ static int -pa_parse_neg_cmpsub_cmpltr (s, isbranch) +pa_parse_neg_add_cmpltr (s) char **s; - int isbranch; { int cmpltr; char *name = *s + 1; @@ -5202,8 +5758,6 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch) *s += 1; c = **s; **s = 0x00; - - if (strcasecmp (name, "tr") == 0) { cmpltr = 0; @@ -5220,11 +5774,11 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch) { cmpltr = 3; } - else if (strcmp (name, ">>=") == 0) + else if (strcasecmp (name, "uv") == 0) { cmpltr = 4; } - else if (strcmp (name, ">>") == 0) + else if (strcasecmp (name, "vnz") == 0) { cmpltr = 5; } @@ -5238,7 +5792,7 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch) } /* If we have something like addb,n then there is no condition completer. */ - else if (strcasecmp (name, "n") == 0 && isbranch) + else if (strcasecmp (name, "n") == 0) { cmpltr = 0; nullify = 1; @@ -5254,27 +5808,21 @@ pa_parse_neg_cmpsub_cmpltr (s, isbranch) if (nullify) *s = save_s; - return cmpltr; } - -/* Parse a non-negated addition completer returning the number - (for encoding in instrutions) of the given completer. - - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction. */ +/* Parse a 64 bit wide mode add and branch completer returning the number (for + encoding in instructions) of the given completer. */ static int -pa_parse_nonneg_add_cmpltr (s, isbranch) +pa_parse_addb_64_cmpltr (s) char **s; - int isbranch; { int cmpltr; char *name = *s + 1; char c; char *save_s = *s; + int nullify = 0; cmpltr = 0; if (**s == ',') @@ -5300,100 +5848,56 @@ pa_parse_nonneg_add_cmpltr (s, isbranch) { cmpltr = 4; } - else if (strcasecmp (name, "znv") == 0) + else if (strcasecmp (name, "*=") == 0) { cmpltr = 5; } - else if (strcasecmp (name, "sv") == 0) + else if (strcasecmp (name, "*<") == 0) { cmpltr = 6; } - else if (strcasecmp (name, "od") == 0) + else if (strcasecmp (name, "*<=") == 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; - } - else - { - cmpltr = -1; - } - **s = c; - } - - /* Reset pointers if this was really a ,n for a branch instruction. */ - if (cmpltr == 0 && *name == 'n' && isbranch) - *s = save_s; - - return cmpltr; -} - -/* Parse a negated addition completer returning the number - (for encoding in instrutions) of the given completer. - - ISBRANCH specifies whether or not this is parsing a condition - completer for a branch (vs a nullification completer for a - computational instruction). */ - -static int -pa_parse_neg_add_cmpltr (s, isbranch) - char **s; - int isbranch; -{ - int cmpltr; - char *name = *s + 1; - char c; - char *save_s = *s; - - cmpltr = 0; - if (**s == ',') - { - *s += 1; - while (**s != ',' && **s != ' ' && **s != '\t') - *s += 1; - c = **s; - **s = 0x00; - if (strcasecmp (name, "tr") == 0) + else if (strcmp (name, "tr") == 0) { - cmpltr = 0; + cmpltr = 8; } else if (strcmp (name, "<>") == 0) { - cmpltr = 1; + cmpltr = 9; } else if (strcmp (name, ">=") == 0) { - cmpltr = 2; + cmpltr = 10; } else if (strcmp (name, ">") == 0) { - cmpltr = 3; + cmpltr = 11; } else if (strcasecmp (name, "uv") == 0) { - cmpltr = 4; + cmpltr = 12; } - else if (strcasecmp (name, "vnz") == 0) + else if (strcasecmp (name, "*<>") == 0) { - cmpltr = 5; + cmpltr = 13; } - else if (strcasecmp (name, "nsv") == 0) + else if (strcasecmp (name, "*>=") == 0) { - cmpltr = 6; + cmpltr = 14; } - else if (strcasecmp (name, "ev") == 0) + else if (strcasecmp (name, "*>") == 0) { - cmpltr = 7; + cmpltr = 15; } /* If we have something like addb,n then there is no condition completer. */ - else if (strcasecmp (name, "n") == 0 && isbranch) + else if (strcasecmp (name, "n") == 0) { cmpltr = 0; + nullify = 1; } else { @@ -5403,7 +5907,7 @@ pa_parse_neg_add_cmpltr (s, isbranch) } /* Reset pointers if this was really a ,n for a branch instruction. */ - if (cmpltr == 0 && *name == 'n' && isbranch) + if (nullify) *s = save_s; return cmpltr; @@ -5414,6 +5918,7 @@ pa_parse_neg_add_cmpltr (s, isbranch) alignment of the subspace if necessary. */ static void pa_align (bytes) + int bytes; { /* We must have a valid space and subspace. */ pa_check_current_space_and_subspace (); @@ -5432,7 +5937,7 @@ pa_align (bytes) static void pa_block (z) - int z; + int z ATTRIBUTE_UNUSED; { char *p; long int temp_fill; @@ -5470,18 +5975,18 @@ pa_block (z) static void pa_brtab (begin) - int begin; + 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 (); @@ -5491,7 +5996,7 @@ pa_brtab (begin) static void pa_try (begin) - int begin; + int begin ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM expressionS exp; @@ -5500,13 +6005,13 @@ 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 (); @@ -5518,7 +6023,7 @@ pa_try (begin) static void pa_call (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5607,52 +6112,45 @@ static void pa_build_unwind_subspace (call_info) 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. @@ -5661,21 +6159,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 it. */ - unwind = (char *) &call_info->ci_unwind; - for (i = 8; i < sizeof (struct unwind_table); i++) - { - c = *(unwind + i); - { - FRAG_APPEND_1_CHAR (c); - } - } + /* Dump the descriptor. */ + unwind = UNWIND_LOW32 (&call_info->ci_unwind.descriptor); + md_number_to_chars (p + 8, unwind, 4); + + unwind = UNWIND_HIGH32 (&call_info->ci_unwind.descriptor); + md_number_to_chars (p + 12, unwind, 4); /* Return back to the original segment/subsegment. */ subseg_set (save_seg, save_subseg); @@ -5688,7 +6183,7 @@ pa_build_unwind_subspace (call_info) static void pa_callinfo (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *p; int temp; @@ -5827,21 +6322,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 (unused) + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM current_space = is_defined_space ("$TEXT$"); current_subspace = pa_subsegment_to_subspace (current_space->sd_seg, 0); #endif + s_text (0); pa_undefine_label (); } +/* Switch to the data space. As usual delete our label. */ +static void +pa_data (unused) + int unused ATTRIBUTE_UNUSED; +{ +#ifdef OBJ_SOM + current_space = is_defined_space ("$PRIVATE$"); + current_subspace + = pa_subsegment_to_subspace (current_space->sd_seg, 0); +#endif + s_data (0); + pa_undefine_label (); +} + /* This is different than the standard GAS s_comm(). On HP9000/800 machines, the .comm pseudo-op has the following symtax: @@ -5864,7 +6375,7 @@ pa_code (unused) static void pa_comm (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { unsigned int size; symbolS *symbol; @@ -5880,6 +6391,7 @@ 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_EXTERNAL (symbol); @@ -5891,12 +6403,13 @@ 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; + int unused ATTRIBUTE_UNUSED; { demand_empty_rest_of_line (); } @@ -5904,7 +6417,7 @@ pa_end (unused) /* Process a .ENTER pseudo-op. This is not supported. */ static void pa_enter (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5916,10 +6429,10 @@ pa_enter (unused) } /* Process a .ENTRY pseudo-op. .ENTRY marks the beginning of the - procesure. */ + procedure. */ static void pa_entry (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -5948,16 +6461,39 @@ 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 (resultP, op, rightP) + expressionS *resultP; + operatorT op ATTRIBUTE_UNUSED; + expressionS *rightP; +{ + if (fudge_reg_expressions + && rightP->X_op == O_register + && resultP->X_op == O_register) + { + rightP->X_op = O_constant; + resultP->X_op = O_constant; + } + return 0; /* Continue normal expr handling. */ +} + /* Handle a .EQU pseudo-op. */ static void @@ -5971,10 +6507,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 { @@ -6018,7 +6576,7 @@ process_exit () fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, NULL, (offsetT) 0, NULL, 0, R_HPPA_EXIT, e_fsel, 0, 0, - (int *) &last_call_info->ci_unwind.descriptor + 1); + UNWIND_HIGH32 (&last_call_info->ci_unwind.descriptor)); #endif } @@ -6026,7 +6584,7 @@ process_exit () static void pa_exit (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6059,7 +6617,7 @@ pa_exit (unused) static void pa_export (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *p; symbolS *symbol; @@ -6076,8 +6634,13 @@ pa_export (unused) } else { - /* OK. Set the external bits and process argument relocations. */ + /* OK. Set the external bits and process argument relocations. + For the HP, weak and global are not mutually exclusive. + S_SET_EXTERNAL will not set BSF_GLOBAL if WEAK is set. + Call S_SET_EXTERNAL to get the other processing. Manually + set BSF_GLOBAL when we get back. */ S_SET_EXTERNAL (symbol); + symbol_get_bfdsym (symbol)->flags |= BSF_GLOBAL; p = input_line_pointer; *p = c; if (!is_end_of_statement ()) @@ -6100,13 +6663,13 @@ pa_type_args (symbolP, 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; } @@ -6125,50 +6688,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; } @@ -6176,7 +6747,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, @@ -6197,8 +6768,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; } @@ -6211,12 +6782,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; @@ -6224,7 +6795,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; @@ -6246,7 +6817,7 @@ pa_type_args (symbolP, is_export) static void pa_import (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *p; symbolS *symbol; @@ -6271,9 +6842,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; @@ -6298,7 +6869,7 @@ pa_import (unused) static void pa_label (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *p; @@ -6328,7 +6899,7 @@ pa_label (unused) static void pa_leave (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6343,7 +6914,7 @@ pa_leave (unused) static void pa_level (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *level; @@ -6384,7 +6955,7 @@ pa_level (unused) static void pa_origin (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -6400,7 +6971,7 @@ pa_origin (unused) static void pa_param (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *p; symbolS *symbol; @@ -6431,11 +7002,11 @@ 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; + int unused ATTRIBUTE_UNUSED; { struct call_info *call_info; @@ -6500,12 +7071,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; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM @@ -6536,12 +7107,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 } @@ -6572,6 +7145,7 @@ 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. */ @@ -6590,8 +7164,6 @@ log2 (value) return shift; } - -#ifdef OBJ_SOM /* Check to make sure we have a valid space and subspace. */ static void @@ -6615,7 +7187,7 @@ pa_parse_space_stmt (space_name, create_flag) { char *name, *ptemp, c; char loadable, defined, private, sort; - int spnum, temp; + int spnum; asection *seg = NULL; sd_chain_struct *space; @@ -6649,10 +7221,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 @@ -6707,7 +7280,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); @@ -6731,10 +7304,9 @@ pa_parse_space_stmt (space_name, create_flag) static void pa_space (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name, c, *space_name, *save_s; - int temp; sd_chain_struct *sd_chain; if (within_procedure) @@ -6812,9 +7384,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; @@ -6850,7 +7424,7 @@ pa_space (unused) static void pa_spnum (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { char *name; char c; @@ -6883,7 +7457,7 @@ pa_subspace (create_new) 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; @@ -6909,6 +7483,7 @@ pa_subspace (create_new) sort = 0; access = 0x7f; loadable = 1; + comdat = 0; common = 0; dup_common = 0; code_only = 0; @@ -6943,6 +7518,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; @@ -7006,6 +7582,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; @@ -7038,8 +7619,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,16 +7671,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; @@ -7099,7 +7689,6 @@ pa_subspace (create_new) SUBSPACE_DEFINED (current_subspace) = 1; } - /* Create default space and subspace dictionaries. */ static void @@ -7142,7 +7731,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. */ @@ -7165,7 +7753,6 @@ pa_spaces_begin () | SEC_RELOC | SEC_HAS_CONTENTS)); - } else if (!strcmp (pa_def_subspaces[i].name, "$BSS$")) { @@ -7214,6 +7801,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, @@ -7227,8 +7815,6 @@ pa_spaces_begin () } } - - /* Create a new space NAME, with the appropriate flags as defined by the given parameters. */ @@ -7317,12 +7903,12 @@ 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, +create_new_subspace (space, name, loadable, code_only, comdat, 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 loadable, code_only, comdat, common, dup_common, is_zero; int sort; int access; int space_index; @@ -7379,8 +7965,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; @@ -7390,12 +7976,13 @@ 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) +update_subspace (space, name, loadable, code_only, comdat, common, dup_common, + sort, zero, access, space_index, alignment, quadrant, section) sd_chain_struct *space; char *name; int loadable; int code_only; + int comdat; int common; int dup_common; int zero; @@ -7411,8 +7998,8 @@ update_subspace (space, name, loadable, code_only, common, dup_common, sort, 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; @@ -7593,11 +8180,6 @@ pa_stringer_aux (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 '\"': @@ -7620,9 +8202,14 @@ pa_stringer (append_zero) 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; @@ -7641,15 +8228,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; @@ -7690,7 +8277,7 @@ pa_stringer (append_zero) static void pa_version (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { obj_version (0); pa_undefine_label (); @@ -7702,7 +8289,7 @@ pa_version (unused) static void pa_compiler (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { obj_som_compiler (0); pa_undefine_label (); @@ -7714,7 +8301,7 @@ pa_compiler (unused) static void pa_copyright (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { obj_copyright (0); pa_undefine_label (); @@ -7731,21 +8318,6 @@ pa_cons (nbytes) pa_undefine_label (); } -/* Switch to the data space. As usual delete our label. */ - -static void -pa_data (unused) - int unused; -{ -#ifdef OBJ_SOM - current_space = is_defined_space ("$PRIVATE$"); - current_subspace - = pa_subsegment_to_subspace (current_space->sd_seg, 0); -#endif - s_data (0); - pa_undefine_label (); -} - /* Like float_cons, but we need to undefine our label. */ static void @@ -7760,7 +8332,7 @@ pa_float_cons (float_type) static void pa_fill (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -7790,7 +8362,7 @@ pa_lcomm (needs_align) static void pa_lsym (unused) - int unused; + int unused ATTRIBUTE_UNUSED; { #ifdef OBJ_SOM /* We must have a valid space and subspace. */ @@ -7801,22 +8373,6 @@ pa_lsym (unused) pa_undefine_label (); } -/* Switch to the text space. Like s_text, but delete our - label when finished. */ -static void -pa_text (unused) - int unused; -{ -#ifdef OBJ_SOM - current_space = is_defined_space ("$TEXT$"); - current_subspace - = pa_subsegment_to_subspace (current_space->sd_seg, 0); -#endif - - s_text (0); - pa_undefine_label (); -} - /* On the PA relocations which involve function symbols must not be adjusted. This so that the linker can know when/how to create argument relocation stubs for indirect calls and calls to static functions. @@ -7836,7 +8392,7 @@ pa_text (unused) selectors). Reject reductions involving symbols with external scope; such - reductions make life a living hell for object file editors. + reductions make life a living hell for object file editors. FIXME. Also reject R_HPPA relocations which are 32bits wide in the code space. The SOM BFD backend doesn't know how to pull the @@ -7846,6 +8402,7 @@ int hppa_fix_adjustable (fixp) fixS *fixp; { + reloc_type code; struct hppa_fix_struct *hppa_fix; hppa_fix = (struct hppa_fix_struct *) fixp->tc_fix_data; @@ -7854,9 +8411,50 @@ hppa_fix_adjustable (fixp) /* Reject reductions of symbols in 32bit relocs. */ if (fixp->fx_r_type == R_HPPA && hppa_fix->fx_r_format == 32) return 0; +#endif + +#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 @@ -7864,19 +8462,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. */ @@ -7888,18 +8509,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, @@ -7908,46 +8526,73 @@ hppa_fix_adjustable (fixp) int hppa_force_relocation (fixp) - fixS *fixp; + 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 +#ifdef OBJ_ELF + if (fixp->fx_r_type == (int) R_PARISC_GNU_VTINHERIT + || fixp->fx_r_type == (int) R_PARISC_GNU_VTENTRY) + return 1; +#endif -#define arg_reloc_stub_needed(CALLER, CALLEE) \ - ((CALLEE) && (CALLER) && ((CALLEE) != (CALLER))) + assert (fixp->fx_addsy != NULL); + + /* Ensure we emit a relocation for global symbols so that dynamic + linking works. */ + if (S_FORCE_RELOC (fixp->fx_addsy, 1)) + return 1; -#ifdef OBJ_SOM /* It is necessary to force PC-relative calls/jumps to have a relocation - entry if they're going to need either a argument relocation or long - 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))) + 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; + + /* Now check to see if we're going to need a long-branch stub. */ + if (fixp->fx_r_type == (int) R_HPPA_PCREL_CALL) + { + long pc = md_pcrel_from (fixp); + valueT distance, min_stub_distance; + + distance = fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy) - pc - 8; + + /* 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 - 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) + 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; + } + + if (fixp->fx_r_type == (int) R_HPPA_ABS_CALL) return 1; -#undef arg_reloc_stub_needed /* No need (yet) to force another relocations to be emitted. */ return 0; @@ -7956,17 +8601,25 @@ hppa_force_relocation (fixp) /* 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. */ + the size of the function in elf_hppa_final_processing. */ 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); + char *name; + + if (last_call_info == NULL || last_call_info->start_symbol == NULL) + { + /* We have already warned about a missing label, + or other problems. */ + return; + } + name = (char *) xmalloc (strlen ("L$\001end_") + + strlen (S_GET_NAME (last_call_info->start_symbol)) + + 1); if (name) { symbolS *symbolP; @@ -8031,12 +8684,48 @@ elf_hppa_final_processing () - S_GET_VALUE (call_info_pointer->start_symbol) + 4; } } -#endif -#ifdef OBJ_ELF -pa_end_of_source () +static void +pa_vtable_entry (ignore) + int ignore ATTRIBUTE_UNUSED; +{ + struct fix *new_fix; + + new_fix = obj_elf_vtable_entry (0); + + if (new_fix) + { + struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) + obstack_alloc (¬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 (ignore) + int ignore ATTRIBUTE_UNUSED; { - if (debug_type == DEBUG_DWARF2) - dwarf2_finish (); + struct fix *new_fix; + + new_fix = obj_elf_vtable_inherit (0); + + if (new_fix) + { + struct hppa_fix_struct *hppa_fix = (struct hppa_fix_struct *) + obstack_alloc (¬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