X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-hppa.c;h=39da02ed17ee96cf96abd1f52debe100d214196a;hb=26c9b704106607f6fe37eab8036bb2c04f32375a;hp=75f5b5789449a6247beb1063d8e90cebf5884896;hpb=27df9f40e4e03e65859c6450b8c81a58efaabeea;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c index 75f5b57894..39da02ed17 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, 99, 2000 - 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. @@ -23,9 +23,9 @@ at the University of Utah. */ #include -#include #include "as.h" +#include "safe-ctype.h" #include "subsegs.h" #include "bfd/libhppa.h" @@ -42,7 +42,6 @@ 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; /* A "convient" place to put object file dependencies which do not need to be seen outside of tc-hppa.c. */ @@ -58,8 +57,10 @@ typedef elf_symbol_type obj_symbol_type; #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 @@ -106,6 +107,12 @@ typedef som_symbol_type obj_symbol_type; #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. */ /* Unwind table and descriptor. FIXME: Sync this with GDB version. */ @@ -134,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 @@ -478,10 +510,10 @@ 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 **)); @@ -547,7 +579,7 @@ static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *, offsetT, expressionS *, int, bfd_reloc_code_real_type, enum hppa_reloc_field_selector_type_alt, - int, unsigned int, 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 **)); @@ -590,6 +622,11 @@ static struct call_desc last_call_desc; /* handle of the OPCODE hash table */ static struct hash_control *op_hash = NULL; +/* 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 dependent tables? */ @@ -635,9 +672,6 @@ const pseudo_typeS md_pseudo_table[] = {"equ", pa_equ, 0}, {"exit", pa_exit, 0}, {"export", pa_export, 0}, -#ifdef OBJ_ELF - {"file", dwarf2_directive_file, 0 }, -#endif {"fill", pa_fill, 0}, {"float", pa_float_cons, 'f'}, {"half", pa_cons, 2}, @@ -647,9 +681,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, 0 }, -#endif {"long", pa_cons, 4}, {"lsym", pa_lsym, 0}, #ifdef OBJ_SOM @@ -924,6 +955,11 @@ static const struct pd_reg pre_defined_registers[] = {"%isr", 20}, {"%itmr", 16}, {"%iva", 14}, +#if TARGET_ARCH_SIZE == 64 + {"%mrp", 2}, +#else + {"%mrp", 31}, +#endif {"%pcoq", 18}, {"%pcsq", 17}, {"%pidr1", 8}, @@ -1123,6 +1159,20 @@ 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 againt ALIGN (a power of two). IGNORE is used to suppress the error message. */ @@ -1238,10 +1288,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 ) { @@ -1279,7 +1329,7 @@ fix_new_hppa (frag, where, size, add_symbol, offset, exp, pcrel, enum hppa_reloc_field_selector_type_alt r_field; int r_format; unsigned int arg_reloc; - int* unwind_bits ATTRIBUTE_UNUSED; + int unwind_bits ATTRIBUTE_UNUSED; { fixS *new_fix; @@ -1298,7 +1348,7 @@ 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$ @@ -1349,7 +1399,7 @@ cons_fix_new_hppa (frag, where, size, exp) 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; @@ -1369,7 +1419,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. @@ -1459,12 +1509,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 } @@ -1489,23 +1541,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 } @@ -1533,11 +1572,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) @@ -1559,8 +1599,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) { @@ -1653,12 +1691,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; @@ -1773,6 +1811,7 @@ pa_ip (str) { /* Handle a completer for an indexing load or store. */ + case 'X': case 'x': { int uu = 0; @@ -1811,6 +1850,7 @@ pa_ip (str) } /* Handle a short load/store completer. */ + case 'M': case 'm': case 'q': case 'J': @@ -1850,9 +1890,9 @@ pa_ip (str) 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); @@ -1869,15 +1909,16 @@ pa_ip (str) } 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; @@ -1913,7 +1954,7 @@ pa_ip (str) /* Handle load cache hint completer. */ case 'c': cmpltr = 0; - if (!strncmp(s, ",sl", 3)) + if (!strncmp (s, ",sl", 3)) { s += 3; cmpltr = 2; @@ -1923,12 +1964,12 @@ pa_ip (str) /* Handle store cache hint completer. */ case 'C': cmpltr = 0; - if (!strncmp(s, ",sl", 3)) + if (!strncmp (s, ",sl", 3)) { s += 3; cmpltr = 2; } - else if (!strncmp(s, ",bc", 3)) + else if (!strncmp (s, ",bc", 3)) { s += 3; cmpltr = 1; @@ -1938,7 +1979,7 @@ pa_ip (str) /* Handle load and clear cache hint completer. */ case 'd': cmpltr = 0; - if (!strncmp(s, ",co", 3)) + if (!strncmp (s, ",co", 3)) { s += 3; cmpltr = 1; @@ -1947,7 +1988,7 @@ pa_ip (str) /* Handle load ordering completer. */ case 'o': - if (strncmp(s, ",o", 2) != 0) + if (strncmp (s, ",o", 2) != 0) break; s += 2; continue; @@ -2216,13 +2257,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. */ @@ -2271,14 +2312,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: @@ -2292,16 +2333,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++; @@ -2387,10 +2428,10 @@ 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 Add and Branch Condition: %c"), *s); + as_bad (_("Invalid Add and Branch Condition")); cmpltr = 0; } INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13); @@ -2400,7 +2441,7 @@ pa_ip (str) cmpltr = pa_parse_addb_64_cmpltr (&s); if (cmpltr < 0) { - as_bad (_("Invalid Add and Branch Condition: %c"), *s); + as_bad (_("Invalid Add and Branch Condition")); cmpltr = 0; } else @@ -2414,11 +2455,11 @@ pa_ip (str) 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")); @@ -2556,10 +2597,10 @@ 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); @@ -2567,14 +2608,14 @@ pa_ip (str) /* 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 and Branch Condition.")); + as_bad (_("Invalid Compare and Branch Condition")); cmpltr = 0; } else @@ -2936,26 +2977,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); 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': @@ -2964,31 +3001,62 @@ 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 immediate, shifted left three times. */ case '#': @@ -3180,7 +3248,9 @@ pa_ip (str) 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_add_symbol + || !strcmp (S_GET_NAME (the_insn.exp.X_add_symbol), + FAKE_LABEL_NAME)) { num = evaluate_absolute (&the_insn); if (num % 4) @@ -3188,9 +3258,10 @@ pa_ip (str) as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 8199, -8184, 0); - - opcode |= re_assemble_12 ((num - 8) >> 2); + if (the_insn.exp.X_add_symbol) + num -= 8; + CHECK_FIELD (num, 8191, -8192, 0); + opcode |= re_assemble_12 (num >> 2); continue; } else @@ -3211,7 +3282,7 @@ 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)) { num = evaluate_absolute (&the_insn); if (num % 4) @@ -3219,11 +3290,9 @@ pa_ip (str) as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 262143, -262144, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - + CHECK_FIELD (num, 262143, -262144, 0); opcode |= re_assemble_17 (num >> 2); continue; } @@ -3244,7 +3313,7 @@ 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)) { num = evaluate_absolute (&the_insn); if (num % 4) @@ -3252,11 +3321,9 @@ pa_ip (str) as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 8388607, -8388608, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - + CHECK_FIELD (num, 8388607, -8388608, 0); opcode |= re_assemble_22 (num >> 2); } else @@ -3276,7 +3343,7 @@ 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)) { num = evaluate_absolute (&the_insn); if (num % 4) @@ -3284,11 +3351,9 @@ pa_ip (str) as_bad (_("Branch to unaligned address")); break; } - CHECK_FIELD (num, 262143, -262144, 0); - if (the_insn.exp.X_add_symbol) num -= 8; - + CHECK_FIELD (num, 262143, -262144, 0); opcode |= re_assemble_17 (num >> 2); continue; } @@ -3455,7 +3520,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. */ @@ -3883,7 +3948,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)) @@ -4012,7 +4077,7 @@ tc_gen_reloc (section, fixp) if (codes == NULL) { - as_bad (_("Cannot handle fixup at %s:%d"), fixp->fx_file, fixp->fx_line); + as_bad_where (fixp->fx_file, fixp->fx_line, _("Cannot handle fixup")); abort (); } @@ -4034,14 +4099,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, - (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); - /* Now, do any processing that is dependent on the relocation type. */ switch (code) { @@ -4075,10 +4132,24 @@ tc_gen_reloc (section, fixp) 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 */ @@ -4168,8 +4239,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; @@ -4177,8 +4248,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; @@ -4275,7 +4346,7 @@ struct option md_longopts[] = { #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) @@ -4336,17 +4407,17 @@ md_undefined_symbol (name) /* 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; offsetT new_val; - int insn, 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. */ @@ -4356,204 +4427,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 1; + return; #endif - insn = bfd_get_32 (stdoutput, (unsigned char *) buf); + 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) { - int fmt = bfd_hppa_insn2fmt (stdoutput, insn); + as_bad_where (fixP->fx_file, fixP->fx_line, + _("no hppa_fixup entry for fixup type 0x%x"), + fixP->fx_r_type); + return; + } - assert (fmt == hppa_fixP->fx_r_format); + 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) + /* 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) + 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)) + && (* valP - 8 + 8192 < 16384 + || (fmt == 17 && * valP - 8 + 262144 < 524288) + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) #endif #ifdef OBJ_SOM - && (*valp - 8 + 262144 < 524288 - || (fmt == 22 && *valp - 8 + 8388608 < 16777216)) + && (* valP - 8 + 262144 < 524288 + || (fmt == 22 && * valP - 8 + 8388608 < 16777216)) #endif - && !S_IS_EXTERNAL (fixP->fx_addsy) - && !S_IS_WEAK (fixP->fx_addsy) - && S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment - && !(fixP->fx_subsy - && S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment)) - { - new_val = hppa_field_adjust (*valp, 0, hppa_fixP->fx_r_field); - } - - switch (fmt) - { - case 10: - CHECK_FIELD (new_val, 8191, -8192, 0); - val = new_val; + && !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); + } - insn = (insn & ~ 0x3ff1) | (((val & 0x1ff8) << 1) - | ((val & 0x2000) >> 13)); - break; - case -11: - CHECK_FIELD (new_val, 8191, -8192, 0); - val = new_val; + switch (fmt) + { + case 10: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1) - | ((val & 0x2000) >> 13)); - break; - /* Handle all opcodes with the 'j' operand type. */ - case 14: - CHECK_FIELD (new_val, 8191, -8192, 0); - val = new_val; + 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; - insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); - break; + insn = (insn & ~ 0x3ff9) | (((val & 0x1ffc) << 1) + | ((val & 0x2000) >> 13)); + break; + /* Handle all opcodes with the 'j' operand type. */ + case 14: + CHECK_FIELD_WHERE (new_val, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Handle all opcodes with the 'k' operand type. */ - case 21: - CHECK_FIELD (new_val, 1048575, -1048576, 0); - val = new_val; + insn = ((insn & ~ 0x3fff) | low_sign_unext (val, 14)); + break; - insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); - break; + /* Handle all opcodes with the 'k' operand type. */ + case 21: + CHECK_FIELD_WHERE (new_val, 1048575, -1048576, + fixP->fx_file, fixP->fx_line); + val = new_val; - /* Handle all the opcodes with the 'i' operand type. */ - case 11: - CHECK_FIELD (new_val, 1023, -1023, 0); - val = new_val; + insn = (insn & ~ 0x1fffff) | re_assemble_21 (val); + break; - insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); - 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 all the opcodes with the 'w' operand type. */ - case 12: - CHECK_FIELD (new_val - 8, 8191, -8192, 0); - val = new_val - 8; + insn = (insn & ~ 0x7ff) | low_sign_unext (val, 11); + break; - insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); - break; + /* Handle all the opcodes with the 'w' operand type. */ + case 12: + CHECK_FIELD_WHERE (new_val - 8, 8191, -8192, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; - /* Handle some of the opcodes with the 'W' operand type. */ - case 17: - { - offsetT distance = *valp; + insn = (insn & ~ 0x1ffd) | re_assemble_12 (val >> 2); + break; - /* If this is an absolute branch (ie no link) with an out of - range target, then we want to complain. */ - if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL - && (insn & 0xffe00000) == 0xe8000000) - CHECK_FIELD (distance - 8, 262143, -262144, 0); + /* Handle some of the opcodes with the 'W' operand type. */ + case 17: + { + offsetT distance = * valP; - CHECK_FIELD (new_val - 8, 262143, -262144, 0); - val = new_val - 8; + /* 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); - insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); - break; - } + CHECK_FIELD_WHERE (new_val - 8, 262143, -262144, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; - case 22: - { - offsetT distance = *valp; + insn = (insn & ~ 0x1f1ffd) | re_assemble_17 (val >> 2); + break; + } - /* If this is an absolute branch (ie no link) with an out of - range target, then we want to complain. */ - if (fixP->fx_r_type == (int) R_HPPA_PCREL_CALL - && (insn & 0xffe00000) == 0xe8000000) - CHECK_FIELD (distance - 8, 8388607, -8388608, 0); + case 22: + { + offsetT distance = * valP; - CHECK_FIELD (new_val - 8, 8388607, -8388608, 0); - val = new_val - 8; + /* 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); - insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); - break; - } + CHECK_FIELD_WHERE (new_val - 8, 8388607, -8388608, + fixP->fx_file, fixP->fx_line); + val = new_val - 8; - case -10: - val = new_val; - insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); - break; + insn = (insn & ~ 0x3ff1ffd) | re_assemble_22 (val >> 2); + break; + } - case -16: - val = new_val; - insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); - break; + case -10: + val = new_val; + insn = (insn & ~ 0xfff1) | re_assemble_16 (val & -8); + break; - case 16: - val = new_val; - insn = (insn & ~ 0xffff) | re_assemble_16 (val); - break; + case -16: + val = new_val; + insn = (insn & ~ 0xfff9) | re_assemble_16 (val & -4); + break; - case 32: - insn = new_val; - break; + case 16: + val = new_val; + insn = (insn & ~ 0xffff) | re_assemble_16 (val); + break; - default: - as_bad (_("Unknown relocation encountered in md_apply_fix.")); - return 0; - } + case 32: + insn = new_val; + break; - /* Insert the relocation. */ - bfd_put_32 (stdoutput, insn, (unsigned char *) 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; + 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? @@ -4603,7 +4679,7 @@ pa_parse_number (s, is_float) symbolS *sym; int status; char *p = *s; - boolean have_prefix; + bfd_boolean have_prefix; /* Skip whitespace before the number. */ while (*p == ' ' || *p == '\t') @@ -4612,7 +4688,7 @@ pa_parse_number (s, is_float) pa_number = -1; have_prefix = 0; num = 0; - if (!strict && isdigit (*p)) + if (!strict && ISDIGIT (*p)) { /* Looks like a number. */ @@ -4620,10 +4696,10 @@ pa_parse_number (s, is_float) { /* 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; @@ -4635,7 +4711,7 @@ pa_parse_number (s, is_float) else { /* The number is specified in decimal. */ - while (isdigit (*p)) + while (ISDIGIT (*p)) { num = num * 10 + *p - '0'; ++p; @@ -4687,7 +4763,7 @@ pa_parse_number (s, is_float) num = 2; p++; } - else if (!isdigit (*p)) + else if (!ISDIGIT (*p)) { if (print_errors) as_bad (_("Undefined register: '%s'."), name); @@ -4697,7 +4773,7 @@ pa_parse_number (s, is_float) { do num = num * 10 + *p++ - '0'; - while (isdigit (*p)); + while (ISDIGIT (*p)); } } else @@ -4742,7 +4818,7 @@ pa_parse_number (s, is_float) num = S_GET_VALUE (sym); /* Well, we don't really have one, but we do have a register, so... */ - have_prefix = true; + have_prefix = TRUE; } else if (S_GET_SEGMENT (sym) == &bfd_abs_section) num = S_GET_VALUE (sym); @@ -4781,7 +4857,7 @@ pa_parse_number (s, is_float) 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. */ @@ -5049,16 +5125,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; @@ -5143,7 +5219,7 @@ pa_get_absolute_expression (insn, strp) input_line_pointer = *strp; s = *strp; while (*s != ',' && *s != ' ' && *s != '\t') - s++; + s++; c = *s; *s = 0; @@ -5271,16 +5347,11 @@ pa_parse_nullif (s) } /* 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. */ + number (for encoding in instrutions) of the given completer. */ static int -pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) +pa_parse_nonneg_cmpsub_cmpltr (s) char **s; - int isbranch; { int cmpltr; char *name = *s + 1; @@ -5327,7 +5398,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; @@ -5347,16 +5418,11 @@ pa_parse_nonneg_cmpsub_cmpltr (s, isbranch) } /* 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. */ + number (for encoding in instrutions) of the given completer. */ static int -pa_parse_neg_cmpsub_cmpltr (s, isbranch) +pa_parse_neg_cmpsub_cmpltr (s) char **s; - int isbranch; { int cmpltr; char *name = *s + 1; @@ -5407,7 +5473,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; @@ -5586,21 +5652,17 @@ pa_parse_cmpib_64_cmpltr (s) } /* 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. */ + (for encoding in instrutions) of the given completer. */ static int -pa_parse_nonneg_add_cmpltr (s, isbranch) +pa_parse_nonneg_add_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 == ',') @@ -5640,9 +5702,10 @@ pa_parse_nonneg_add_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; } else { @@ -5652,28 +5715,24 @@ pa_parse_nonneg_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; } /* 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). */ + (for encoding in instrutions) of the given completer. */ static int -pa_parse_neg_add_cmpltr (s, isbranch) +pa_parse_neg_add_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 == ',') @@ -5717,9 +5776,10 @@ pa_parse_neg_add_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; } else { @@ -5729,7 +5789,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; @@ -5910,7 +5970,7 @@ pa_brtab (begin) fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, NULL, (offsetT) 0, NULL, 0, begin ? R_HPPA_BEGIN_BRTAB : R_HPPA_END_BRTAB, - e_fsel, 0, 0, NULL); + e_fsel, 0, 0, 0); #endif demand_empty_rest_of_line (); @@ -5935,7 +5995,7 @@ pa_try (begin) fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, NULL, (offsetT) 0, begin ? NULL : &exp, 0, begin ? R_HPPA_BEGIN_TRY : R_HPPA_END_TRY, - e_fsel, 0, 0, NULL); + e_fsel, 0, 0, 0); #endif demand_empty_rest_of_line (); @@ -6036,21 +6096,18 @@ static void pa_build_unwind_subspace (call_info) struct call_info *call_info; { - char *unwind; asection *seg, *save_seg; subsegT save_subseg; - unsigned int i; + unsigned int unwind; int reloc; - char c, *p; + 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 @@ -6070,17 +6127,14 @@ pa_build_unwind_subspace (call_info) /* 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. @@ -6089,21 +6143,18 @@ pa_build_unwind_subspace (call_info) symbol into the symbol table. It (should) end up giving the same value as call_info->start_symbol + function size once the linker is finished with its work. */ - - 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); @@ -6393,12 +6444,14 @@ 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 } @@ -6506,7 +6559,7 @@ process_exit () fix_new_hppa (frag_now, where - frag_now->fr_literal, 0, NULL, (offsetT) 0, NULL, 0, R_HPPA_EXIT, e_fsel, 0, 0, - (int *) &last_call_info->ci_unwind.descriptor + 1); + UNWIND_HIGH32 (&last_call_info->ci_unwind.descriptor)); #endif } @@ -6774,7 +6827,7 @@ pa_import (unused) { /* Sigh. To be compatable 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; @@ -7037,12 +7090,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 } @@ -8142,11 +8197,11 @@ pa_stringer (append_zero) 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; @@ -8312,6 +8367,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; @@ -8323,15 +8379,45 @@ hppa_fix_adjustable (fixp) #endif #ifdef OBJ_ELF - if (fixp->fx_r_type == (int) R_PARISC_GNU_VTINHERIT - || fixp->fx_r_type == (int) R_PARISC_GNU_VTENTRY) - return 0; + /* 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 - if (fixp->fx_addsy && (S_IS_EXTERNAL (fixp->fx_addsy) - || S_IS_WEAK (fixp->fx_addsy))) - return 0; - /* Reject reductions of symbols in sym1-sym2 expressions when the fixup will occur in a CODE subspace. @@ -8341,11 +8427,7 @@ 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. @@ -8435,11 +8517,11 @@ hppa_force_relocation (fixp) /* Ensure we emit a relocation for global symbols so that dynamic linking works. */ - if (S_IS_EXTERNAL (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy)) + if (S_FORCE_RELOC (fixp->fx_addsy, 1)) return 1; /* 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 + 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), @@ -8449,15 +8531,27 @@ hppa_force_relocation (fixp) /* Now check to see if we're going to need a long-branch stub. */ if (fixp->fx_r_type == (int) R_HPPA_PCREL_CALL) { - valueT distance; + long pc = md_pcrel_from (fixp); + valueT distance, min_stub_distance; - distance = (fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy) - - md_pcrel_from (fixp) - 8); - if (distance + 8388608 >= 16777216 - || (hppa_fixp->fx_r_format == 17 && distance + 262144 >= 524288) -#ifdef OBJ_ELF - || (hppa_fixp->fx_r_format == 12 && distance + 8192 >= 16384) + 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 + + 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; } @@ -8472,7 +8566,7 @@ 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 () @@ -8556,13 +8650,6 @@ elf_hppa_final_processing () } } -void -pa_end_of_source () -{ - if (debug_type == DEBUG_DWARF2) - dwarf2_finish (); -} - static void pa_vtable_entry (ignore) int ignore ATTRIBUTE_UNUSED;