/* tc-hppa.c -- Assemble for the PA
- Copyright (C) 1989 Free Software Foundation, Inc.
+ Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999
+ Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
+ the Free Software Foundation; either version 2, or (at your option)
any later version.
GAS is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GAS; see the file COPYING. If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with GAS; see the file COPYING. If not, write to the Free
+ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA. */
/* HP PA-RISC support was contributed by the Center for Software Science
/* Be careful, this file includes data *declarations*. */
#include "opcode/hppa.h"
+#if defined (OBJ_ELF) && defined (OBJ_SOM)
+error only one of OBJ_ELF and OBJ_SOM can be defined
+#endif
+
/* A "convient" place to put object file dependencies which do
not need to be seen outside of tc-hppa.c. */
#ifdef OBJ_ELF
-/* Names of various debugging spaces/subspaces. */
-#define GDB_DEBUG_SPACE_NAME ".stab"
-#define GDB_STRINGS_SUBSPACE_NAME ".stabstr"
-#define GDB_SYMBOLS_SUBSPACE_NAME ".stab"
-#define UNWIND_SECTION_NAME ".PARISC.unwind"
-/* Nonzero if CODE is a fixup code needing further processing. */
-
/* Object file formats specify relocation types. */
-typedef elf32_hppa_reloc_type reloc_type;
+typedef elf_hppa_reloc_type reloc_type;
/* Object file formats specify BFD symbol types. */
typedef elf_symbol_type obj_symbol_type;
+#ifdef BFD64
/* How to generate a relocation. */
-#define hppa_gen_reloc_type hppa_elf_gen_reloc_type
+#define hppa_gen_reloc_type _bfd_elf64_hppa_gen_reloc_type
+#else
+#define hppa_gen_reloc_type _bfd_elf32_hppa_gen_reloc_type
+#endif
/* ELF objects can have versions, but apparently do not have anywhere
to store a copyright string. */
#define obj_version obj_elf_version
#define obj_copyright obj_elf_version
-
-/* Use space aliases. */
-#define USE_ALIASES 1
#endif
#ifdef OBJ_SOM
#define obj_version obj_som_version
#define obj_copyright obj_som_copyright
-/* Do not use space aliases. */
-#define USE_ALIASES 0
-
/* How to generate a relocation. */
#define hppa_gen_reloc_type hppa_som_gen_reloc_type
#endif
#endif
+#ifndef R_N0SEL
+#define R_N0SEL 0xd8
+#endif
+
+#ifndef R_N1SEL
+#define R_N1SEL 0xd9
+#endif
+
/* Various structures and types used internally in tc-hppa.c. */
/* Unwind table and descriptor. FIXME: Sync this with GDB version. */
SGL and DBL). */
typedef enum
{
- SGL, DBL, ILLEGAL_FMT, QUAD
+ SGL, DBL, ILLEGAL_FMT, QUAD, W, UW, DW, UDW, QW, UQW
}
fp_operand_format;
fp_operand_format fpof1;
fp_operand_format fpof2;
+
/* Holds the field selector for this instruction
(for example L%, LR%, etc). */
long field_selector;
unsigned int arg_count;
};
+#ifdef OBJ_SOM
/* This structure defines an entry in the subspace dictionary
chain. */
typedef struct space_dictionary_chain sd_chain_struct;
-/* Structure for previous label tracking. Needed so that alignments,
- callinfo declarations, etc can be easily attached to a particular
- label. */
-typedef struct label_symbol_struct
- {
- struct symbol *lss_label;
- sd_chain_struct *lss_space;
- struct label_symbol_struct *lss_next;
- }
-label_symbol_struct;
-
/* This structure defines attributes of the default subspace
dictionary entries. */
/* An index into the default spaces array. */
int def_space_index;
- /* An alias for this section (or NULL if no alias exists). */
- char *alias;
-
/* Subsegment associated with this subspace. */
subsegT subsegment;
};
/* Segment associated with this space. */
asection *segment;
-
- /* An alias for this section (or NULL if no alias exists). */
- char *alias;
};
+#endif
+
+/* Structure for previous label tracking. Needed so that alignments,
+ callinfo declarations, etc can be easily attached to a particular
+ label. */
+typedef struct label_symbol_struct
+ {
+ struct symbol *lss_label;
+#ifdef OBJ_SOM
+ sd_chain_struct *lss_space;
+#endif
+#ifdef OBJ_ELF
+ segT lss_segment;
+#endif
+ struct label_symbol_struct *lss_next;
+ }
+label_symbol_struct;
/* Extra information needed to perform fixups (relocations) on the PA. */
struct hppa_fix_struct
{
/* The field selector. */
- enum hppa_reloc_field_selector_type fx_r_field;
+ enum hppa_reloc_field_selector_type_alt fx_r_field;
/* Type of fixup. */
int fx_r_type;
/* Prototypes for functions local to tc-hppa.c. */
+#ifdef OBJ_SOM
static void pa_check_current_space_and_subspace PARAMS ((void));
+#endif
+
static fp_operand_format pa_parse_fp_format PARAMS ((char **s));
static void pa_cons PARAMS ((int));
static void pa_data PARAMS ((int));
static int pa_parse_neg_cmpsub_cmpltr PARAMS ((char **, int));
static int pa_parse_neg_add_cmpltr PARAMS ((char **, int));
static int pa_parse_nonneg_add_cmpltr PARAMS ((char **, int));
-static void pa_align PARAMS ((int));
static void pa_block PARAMS ((int));
static void pa_brtab PARAMS ((int));
+static void pa_try PARAMS ((int));
static void pa_call PARAMS ((int));
static void pa_call_args PARAMS ((struct call_desc *));
static void pa_callinfo PARAMS ((int));
static void pa_import PARAMS ((int));
static void pa_label PARAMS ((int));
static void pa_leave PARAMS ((int));
+static void pa_level PARAMS ((int));
static void pa_origin PARAMS ((int));
static void pa_proc PARAMS ((int));
static void pa_procend PARAMS ((int));
-static void pa_space PARAMS ((int));
-static void pa_spnum PARAMS ((int));
-static void pa_subspace PARAMS ((int));
static void pa_param PARAMS ((int));
static void pa_undefine_label PARAMS ((void));
static int need_pa11_opcode PARAMS ((struct pa_it *,
struct pa_11_fp_reg_struct *));
static int pa_parse_number PARAMS ((char **, struct pa_11_fp_reg_struct *));
static label_symbol_struct *pa_get_label PARAMS ((void));
+#ifdef OBJ_SOM
+static void pa_compiler PARAMS ((int));
+static void pa_align PARAMS ((int));
+static void pa_space PARAMS ((int));
+static void pa_spnum PARAMS ((int));
+static void pa_subspace PARAMS ((int));
static sd_chain_struct *create_new_space PARAMS ((char *, int, int,
int, int, int,
asection *, int));
subsegT));
static sd_chain_struct *pa_find_space_by_number PARAMS ((int));
static unsigned int pa_subspace_start PARAMS ((sd_chain_struct *, int));
+static sd_chain_struct *pa_parse_space_stmt PARAMS ((char *, int));
+static int pa_next_subseg PARAMS ((sd_chain_struct *));
+static void pa_spaces_begin PARAMS ((void));
+#endif
static void pa_ip PARAMS ((char *));
static void fix_new_hppa PARAMS ((fragS *, int, int, symbolS *,
long, expressionS *, int,
bfd_reloc_code_real_type,
- enum hppa_reloc_field_selector_type,
+ enum hppa_reloc_field_selector_type_alt,
int, long, int *));
static int is_end_of_statement PARAMS ((void));
static int reg_name_search PARAMS ((char *));
static int pa_chk_field_selector PARAMS ((char **));
static int is_same_frag PARAMS ((fragS *, fragS *));
-static void pa_build_unwind_subspace PARAMS ((struct call_info *));
static void process_exit PARAMS ((void));
-static sd_chain_struct *pa_parse_space_stmt PARAMS ((char *, int));
static int log2 PARAMS ((int));
-static int pa_next_subseg PARAMS ((sd_chain_struct *));
static unsigned int pa_stringer_aux PARAMS ((char *));
-static void pa_spaces_begin PARAMS ((void));
+
+#ifdef OBJ_ELF
static void hppa_elf_mark_end_of_function PARAMS ((void));
+static void pa_build_unwind_subspace PARAMS ((struct call_info *));
+#endif
/* File and gloally scoped variable declarations. */
+#ifdef OBJ_SOM
/* Root and final entry in the space chain. */
static sd_chain_struct *space_dict_root;
static sd_chain_struct *space_dict_last;
/* The current space and subspace. */
static sd_chain_struct *current_space;
static ssd_chain_struct *current_subspace;
+#endif
/* Root of the call_info chain. */
static struct call_info *call_info_root;
/* The last call description (for actual calls). */
static struct call_desc last_call_desc;
-/* Jumps are always the same size -- one instruction. */
-int md_short_jump_size = 4;
-int md_long_jump_size = 4;
-
/* handle of the OPCODE hash table */
static struct hash_control *op_hash = NULL;
{
/* align pseudo-ops on the PA specify the actual alignment requested,
not the log2 of the requested alignment. */
+#ifdef OBJ_SOM
{"align", pa_align, 8},
+#endif
+#ifdef OBJ_ELF
+ {"align", s_align_bytes, 8},
+#endif
{"begin_brtab", pa_brtab, 1},
+ {"begin_try", pa_try, 1},
{"block", pa_block, 1},
{"blockz", pa_block, 0},
{"byte", pa_cons, 1},
{"callinfo", pa_callinfo, 0},
{"code", pa_code, 0},
{"comm", pa_comm, 0},
+#ifdef OBJ_SOM
+ {"compiler", pa_compiler, 0},
+#endif
{"copyright", pa_copyright, 0},
{"data", pa_data, 0},
{"double", pa_float_cons, 'd'},
{"end", pa_end, 0},
{"end_brtab", pa_brtab, 0},
+ {"end_try", pa_try, 0},
{"enter", pa_enter, 0},
{"entry", pa_entry, 0},
{"equ", pa_equ, 0},
{"label", pa_label, 0},
{"lcomm", pa_lcomm, 0},
{"leave", pa_leave, 0},
+ {"level", pa_level, 0},
{"long", pa_cons, 4},
{"lsym", pa_lsym, 0},
+#ifdef OBJ_SOM
{"nsubspa", pa_subspace, 1},
+#endif
{"octa", pa_cons, 16},
{"org", pa_origin, 0},
{"origin", pa_origin, 0},
{"reg", pa_equ, 1},
{"short", pa_cons, 2},
{"single", pa_float_cons, 'f'},
+#ifdef OBJ_SOM
{"space", pa_space, 0},
{"spnum", pa_spnum, 0},
+#endif
{"string", pa_stringer, 0},
{"stringz", pa_stringer, 1},
+#ifdef OBJ_SOM
{"subspa", pa_subspace, 0},
+#endif
{"text", pa_text, 0},
{"version", pa_version, 0},
{"word", pa_cons, 4},
first line of the input file. This is because the compiler outputs
#NO_APP at the beginning of its output.
- Also note that '/*' will always start a comment. */
+ Also note that C style comments will always work. */
const char line_comment_chars[] = "#";
/* This array holds the characters which act as line separators. */
/* Holds the last field selector. */
static int hppa_field_selector;
+#ifdef OBJ_SOM
/* A dummy bfd symbol so that all relocations have symbols of some kind. */
static symbolS *dummy_symbol;
+#endif
/* Nonzero if errors are to be printed. */
static int print_errors = 1;
{"t", e_tsel},
};
+#ifdef OBJ_SOM
/* default space and subspace dictionaries */
#define GDB_SYMBOLS GDB_SYMBOLS_SUBSPACE_NAME
/* pre-defined subsegments (subspaces) for the HPPA. */
#define SUBSEG_CODE 0
-#define SUBSEG_DATA 0
#define SUBSEG_LIT 1
+#define SUBSEG_MILLI 2
+#define SUBSEG_DATA 0
#define SUBSEG_BSS 2
#define SUBSEG_UNWIND 3
#define SUBSEG_GDB_STRINGS 0
static struct default_subspace_dict pa_def_subspaces[] =
{
- {"$CODE$", 1, 1, 1, 0, 0, 0, 24, 0x2c, 0, 8, 0, 0, ".text", SUBSEG_CODE},
- {"$DATA$", 1, 1, 0, 0, 0, 0, 24, 0x1f, 1, 8, 1, 1, ".data", SUBSEG_DATA},
- {"$LIT$", 1, 1, 0, 0, 0, 0, 16, 0x2c, 0, 8, 0, 0, ".text", SUBSEG_LIT},
- {"$BSS$", 1, 1, 0, 0, 0, 1, 80, 0x1f, 1, 8, 1, 1, ".bss", SUBSEG_BSS},
-#ifdef OBJ_ELF
- {"$UNWIND$", 1, 1, 0, 0, 0, 0, 64, 0x2c, 0, 4, 0, 0, ".PARISC.unwind", SUBSEG_UNWIND},
-#endif
+ {"$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}
};
static struct default_space_dict pa_def_spaces[] =
{
- {"$TEXT$", 0, 1, 1, 0, 8, ASEC_NULL, ".text"},
- {"$PRIVATE$", 1, 1, 1, 1, 16, ASEC_NULL, ".data"},
- {NULL, 0, 0, 0, 0, 0, ASEC_NULL, NULL}
+ {"$TEXT$", 0, 1, 1, 0, 8, ASEC_NULL},
+ {"$PRIVATE$", 1, 1, 1, 1, 16, ASEC_NULL},
+ {NULL, 0, 0, 0, 0, 0, ASEC_NULL}
};
/* Misc local definitions used by the assembler. */
-/* Return nonzero if the string pointed to by S potentially represents
- a right or left half of a FP register */
-#define IS_R_SELECT(S) (*(S) == 'R' || *(S) == 'r')
-#define IS_L_SELECT(S) (*(S) == 'L' || *(S) == 'l')
-
/* These macros are used to maintain spaces/subspaces. */
#define SPACE_DEFINED(space_chain) (space_chain)->sd_defined
#define SPACE_USER_DEFINED(space_chain) (space_chain)->sd_user_defined
#define SUBSPACE_DEFINED(ss_chain) (ss_chain)->ssd_defined
#define SUBSPACE_NAME(ss_chain) (ss_chain)->ssd_name
+#endif
+
+/* Return nonzero if the string pointed to by S potentially represents
+ a right or left half of a FP register */
+#define IS_R_SELECT(S) (*(S) == 'R' || *(S) == 'r')
+#define IS_L_SELECT(S) (*(S) == 'L' || *(S) == 'l')
/* Insert FIELD into OPCODE starting at bit START. Continue pa_ip
main loop after insertion. */
if ((FIELD) > (HIGH) || (FIELD) < (LOW)) \
{ \
if (! IGNORE) \
- as_bad ("Field out of range [%d..%d] (%d).", (LOW), (HIGH), \
+ as_bad (_("Field out of range [%d..%d] (%d)."), (LOW), (HIGH), \
(int) (FIELD));\
break; \
} \
#define is_DP_relative(exp) \
((exp).X_op == O_subtract \
- && strcmp((exp).X_op_symbol->bsym->name, "$global$") == 0)
+ && strcmp (S_GET_NAME ((exp).X_op_symbol), "$global$") == 0)
#define is_PC_relative(exp) \
((exp).X_op == O_subtract \
- && strcmp((exp).X_op_symbol->bsym->name, "$PIC_pcrel$0") == 0)
+ && strcmp (S_GET_NAME ((exp).X_op_symbol), "$PIC_pcrel$0") == 0)
/* We need some complex handling for stabs (sym1 - sym2). Luckily, we'll
always be able to reduce the expression to a constant, so we don't
pa_check_eof ()
{
if (within_entry_exit)
- as_fatal ("Missing .exit\n");
+ as_fatal (_("Missing .exit\n"));
if (within_procedure)
- as_fatal ("Missing .procend\n");
-}
-
-/* Check to make sure we have a valid space and subspace. */
-
-static void
-pa_check_current_space_and_subspace ()
-{
- if (current_space == NULL)
- as_fatal ("Not in a space.\n");
-
- if (current_subspace == NULL)
- as_fatal ("Not in a subspace.\n");
+ as_fatal (_("Missing .procend\n"));
}
/* Returns a pointer to the label_symbol_struct for the current space.
pa_get_label ()
{
label_symbol_struct *label_chain;
- sd_chain_struct *space_chain = current_space;
for (label_chain = label_symbols_rootp;
label_chain;
label_chain = label_chain->lss_next)
- if (space_chain == label_chain->lss_space && label_chain->lss_label)
+ {
+#ifdef OBJ_SOM
+ if (current_space == label_chain->lss_space && label_chain->lss_label)
return label_chain;
+#endif
+#ifdef OBJ_ELF
+ if (now_seg == label_chain->lss_segment && label_chain->lss_label)
+ return label_chain;
+#endif
+ }
return NULL;
}
symbolS *symbol;
{
label_symbol_struct *label_chain = pa_get_label ();
- sd_chain_struct *space_chain = current_space;
if (label_chain)
label_chain->lss_label = symbol;
label_chain
= (label_symbol_struct *) xmalloc (sizeof (label_symbol_struct));
label_chain->lss_label = symbol;
- label_chain->lss_space = space_chain;
+#ifdef OBJ_SOM
+ label_chain->lss_space = current_space;
+#endif
+#ifdef OBJ_ELF
+ label_chain->lss_segment = now_seg;
+#endif
label_chain->lss_next = NULL;
if (label_symbols_rootp)
{
label_symbol_struct *label_chain;
label_symbol_struct *prev_label_chain = NULL;
- sd_chain_struct *space_chain = current_space;
for (label_chain = label_symbols_rootp;
label_chain;
label_chain = label_chain->lss_next)
{
- if (space_chain == label_chain->lss_space && label_chain->lss_label)
+ if (1
+#ifdef OBJ_SOM
+ && current_space == label_chain->lss_space && label_chain->lss_label
+#endif
+#ifdef OBJ_ELF
+ && now_seg == label_chain->lss_segment && label_chain->lss_label
+#endif
+ )
{
/* Remove the label from the chain and free its memory. */
if (prev_label_chain)
expressionS *exp;
int pcrel;
bfd_reloc_code_real_type r_type;
- enum hppa_reloc_field_selector_type r_field;
+ enum hppa_reloc_field_selector_type_alt r_field;
int r_format;
long arg_reloc;
int* unwind_bits;
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%%."));
fix_new_hppa (frag, where, size,
(symbolS *) NULL, (offsetT) 0, exp, 0, rel_type,
/* Set the default machine type. */
if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10))
- as_warn ("could not set architecture and machine");
+ as_warn (_("could not set architecture and machine"));
/* Folding of text and data segments fails miserably on the PA.
Warn user and disable "-R" option. */
if (flag_readonly_data_in_text)
{
- as_warn ("-R option not supported on this target.");
+ as_warn (_("-R option not supported on this target."));
flag_readonly_data_in_text = 0;
}
+#ifdef OBJ_SOM
pa_spaces_begin ();
+#endif
op_hash = hash_new ();
retval = hash_insert (op_hash, name, (struct pa_opcode *) &pa_opcodes[i]);
if (retval != NULL && *retval != '\0')
{
- as_fatal ("Internal error: can't hash `%s': %s\n", name, retval);
+ as_fatal (_("Internal error: can't hash `%s': %s\n"), name, retval);
lose = 1;
}
do
if ((pa_opcodes[i].match & pa_opcodes[i].mask)
!= pa_opcodes[i].match)
{
- fprintf (stderr, "internal error: losing opcode: `%s' \"%s\"\n",
+ fprintf (stderr, _("internal error: losing opcode: `%s' \"%s\"\n"),
pa_opcodes[i].name, pa_opcodes[i].args);
lose = 1;
}
}
if (lose)
- as_fatal ("Broken assembler. No assembly attempted.");
+ as_fatal (_("Broken assembler. No assembly attempted."));
+#ifdef OBJ_SOM
/* SOM will change text_section. To make sure we never put
anything into the old one switch to the new one now. */
subseg_set (text_section, 0);
+#endif
+#ifdef OBJ_SOM
dummy_symbol = symbol_find_or_make ("L$dummy");
S_SET_SEGMENT (dummy_symbol, text_section);
+ /* Force the symbol to be converted to a real symbol. */
+ (void) symbol_get_bfdsym (dummy_symbol);
+#endif
}
/* Assemble a single instruction storing it into a frag. */
if (label_symbol->lss_label)
{
last_call_info->start_symbol = label_symbol->lss_label;
- label_symbol->lss_label->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (label_symbol->lss_label)->flags
+ |= BSF_FUNCTION;
#ifdef OBJ_SOM
/* Also handle allocation of a fixup to hold the unwind
information when the label appears after the proc/procend. */
#endif
}
else
- as_bad ("Missing function name for .PROC (corrupted label chain)");
+ as_bad (_("Missing function name for .PROC (corrupted label chain)"));
}
else
- as_bad ("Missing function name for .PROC");
+ as_bad (_("Missing function name for .PROC"));
}
/* Assemble the instruction. Results are saved into "the_insn". */
unsigned long opcode;
struct pa_opcode *insn;
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
+
+ /* Convert everything up to the first whitespace character into lower
+ case. */
+ for (s = str; *s != ' ' && *s != '\t' && *s != '\n' && *s != '\0'; s++)
+ if (isupper (*s))
+ *s = tolower (*s);
/* Skip to something interesting. */
for (s = str; isupper (*s) || islower (*s) || (*s >= '0' && *s <= '3'); ++s)
break;
default:
- as_fatal ("Unknown opcode: `%s'", str);
+ as_fatal (_("Unknown opcode: `%s'"), str);
}
save_s = str;
- /* Convert everything into lower case. */
- while (*save_s)
- {
- if (isupper (*save_s))
- *save_s = tolower (*save_s);
- save_s++;
- }
-
/* Look up the opcode in the has table. */
if ((insn = (struct pa_opcode *) hash_find (op_hash, str)) == NULL)
{
{
/* Do some initialization. */
opcode = insn->match;
- bzero (&the_insn, sizeof (the_insn));
+ memset (&the_insn, 0, sizeof (the_insn));
the_insn.reloc = R_HPPA_NONE;
/* If this instruction is specific to a particular architecture,
then set a new architecture. */
- if (bfd_get_mach (stdoutput) < insn->arch)
+ /* But do not automatically promote to pa2.0. The automatic promotion
+ crud is for compatability with HP's old assemblers only. */
+ if (insn->arch < 20
+ && bfd_get_mach (stdoutput) < insn->arch)
{
if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, insn->arch))
- as_warn ("could not update architecture and machine");
+ as_warn (_("could not update architecture and machine"));
+ }
+ else if (bfd_get_mach (stdoutput) < insn->arch)
+ {
+ match = FALSE;
+ goto failed;
}
/* Build the opcode, checking as we go to make
num = pa_get_absolute_expression (&the_insn, &s);
s = expr_end;
CHECK_FIELD (num, 15, -16, 0)
- low_sign_unext (num, 5, &num);
+ low_sign_unext (num, 5, &num);
INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
/* Handle an unsigned 5 bit immediate at 31. */
else if (strncasecmp (s, "s", 1) == 0)
uu = 1;
else
- as_bad ("Invalid Indexed Load Completer.");
+ as_bad (_("Invalid Indexed Load Completer."));
s++;
i++;
}
if (i > 2)
- as_bad ("Invalid Indexed Load Completer Syntax.");
+ as_bad (_("Invalid Indexed Load Completer Syntax."));
opcode |= m << 5;
INSERT_FIELD_AND_CONTINUE (opcode, uu, 13);
}
m = 1;
}
else
- as_bad ("Invalid Short Load/Store Completer.");
+ as_bad (_("Invalid Short Load/Store Completer."));
s += 2;
}
- opcode |= m << 5;
- INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
+
+ if (*args == 'C')
+ {
+ opcode |= m << 5;
+ INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
+ }
}
/* Handle a stbys completer. */
else if (strncasecmp (s, "e", 1) == 0)
a = 1;
else
- as_bad ("Invalid Store Bytes Short Completer");
+ as_bad (_("Invalid Store Bytes Short Completer"));
s++;
i++;
}
if (i > 2)
- as_bad ("Invalid Store Bytes Short Completer");
+ as_bad (_("Invalid Store Bytes Short Completer"));
opcode |= m << 5;
INSERT_FIELD_AND_CONTINUE (opcode, a, 13);
}
cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 1);
if (cmpltr < 0)
{
- as_bad ("Invalid Compare/Subtract Condition: %c", *s);
+ as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
cmpltr = 0;
}
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 1);
if (cmpltr < 0)
{
- as_bad ("Invalid Compare/Subtract Condition.");
+ as_bad (_("Invalid Compare/Subtract Condition."));
cmpltr = 0;
}
else
opcode |= 1 << 27;
}
}
+
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
/* Handle non-negated add condition. */
cmpltr = pa_parse_nonneg_add_cmpltr (&s, 1);
if (cmpltr < 0)
{
- as_bad ("Invalid Compare/Subtract Condition: %c", *s);
+ as_bad (_("Invalid Compare/Subtract Condition: %c"), *s);
cmpltr = 0;
}
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
cmpltr = pa_parse_neg_add_cmpltr (&s, 1);
if (cmpltr < 0)
{
- as_bad ("Invalid Compare/Subtract Condition");
+ as_bad (_("Invalid Compare/Subtract Condition"));
cmpltr = 0;
}
else
case 'a':
cmpltr = 0;
flag = 0;
- save_s = s;
if (*s == ',')
{
- cmpltr = pa_parse_nonneg_cmpsub_cmpltr (&s, 0);
- if (cmpltr < 0)
+ s++;
+ name = s;
+ while (*s != ',' && *s != ' ' && *s != '\t')
+ s += 1;
+ c = *s;
+ *s = 0x00;
+ if (strcmp (name, "=") == 0)
+ cmpltr = 1;
+ else if (strcmp (name, "<") == 0)
+ cmpltr = 2;
+ else if (strcmp (name, "<=") == 0)
+ cmpltr = 3;
+ else if (strcasecmp (name, "<<") == 0)
+ cmpltr = 4;
+ else if (strcasecmp (name, "<<=") == 0)
+ cmpltr = 5;
+ else if (strcasecmp (name, "sv") == 0)
+ cmpltr = 6;
+ else if (strcasecmp (name, "od") == 0)
+ cmpltr = 7;
+ else if (strcasecmp (name, "tr") == 0)
{
+ cmpltr = 0;
flag = 1;
- s = save_s;
- cmpltr = pa_parse_neg_cmpsub_cmpltr (&s, 0);
- if (cmpltr < 0)
- {
- as_bad ("Invalid Compare/Subtract Condition");
- }
}
+ else if (strcmp (name, "<>") == 0)
+ {
+ cmpltr = 1;
+ flag = 1;
+ }
+ else if (strcmp (name, ">=") == 0)
+ {
+ cmpltr = 2;
+ flag = 1;
+ }
+ else if (strcmp (name, ">") == 0)
+ {
+ cmpltr = 3;
+ flag = 1;
+ }
+ else if (strcasecmp (name, ">>=") == 0)
+ {
+ cmpltr = 4;
+ flag = 1;
+ }
+ else if (strcasecmp (name, ">>") == 0)
+ {
+ cmpltr = 5;
+ flag = 1;
+ }
+ else if (strcasecmp (name, "nsv") == 0)
+ {
+ cmpltr = 6;
+ flag = 1;
+ }
+ else if (strcasecmp (name, "ev") == 0)
+ {
+ cmpltr = 7;
+ flag = 1;
+ }
+ else
+ as_bad (_("Invalid Add Condition: %s"), name);
+ *s = c;
}
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
/* Handle a non-negated add condition. */
case 'd':
cmpltr = 0;
- nullif = 0;
flag = 0;
if (*s == ',')
{
cmpltr = 6;
else if (strcasecmp (name, "od") == 0)
cmpltr = 7;
- else if (strcasecmp (name, "n") == 0)
- nullif = 1;
else if (strcasecmp (name, "tr") == 0)
{
cmpltr = 0;
flag = 1;
}
else
- as_bad ("Invalid Add Condition: %s", name);
+ as_bad (_("Invalid Add Condition: %s"), name);
*s = c;
}
- nullif = pa_parse_nullif (&s);
- opcode |= nullif << 1;
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
s += 1;
c = *s;
*s = 0x00;
+
+
if (strcmp (name, "=") == 0)
cmpltr = 1;
else if (strcmp (name, "<") == 0)
flag = 1;
}
else
- as_bad ("Invalid Logical Instruction Condition.");
+ as_bad (_("Invalid Logical Instruction Condition."));
*s = c;
}
opcode |= cmpltr << 13;
if (*s == ',')
{
s++;
+
+
if (strncasecmp (s, "sbz", 3) == 0)
{
cmpltr = 2;
s += 3;
}
else
- as_bad ("Invalid Logical Instruction Condition.");
+ as_bad (_("Invalid Logical Instruction Condition."));
}
opcode |= cmpltr << 13;
INSERT_FIELD_AND_CONTINUE (opcode, flag, 12);
if (*s == ',')
{
save_s = s++;
+
+
name = s;
while (*s != ',' && *s != ' ' && *s != '\t')
s += 1;
continue;
}
else
- as_bad ("Invalid Shift/Extract/Deposit Condition.");
+ as_bad (_("Invalid Shift/Extract/Deposit Condition."));
*s = c;
}
INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
s++;
if (strncmp (s, "<", 1) == 0)
{
- cmpltr = 2;
+ cmpltr = 0;
s++;
}
else if (strncmp (s, ">=", 2) == 0)
{
- cmpltr = 6;
+ cmpltr = 1;
s += 2;
}
else
- as_bad ("Invalid Bit Branch Condition: %c", *s);
+ as_bad (_("Invalid Bit Branch Condition: %c"), *s);
}
- INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 13);
+ INSERT_FIELD_AND_CONTINUE (opcode, cmpltr, 15);
/* Handle a system control completer. */
case 'Z':
nullif = pa_parse_nullif (&s);
INSERT_FIELD_AND_CONTINUE (opcode, nullif, 5);
+
/* Handle a 11 bit immediate at 31. */
case 'i':
the_insn.field_selector = pa_chk_field_selector (&s);
continue;
}
+
/* Handle a 14 bit immediate at 31. */
case 'j':
the_insn.field_selector = pa_chk_field_selector (&s);
num = evaluate_absolute (&the_insn);
if (num % 4)
{
- as_bad ("Branch to unaligned address");
+ as_bad (_("Branch to unaligned address"));
break;
}
CHECK_FIELD (num, 8199, -8184, 0);
the_insn.reloc = R_HPPA_PCREL_CALL;
the_insn.format = 12;
the_insn.arg_reloc = last_call_desc.arg_reloc;
- bzero (&last_call_desc, sizeof (struct call_desc));
+ memset (&last_call_desc, 0, sizeof (struct call_desc));
s = expr_end;
continue;
}
num = evaluate_absolute (&the_insn);
if (num % 4)
{
- as_bad ("Branch to unaligned address");
+ as_bad (_("Branch to unaligned address"));
break;
}
CHECK_FIELD (num, 262143, -262144, 0);
the_insn.reloc = R_HPPA_PCREL_CALL;
the_insn.format = 17;
the_insn.arg_reloc = last_call_desc.arg_reloc;
- bzero (&last_call_desc, sizeof (struct call_desc));
+ memset (&last_call_desc, 0, sizeof (struct call_desc));
continue;
}
num = evaluate_absolute (&the_insn);
if (num % 4)
{
- as_bad ("Branch to unaligned address");
+ as_bad (_("Branch to unaligned address"));
break;
}
CHECK_FIELD (num, 262143, -262144, 0);
the_insn.reloc = R_HPPA_ABS_CALL;
the_insn.format = 17;
the_insn.arg_reloc = last_call_desc.arg_reloc;
- bzero (&last_call_desc, sizeof (struct call_desc));
+ memset (&last_call_desc, 0, sizeof (struct call_desc));
continue;
}
/* Handle a 5 bit immediate at 10. */
case 'Q':
+
num = pa_get_absolute_expression (&the_insn, &s);
+ if (the_insn.exp.X_op != O_constant)
+ break;
s = expr_end;
CHECK_FIELD (num, 31, 0, 0);
INSERT_FIELD_AND_CONTINUE (opcode, num, 21);
/* Handle a 3 bit SFU identifier at 25. */
case 'f':
if (*s++ != ',')
- as_bad ("Invalid SFU identifier");
+ as_bad (_("Invalid SFU identifier"));
num = pa_get_absolute_expression (&the_insn, &s);
s = expr_end;
CHECK_FIELD (num, 7, 0, 0);
/* Handle a 3-bit co-processor ID field. */
case 'u':
if (*s++ != ',')
- as_bad ("Invalid COPR identifier");
+ as_bad (_("Invalid COPR identifier"));
num = pa_get_absolute_expression (&the_insn, &s);
s = expr_end;
CHECK_FIELD (num, 7, 0, 0);
num = (num & 0x1f) | ((num & 0x003fffe0) << 4);
INSERT_FIELD_AND_CONTINUE (opcode, num, 0);
+
/* Handle a source FP operand format completer. */
case 'F':
flag = pa_parse_fp_format (&s);
continue;
}
+ /* Handle L/R register halves like 'b'. */
+ case '3':
+ {
+ struct pa_11_fp_reg_struct result;
+ int regnum;
+
+ pa_parse_number (&s, &result);
+ CHECK_FIELD (result.number_part, 31, 0, 0);
+ opcode |= (result.number_part & 0x1c) << 11;
+ opcode |= (result.number_part & 0x3) << 9;
+ opcode |= (result.l_r_select & 1) << 8;
+ continue;
+ }
+
+ /* Handle L/R register halves like 'x'. */
+ case 'e':
+ {
+ struct pa_11_fp_reg_struct result;
+
+ pa_parse_number (&s, &result);
+ CHECK_FIELD (result.number_part, 31, 0, 0);
+ opcode |= (result.number_part & 0x1f) << 16;
+ if (need_pa11_opcode (&the_insn, &result))
+ {
+ opcode |= (result.l_r_select & 1) << 1;
+ }
+ continue;
+ }
+
/* Handle L/R register halves like 'x'. */
case 'X':
{
{
if (result.number_part < 16)
{
- as_bad ("Invalid register for single precision fmpyadd or fmpysub");
+ as_bad (_("Invalid register for single precision fmpyadd or fmpysub"));
break;
}
{
if (result.number_part < 16)
{
- as_bad ("Invalid register for single precision fmpyadd or fmpysub");
+ as_bad (_("Invalid register for single precision fmpyadd or fmpysub"));
break;
}
result.number_part &= 0xF;
{
if (result.number_part < 16)
{
- as_bad ("Invalid register for single precision fmpyadd or fmpysub");
+ as_bad (_("Invalid register for single precision fmpyadd or fmpysub"));
break;
}
result.number_part &= 0xF;
{
if (result.number_part < 16)
{
- as_bad ("Invalid register for single precision fmpyadd or fmpysub");
+ as_bad (_("Invalid register for single precision fmpyadd or fmpysub"));
break;
}
result.number_part &= 0xF;
{
if (result.number_part < 16)
{
- as_bad ("Invalid register for single precision fmpyadd or fmpysub");
+ as_bad (_("Invalid register for single precision fmpyadd or fmpysub"));
break;
}
result.number_part &= 0xF;
case QUAD:
case ILLEGAL_FMT:
default:
- as_bad ("Invalid Floating Point Operand Format.");
+ as_bad (_("Invalid Floating Point Operand Format."));
}
break;
break;
}
+ failed:
/* Check if the args matched. */
if (match == FALSE)
{
- if (&insn[1] - pa_opcodes < NUMOPCODES
+ if (&insn[1] - pa_opcodes < (int) NUMOPCODES
&& !strcmp (insn->name, insn[1].name))
{
++insn;
}
else
{
- as_bad ("Invalid operands %s", error_message);
+ as_bad (_("Invalid operands %s"), error_message);
return;
}
}
default:
*sizeP = 0;
- return "Bad call to MD_ATOF()";
+ return _("Bad call to MD_ATOF()");
}
t = atof_ieee (input_line_pointer, type, words);
if (t)
assert (hppa_fixp != 0);
assert (section != 0);
- reloc = (arelent *) bfd_alloc_by_size_t (stdoutput, sizeof (arelent));
- assert (reloc != 0);
+ reloc = (arelent *) xmalloc (sizeof (arelent));
- reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym;
+ reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+ *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
codes = (bfd_reloc_code_real_type **) hppa_gen_reloc_type (stdoutput,
fixp->fx_r_type,
hppa_fixp->fx_r_format,
hppa_fixp->fx_r_field,
- fixp->fx_subsy != NULL);
+ fixp->fx_subsy != NULL,
+ symbol_get_bfdsym (fixp->fx_addsy));
+
+ if (codes == NULL)
+ abort ();
for (n_relocs = 0; codes[n_relocs]; n_relocs++)
;
- relocs = (arelent **)
- bfd_alloc_by_size_t (stdoutput, sizeof (arelent *) * n_relocs + 1);
- assert (relocs != 0);
-
- reloc = (arelent *) bfd_alloc_by_size_t (stdoutput,
- sizeof (arelent) * n_relocs);
- if (n_relocs > 0)
- assert (reloc != 0);
-
+ relocs = (arelent **) xmalloc (sizeof (arelent *) * n_relocs + 1);
+ reloc = (arelent *) xmalloc (sizeof (arelent) * n_relocs);
for (i = 0; i < n_relocs; i++)
relocs[i] = &reloc[i];
code = *codes[0];
- reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym;
+ 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 */
{
code = *codes[i];
- relocs[i]->sym_ptr_ptr = &fixp->fx_addsy->bsym;
+ relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+ *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
relocs[i]->howto = bfd_reloc_type_lookup (stdoutput, code);
relocs[i]->address = fixp->fx_frag->fr_address + fixp->fx_where;
of two symbols. With that in mind we fill in all four
relocs now and break out of the loop. */
assert (i == 1);
- relocs[0]->sym_ptr_ptr = &bfd_abs_symbol;
+ relocs[0]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
relocs[0]->howto = bfd_reloc_type_lookup (stdoutput, *codes[0]);
relocs[0]->address = fixp->fx_frag->fr_address + fixp->fx_where;
relocs[0]->addend = 0;
- relocs[0]->sym_ptr_ptr = &fixp->fx_addsy->bsym;
+ relocs[1]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+ *relocs[1]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
relocs[1]->howto = bfd_reloc_type_lookup (stdoutput, *codes[1]);
relocs[1]->address = fixp->fx_frag->fr_address + fixp->fx_where;
relocs[1]->addend = 0;
- relocs[2]->sym_ptr_ptr = &fixp->fx_subsy->bsym;
+ relocs[2]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+ *relocs[2]->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_subsy);
relocs[2]->howto = bfd_reloc_type_lookup (stdoutput, *codes[2]);
relocs[2]->address = fixp->fx_frag->fr_address + fixp->fx_where;
relocs[2]->addend = 0;
- relocs[3]->sym_ptr_ptr = &bfd_abs_symbol;
+ relocs[3]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
relocs[3]->howto = bfd_reloc_type_lookup (stdoutput, *codes[3]);
relocs[3]->address = fixp->fx_frag->fr_address + fixp->fx_where;
relocs[3]->addend = 0;
- relocs[4]->sym_ptr_ptr = &bfd_abs_symbol;
+ relocs[4]->sym_ptr_ptr = (asymbol **) &(bfd_abs_symbol);
relocs[4]->howto = bfd_reloc_type_lookup (stdoutput, *codes[4]);
relocs[4]->address = fixp->fx_frag->fr_address + fixp->fx_where;
relocs[4]->addend = 0;
case R_RSEL:
case R_BEGIN_BRTAB:
case R_END_BRTAB:
+ case R_BEGIN_TRY:
+ case R_N0SEL:
+ case R_N1SEL:
/* There is no symbol or addend associated with these fixups. */
- relocs[i]->sym_ptr_ptr = &dummy_symbol->bsym;
+ relocs[i]->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+ *relocs[i]->sym_ptr_ptr = symbol_get_bfdsym (dummy_symbol);
relocs[i]->addend = 0;
break;
+ case R_END_TRY:
case R_ENTRY:
case R_EXIT:
/* There is no symbol associated with these fixups. */
- relocs[i]->sym_ptr_ptr = &dummy_symbol->bsym;
+ 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;
relocs[i]->addend = fixp->fx_offset;
}
}
+
+ done:
#endif
-done:
return relocs;
}
return (size + align2) & ~align2;
}
-/* Create a short jump from FROM_ADDR to TO_ADDR. Not used on the PA. */
-void
-md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
- char *ptr;
- addressT from_addr, to_addr;
- fragS *frag;
- symbolS *to_symbol;
-{
- fprintf (stderr, "pa_create_short_jmp\n");
- abort ();
-}
-
-/* Create a long jump from FROM_ADDR to TO_ADDR. Not used on the PA. */
-void
-md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
- char *ptr;
- addressT from_addr, to_addr;
- fragS *frag;
- symbolS *to_symbol;
-{
- fprintf (stderr, "pa_create_long_jump\n");
- abort ();
-}
-
/* Return the approximate size of a frag before relaxation has occurred. */
int
md_estimate_size_before_relax (fragP, segment)
{
char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
struct hppa_fix_struct *hppa_fixP;
- long new_val, result;
- unsigned int w1, w2, w;
+ long new_val, result = 0;
+ unsigned int w1, w2, w, resulti;
hppa_fixP = (struct hppa_fix_struct *) fixP->tc_fix_data;
/* SOM uses R_HPPA_ENTRY and R_HPPA_EXIT relocations which can
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)
- return;
+ || fixP->fx_r_type == R_HPPA_END_BRTAB
+ || fixP->fx_r_type == R_HPPA_BEGIN_TRY)
+ return 1;
+
+ /* Disgusting. We must set fx_offset ourselves -- R_HPPA_END_TRY
+ fixups are considered not adjustable, which in turn causes
+ adjust_reloc_syms to not set fx_offset. Ugh. */
+ if (fixP->fx_r_type == R_HPPA_END_TRY)
+ {
+ fixP->fx_offset = *valp;
+ return 1;
+ }
#endif
/* There should have been an HPPA specific fixup associated
|| fixP->fx_r_type == R_HPPA_NONE)
#ifdef OBJ_SOM
&& fmt != 32
- || 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
#endif
)
- new_val = ((fmt == 12 || fmt == 17) ? 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
/* Handle pc-relative exceptions from above. */
#define arg_reloc_stub_needed(CALLER, CALLEE) \
((CALLEE) && (CALLER) && ((CALLEE) != (CALLER)))
- if ((fmt == 12 || fmt == 17)
+ if ((fmt == 12 || fmt == 17 || fmt == 22)
&& fixP->fx_addsy
&& fixP->fx_pcrel
- && !arg_reloc_stub_needed (((obj_symbol_type *)
- fixP->fx_addsy->bsym)->tc_data.hppa_arg_reloc,
- hppa_fixP->fx_arg_reloc)
- && ((int)(*valp) > -262144 && (int)(*valp) < 262143)
+#ifdef OBJ_SOM
+ && !arg_reloc_stub_needed ((long) ((obj_symbol_type *)
+ symbol_get_bfdsym (fixP->fx_addsy))->tc_data.ap.hppa_arg_reloc,
+ hppa_fixP->fx_arg_reloc)
+#endif
+ && (((int)(*valp) > -262144 && (int)(*valp) < 262143) && fmt != 22)
&& S_GET_SEGMENT (fixP->fx_addsy) == hppa_fixP->segment
&& !(fixP->fx_subsy
&& S_GET_SEGMENT (fixP->fx_subsy) != hppa_fixP->segment))
bfd_put_32 (stdoutput,
bfd_get_32 (stdoutput, buf) & 0xffffc000,
buf);
- low_sign_unext (new_val, 14, &result);
+ low_sign_unext (new_val, 14, &resulti);
+ result = resulti;
break;
/* Handle all opcodes with the 'k' operand type. */
bfd_put_32 (stdoutput,
bfd_get_32 (stdoutput, buf) & 0xffe00000,
buf);
- dis_assemble_21 (new_val, &result);
+ dis_assemble_21 (new_val, &resulti);
+ result = resulti;
break;
/* Handle all the opcodes with the 'i' operand type. */
bfd_put_32 (stdoutput,
bfd_get_32 (stdoutput, buf) & 0xffff800,
buf);
- low_sign_unext (new_val, 11, &result);
+ low_sign_unext (new_val, 11, &resulti);
+ result = resulti;
break;
/* Handle all the opcodes with the 'w' operand type. */
case 12:
- CHECK_FIELD (new_val, 8199, -8184, 0)
+ CHECK_FIELD (new_val, 8199, -8184, 0);
/* Mask off 11 bits to be changed. */
- sign_unext ((new_val - 8) >> 2, 12, &result);
+ sign_unext ((new_val - 8) >> 2, 12, &resulti);
bfd_put_32 (stdoutput,
bfd_get_32 (stdoutput, buf) & 0xffffe002,
buf);
- dis_assemble_12 (result, &w1, &w);
+ dis_assemble_12 (resulti, &w1, &w);
result = ((w1 << 2) | w);
break;
/* Handle some of the opcodes with the 'W' operand type. */
case 17:
- CHECK_FIELD (new_val, 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, &result);
- dis_assemble_17 (result, &w1, &w2, &w);
- result = ((w2 << 2) | (w1 << 16) | w);
- break;
+ {
+ 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;
+ }
case 32:
result = 0;
break;
default:
- as_bad ("Unknown relocation encountered in md_apply_fix.");
- return;
+ as_bad (_("Unknown relocation encountered in md_apply_fix."));
+ return 0;
}
/* Insert the relocation. */
bfd_put_32 (stdoutput, bfd_get_32 (stdoutput, buf) | result, buf);
- return;
+ return 1;
}
else
{
- printf ("no hppa_fixup entry for this fixup (fixP = 0x%x, type = 0x%x)\n",
+ printf (_("no hppa_fixup entry for this fixup (fixP = 0x%x, type = 0x%x)\n"),
(unsigned int) fixP, fixP->fx_r_type);
- return;
+ return 0;
}
}
else if (!isdigit (*p))
{
if (print_errors)
- as_bad ("Undefined register: '%s'.", name);
+ as_bad (_("Undefined register: '%s'."), name);
num = -1;
}
else
else
{
if (print_errors)
- as_bad ("Undefined register: '%s'.", name);
+ as_bad (_("Undefined register: '%s'."), name);
num = -1;
}
*p = c;
else
{
if (print_errors)
- as_bad ("Non-absolute symbol: '%s'.", name);
+ as_bad (_("Non-absolute symbol: '%s'."), name);
num = -1;
}
}
else
{
if (print_errors)
- as_bad ("Undefined absolute constant: '%s'.", name);
+ as_bad (_("Undefined absolute constant: '%s'."), name);
num = -1;
}
}
if (bfd_get_mach (stdoutput) < pa11)
{
if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, pa11))
- as_warn ("could not update architecture and machine");
+ as_warn (_("could not update architecture and machine"));
}
return TRUE;
}
}
}
- as_bad ("Invalid FP Compare Condition: %s", *s);
+ as_bad (_("Invalid FP Compare Condition: %s"), *s);
/* Advance over the bogus completer. */
while (**s != ',' && **s != ' ' && **s != '\t')
return 0;
}
+
/* Parse an FP operand format completer returning the completer
type. */
else
{
format = ILLEGAL_FMT;
- as_bad ("Invalid FP Operand Format: %3s", *s);
+ as_bad (_("Invalid FP Operand Format: %3s"), *s);
}
}
|| seg == undefined_section
|| SEG_NORMAL (seg)))
{
- as_warn ("Bad segment in expression.");
+ as_warn (_("Bad segment in expression."));
expr_end = input_line_pointer;
input_line_pointer = save_in;
return 1;
save_in = input_line_pointer;
input_line_pointer = *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
+ this string "4 %r5" Is that the number 4 followed by the register
+ r5, or is that 4 MOD 5?
+
+ If we get a modulo expresion When looking for an absolute, we try
+ again cutting off the input string at the first whitespace character. */
+ if (insn->exp.X_op == O_modulus)
+ {
+ char *s, c;
+ int retval;
+
+ input_line_pointer = *strp;
+ s = *strp;
+ while (*s != ',' && *s != ' ' && *s != '\t')
+ s++;
+
+ c = *s;
+ *s = 0;
+
+ retval = pa_get_absolute_expression (insn, strp);
+
+ input_line_pointer = save_in;
+ *s = c;
+ return evaluate_absolute (insn);
+ }
if (insn->exp.X_op != O_constant)
{
- as_bad ("Bad segment (should be absolute).");
+ as_bad (_("Bad segment (should be absolute)."));
expr_end = input_line_pointer;
input_line_pointer = save_in;
return 0;
else if (strncasecmp (type_name, "fu", 2) == 0)
return 3;
else
- as_bad ("Invalid argument location: %s\n", type_name);
+ as_bad (_("Invalid argument location: %s\n"), type_name);
return 0;
}
new_reloc <<= 2;
break;
default:
- as_bad ("Invalid argument description: %d", reg);
+ as_bad (_("Invalid argument description: %d"), reg);
}
return new_reloc;
nullif = 1;
else
{
- as_bad ("Invalid Nullification: (%c)", **s);
+ as_bad (_("Invalid Nullification: (%c)"), **s);
nullif = 0;
}
*s = *s + 1;
char *name = *s + 1;
char c;
char *save_s = *s;
+ int nullify = 0;
cmpltr = 0;
if (**s == ',')
*s += 1;
c = **s;
**s = 0x00;
+
+
if (strcmp (name, "=") == 0)
{
cmpltr = 1;
else if (strcasecmp (name, "n") == 0 && isbranch)
{
cmpltr = 0;
+ nullify = 1;
}
else
{
}
/* 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;
}
char *name = *s + 1;
char c;
char *save_s = *s;
+ int nullify = 0;
cmpltr = 0;
if (**s == ',')
*s += 1;
c = **s;
**s = 0x00;
+
+
if (strcasecmp (name, "tr") == 0)
{
cmpltr = 0;
else if (strcasecmp (name, "n") == 0 && isbranch)
{
cmpltr = 0;
+ nullify = 1;
}
else
{
}
/* 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 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. */
+ computational instruction). */
static int
pa_parse_neg_add_cmpltr (s, isbranch)
return cmpltr;
}
+#ifdef OBJ_SOM
/* Handle an alignment directive. Special so that we can update the
alignment of the subspace if necessary. */
static void
if (log2 (bytes) != -1)
record_alignment (current_subspace->ssd_seg, log2 (bytes));
}
+#endif
/* Handle a .BLOCK type pseudo-op. */
char *p;
long int temp_fill;
unsigned int temp_size;
- int i;
+ unsigned int i;
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
temp_size = get_absolute_expression ();
temp_fill = 0;
p = frag_var (rs_fill, (int) temp_size, (int) temp_size,
- (relax_substateT) 0, (symbolS *) 0, 1, NULL);
- bzero (p, temp_size);
+ (relax_substateT) 0, (symbolS *) 0, (offsetT) 1, NULL);
+ memset (p, 0, temp_size);
/* Convert 2 bytes at a time. */
demand_empty_rest_of_line ();
}
+/* Handle a .begin_try and .end_try pseudo-op. */
+
+static void
+pa_try (begin)
+ int begin;
+{
+#ifdef OBJ_SOM
+ expressionS exp;
+ char *where = frag_more (0);
+
+ if (! begin)
+ expression (&exp);
+
+ /* The TRY relocations are only availble 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);
+#endif
+
+ demand_empty_rest_of_line ();
+}
+
/* Handle a .CALL pseudo-op. This involves storing away information
about where arguments are to be found so the linker can detect
(and correct) argument location mismatches between caller and callee. */
pa_call (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
pa_call_args (&last_call_desc);
demand_empty_rest_of_line ();
}
else
{
- as_bad ("Invalid .CALL argument: %s", name);
+ as_bad (_("Invalid .CALL argument: %s"), name);
}
p = input_line_pointer;
*p = c;
pa_build_unwind_subspace (call_info)
struct call_info *call_info;
{
+#if 0
char *unwind;
asection *seg, *save_seg;
subsegT subseg, save_subseg;
/* Return back to the original segment/subsegment. */
subseg_set (save_seg, save_subseg);
+#endif
}
#endif
char *name, c, *p;
int temp;
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
/* .CALLINFO must appear within a procedure definition. */
if (!within_procedure)
- as_bad (".callinfo is not within a procedure definition");
+ as_bad (_(".callinfo is not within a procedure definition"));
/* Mark the fact that we found the .CALLINFO for the
current procedure. */
temp = get_absolute_expression ();
if ((temp & 0x3) != 0)
{
- as_bad ("FRAME parameter must be a multiple of 8: %d\n", temp);
+ as_bad (_("FRAME parameter must be a multiple of 8: %d\n"), temp);
temp = 0;
}
even though %r19 is caller saved. I think this is a bug in
the HP assembler, and we are not going to emulate it. */
if (temp < 3 || temp > 18)
- as_bad ("Value for ENTRY_GR must be in the range 3..18\n");
+ as_bad (_("Value for ENTRY_GR must be in the range 3..18\n"));
last_call_info->ci_unwind.descriptor.entry_gr = temp - 2;
}
else if ((strncasecmp (name, "entry_fr", 8) == 0))
/* Similarly the HP assembler takes 31 as the high bound even
though %fr21 is the last callee saved floating point register. */
if (temp < 12 || temp > 21)
- as_bad ("Value for ENTRY_FR must be in the range 12..21\n");
+ as_bad (_("Value for ENTRY_FR must be in the range 12..21\n"));
last_call_info->ci_unwind.descriptor.entry_fr = temp - 11;
}
else if ((strncasecmp (name, "entry_sr", 8) == 0))
input_line_pointer++;
temp = get_absolute_expression ();
if (temp != 3)
- as_bad ("Value for ENTRY_SR must be 3\n");
+ as_bad (_("Value for ENTRY_SR must be 3\n"));
}
/* Note whether or not this function performs any calls. */
else if ((strncasecmp (name, "calls", 5) == 0) ||
}
else
{
- as_bad ("Invalid .CALLINFO argument: %s", name);
+ as_bad (_("Invalid .CALLINFO argument: %s"), name);
*input_line_pointer = c;
}
if (!is_end_of_statement ())
pa_code (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 ();
}
/* colon() has already set the frag to the current location in the
current subspace; we need to reset the fragment to the zero address
fragment. We also need to reset the segment pointer. */
- symbol->sy_frag = &zero_address_frag;
+ symbol_set_frag (symbol, &zero_address_frag);
}
demand_empty_rest_of_line ();
}
pa_enter (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
- abort ();
+ as_bad (_("The .ENTER pseudo-op is not supported"));
+ demand_empty_rest_of_line ();
}
/* Process a .ENTRY pseudo-op. .ENTRY marks the beginning of the
pa_entry (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
if (!within_procedure)
- as_bad ("Misplaced .entry. Ignored.");
+ as_bad (_("Misplaced .entry. Ignored."));
else
{
if (!callinfo_found)
- as_bad ("Missing .callinfo.");
+ as_bad (_("Missing .callinfo."));
}
demand_empty_rest_of_line ();
within_entry_exit = TRUE;
else
{
if (reg)
- as_bad (".REG must use a label");
+ as_bad (_(".REG must use a label"));
else
- as_bad (".EQU must use a label");
+ as_bad (_(".EQU must use a label"));
}
pa_undefine_label ();
pa_exit (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
if (!within_procedure)
- as_bad (".EXIT must appear within a procedure");
+ as_bad (_(".EXIT must appear within a procedure"));
else
{
if (!callinfo_found)
- as_bad ("Missing .callinfo");
+ as_bad (_("Missing .callinfo"));
else
{
if (!within_entry_exit)
- as_bad ("No .ENTRY for this .EXIT");
+ as_bad (_("No .ENTRY for this .EXIT"));
else
{
within_entry_exit = FALSE;
/* Make sure the given symbol exists. */
if ((symbol = symbol_find_or_make (name)) == NULL)
{
- as_bad ("Cannot define export symbol: %s\n", name);
+ as_bad (_("Cannot define export symbol: %s\n"), name);
p = input_line_pointer;
*p = c;
input_line_pointer++;
char *name, c, *p;
unsigned int temp, arg_reloc;
pa_symbol_type type = SYMBOL_TYPE_UNKNOWN;
- obj_symbol_type *symbol = (obj_symbol_type *) symbolP->bsym;
+ obj_symbol_type *symbol = (obj_symbol_type *) symbol_get_bfdsym (symbolP);
if (strncasecmp (input_line_pointer, "absolute", 8) == 0)
{
input_line_pointer += 8;
- symbolP->bsym->flags &= ~BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
S_SET_SEGMENT (symbolP, bfd_abs_section_ptr);
type = SYMBOL_TYPE_ABSOLUTE;
}
Complain if one tries to EXPORT a CODE type since that's never
done. Both GCC and HP C still try to IMPORT CODE types, so
silently fix them to be ENTRY types. */
- if (symbolP->bsym->flags & BSF_FUNCTION)
+ if (S_IS_FUNCTION (symbolP))
{
if (is_export)
- as_tsktsk ("Using ENTRY rather than CODE in export directive for %s", symbolP->bsym->name);
+ as_tsktsk (_("Using ENTRY rather than CODE in export directive for %s"),
+ S_GET_NAME (symbolP));
- symbolP->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
type = SYMBOL_TYPE_ENTRY;
}
else
{
- symbolP->bsym->flags &= ~BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
type = SYMBOL_TYPE_CODE;
}
}
else if (strncasecmp (input_line_pointer, "data", 4) == 0)
{
input_line_pointer += 4;
- symbolP->bsym->flags &= ~BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
type = SYMBOL_TYPE_DATA;
}
else if ((strncasecmp (input_line_pointer, "entry", 5) == 0))
{
input_line_pointer += 5;
- symbolP->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
type = SYMBOL_TYPE_ENTRY;
}
else if (strncasecmp (input_line_pointer, "millicode", 9) == 0)
{
input_line_pointer += 9;
- symbolP->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
type = SYMBOL_TYPE_MILLICODE;
}
else if (strncasecmp (input_line_pointer, "plabel", 6) == 0)
{
input_line_pointer += 6;
- symbolP->bsym->flags &= ~BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags &= ~BSF_FUNCTION;
type = SYMBOL_TYPE_PLABEL;
}
else if (strncasecmp (input_line_pointer, "pri_prog", 8) == 0)
{
input_line_pointer += 8;
- symbolP->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
type = SYMBOL_TYPE_PRI_PROG;
}
else if (strncasecmp (input_line_pointer, "sec_prog", 8) == 0)
{
input_line_pointer += 8;
- symbolP->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbolP)->flags |= BSF_FUNCTION;
type = SYMBOL_TYPE_SEC_PROG;
}
than BFD understands. This is how we get this information
to the SOM BFD backend. */
#ifdef obj_set_symbol_type
- obj_set_symbol_type (symbolP->bsym, (int) type);
+ obj_set_symbol_type (symbol_get_bfdsym (symbolP), (int) type);
#endif
/* Now that the type of the exported symbol has been handled,
name = input_line_pointer;
c = get_symbol_end ();
arg_reloc = pa_align_arg_reloc (temp, pa_build_arg_reloc (name));
- symbol->tc_data.hppa_arg_reloc |= arg_reloc;
+#ifdef OBJ_SOM
+ symbol->tc_data.ap.hppa_arg_reloc |= arg_reloc;
+#endif
*input_line_pointer = c;
}
/* The return value. */
name = input_line_pointer;
c = get_symbol_end ();
arg_reloc = pa_build_arg_reloc (name);
- symbol->tc_data.hppa_arg_reloc |= arg_reloc;
+#ifdef OBJ_SOM
+ symbol->tc_data.ap.hppa_arg_reloc |= arg_reloc;
+#endif
*input_line_pointer = c;
}
/* Privelege level. */
*p = c;
input_line_pointer++;
temp = atoi (input_line_pointer);
+#ifdef OBJ_SOM
+ symbol->tc_data.ap.hppa_priv_level = temp;
+#endif
c = get_symbol_end ();
*input_line_pointer = c;
}
else
{
- as_bad ("Undefined .EXPORT/.IMPORT argument (ignored): %s", name);
+ as_bad (_("Undefined .EXPORT/.IMPORT argument (ignored): %s"), name);
p = input_line_pointer;
*p = c;
}
the 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->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (symbol)->flags |= BSF_FUNCTION;
/* If the section is undefined, then the symbol is undefined
Since this is an import, leave the section undefined. */
}
else
{
- as_warn ("Missing label name on .LABEL");
+ as_warn (_("Missing label name on .LABEL"));
}
if (!is_end_of_statement ())
{
- as_warn ("extra .LABEL arguments ignored.");
+ as_warn (_("extra .LABEL arguments ignored."));
ignore_rest_of_line ();
}
demand_empty_rest_of_line ();
pa_leave (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
- abort ();
+ as_bad (_("The .LEAVE pseudo-op is not supported"));
+ demand_empty_rest_of_line ();
+}
+
+/* Handle a .LEVEL pseudo-op. */
+
+static void
+pa_level (unused)
+ int unused;
+{
+ char *level;
+
+ level = input_line_pointer;
+ if (strncmp (level, "1.0", 3) == 0)
+ {
+ input_line_pointer += 3;
+ if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10))
+ as_warn (_("could not set architecture and machine"));
+ }
+ else if (strncmp (level, "1.1", 3) == 0)
+ {
+ input_line_pointer += 3;
+ if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 11))
+ as_warn (_("could not set architecture and machine"));
+ }
+ else if (strncmp (level, "2.0", 3) == 0)
+ {
+ input_line_pointer += 3;
+ if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 20))
+ as_warn (_("could not set architecture and machine"));
+ }
+ else
+ {
+ as_bad (_("Unrecognized .LEVEL argument\n"));
+ ignore_rest_of_line ();
+ }
+ demand_empty_rest_of_line ();
}
/* Handle a .ORIGIN pseudo-op. */
pa_origin (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
s_org (0);
pa_undefine_label ();
if ((symbol = symbol_find_or_make (name)) == NULL)
{
- as_bad ("Cannot define static symbol: %s\n", name);
+ as_bad (_("Cannot define static symbol: %s\n"), name);
p = input_line_pointer;
*p = c;
input_line_pointer++;
{
struct call_info *call_info;
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
if (within_procedure)
- as_fatal ("Nested procedures");
+ as_fatal (_("Nested procedures"));
/* Reset global variables for new procedure. */
callinfo_found = FALSE;
call_info = (struct call_info *) xmalloc (sizeof (struct call_info));
if (!call_info)
- as_fatal ("Cannot allocate unwind descriptor\n");
+ as_fatal (_("Cannot allocate unwind descriptor\n"));
- bzero (call_info, sizeof (struct call_info));
+ memset (call_info, 0, sizeof (struct call_info));
call_info->ci_next = NULL;
if (label_symbol->lss_label)
{
last_call_info->start_symbol = label_symbol->lss_label;
- label_symbol->lss_label->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (label_symbol->lss_label)->flags |= BSF_FUNCTION;
}
else
- as_bad ("Missing function name for .PROC (corrupted label chain)");
+ as_bad (_("Missing function name for .PROC (corrupted label chain)"));
}
else
last_call_info->start_symbol = NULL;
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
/* If we are within a procedure definition, make sure we've
defined a label for the procedure; handle case where the
if (label_symbol->lss_label)
{
last_call_info->start_symbol = label_symbol->lss_label;
- label_symbol->lss_label->bsym->flags |= BSF_FUNCTION;
+ symbol_get_bfdsym (label_symbol->lss_label)->flags
+ |= BSF_FUNCTION;
#ifdef OBJ_SOM
/* Also handle allocation of a fixup to hold the unwind
information when the label appears after the proc/procend. */
#endif
}
else
- as_bad ("Missing function name for .PROC (corrupted label chain)");
+ as_bad (_("Missing function name for .PROC (corrupted label chain)"));
}
else
- as_bad ("Missing function name for .PROC");
+ as_bad (_("Missing function name for .PROC"));
}
if (!within_procedure)
- as_bad ("misplaced .procend");
+ as_bad (_("misplaced .procend"));
if (!callinfo_found)
- as_bad ("Missing .callinfo for this procedure");
+ as_bad (_("Missing .callinfo for this procedure"));
if (within_entry_exit)
- as_bad ("Missing .EXIT for a .ENTRY");
+ as_bad (_("Missing .EXIT for a .ENTRY"));
#ifdef OBJ_ELF
/* ELF needs to mark the end of each function so that it can compute
pa_undefine_label ();
}
+/* If VALUE is an exact power of two between zero and 2^31, then
+ return log2 (VALUE). Else return -1. */
+
+static int
+log2 (value)
+ int value;
+{
+ int shift = 0;
+
+ while ((1 << shift) != value && shift < 32)
+ shift++;
+
+ if (shift >= 32)
+ return -1;
+ else
+ return shift;
+}
+
+
+#ifdef OBJ_SOM
+/* Check to make sure we have a valid space and subspace. */
+
+static void
+pa_check_current_space_and_subspace ()
+{
+ if (current_space == NULL)
+ as_fatal (_("Not in a space.\n"));
+
+ if (current_subspace == NULL)
+ as_fatal (_("Not in a subspace.\n"));
+}
+
/* Parse the parameters to a .SPACE directive; if CREATE_FLAG is nonzero,
then create a new space entry to hold the information specified
by the parameters to the .SPACE directive. */
}
else
{
- as_bad ("Invalid .SPACE argument");
+ as_bad (_("Invalid .SPACE argument"));
*input_line_pointer = c;
if (!is_end_of_statement ())
input_line_pointer++;
if (within_procedure)
{
- as_bad ("Can\'t change spaces within a procedure definition. Ignored");
+ as_bad (_("Can\'t change spaces within a procedure definition. Ignored"));
ignore_rest_of_line ();
}
else
md_number_to_chars (p, SPACE_SPNUM (space), 4);
}
else
- as_warn ("Undefined space: '%s' Assuming space number = 0.", name);
+ as_warn (_("Undefined space: '%s' Assuming space number = 0."), name);
*input_line_pointer = c;
demand_empty_rest_of_line ();
}
-/* If VALUE is an exact power of two between zero and 2^31, then
- return log2 (VALUE). Else return -1. */
-
-static int
-log2 (value)
- int value;
-{
- int shift = 0;
-
- while ((1 << shift) != value && shift < 32)
- shift++;
-
- if (shift >= 32)
- return -1;
- else
- return shift;
-}
-
/* Handle a .SUBSPACE pseudo-op; this switches the current subspace to the
given subspace, creating the new subspace if necessary.
pa_subspace (create_new)
int create_new;
{
- char *name, *ss_name, *alias, c;
+ char *name, *ss_name, c;
char loadable, code_only, common, dup_common, zero, sort;
int i, access, space_index, alignment, quadrant, applicable, flags;
sd_chain_struct *space;
asection *section;
if (current_space == NULL)
- as_fatal ("Must be in a space before changing or declaring subspaces.\n");
+ as_fatal (_("Must be in a space before changing or declaring subspaces.\n"));
if (within_procedure)
{
- as_bad ("Can\'t change subspaces within a procedure definition. Ignored");
+ as_bad (_("Can\'t change subspaces within a procedure definition. Ignored"));
ignore_rest_of_line ();
}
else
space_index = ~0;
alignment = 1;
quadrant = 0;
- alias = NULL;
space = current_space;
if (create_new)
subseg_set (ssd->ssd_seg, ssd->ssd_subseg);
current_subspace = ssd;
if (!is_end_of_statement ())
- as_warn ("Parameters of an existing subspace can\'t be modified");
+ as_warn (_("Parameters of an existing subspace can\'t be modified"));
demand_empty_rest_of_line ();
return;
}
quadrant = pa_def_subspaces[i].quadrant;
access = pa_def_subspaces[i].access;
sort = pa_def_subspaces[i].sort;
- if (USE_ALIASES && pa_def_subspaces[i].alias)
- alias = pa_def_subspaces[i].alias;
break;
}
i++;
alignment = get_absolute_expression ();
if (log2 (alignment) == -1)
{
- as_bad ("Alignment must be a power of 2");
+ as_bad (_("Alignment must be a power of 2"));
alignment = 1;
}
}
zero = 1;
}
else if ((strncasecmp (name, "first", 5) == 0))
- as_bad ("FIRST not supported as a .SUBSPACE argument");
+ as_bad (_("FIRST not supported as a .SUBSPACE argument"));
else
- as_bad ("Invalid .SUBSPACE argument");
+ as_bad (_("Invalid .SUBSPACE argument"));
if (!is_end_of_statement ())
input_line_pointer++;
}
section = subseg_force_new (ss_name, 0);
else if (ssd)
section = ssd->ssd_seg;
- else if (alias)
- section = subseg_new (alias, 0);
- else if (!alias && USE_ALIASES)
- {
- as_warn ("Ignoring subspace decl due to ELF BFD bugs.");
- demand_empty_rest_of_line ();
- return;
- }
else
section = subseg_new (ss_name, 0);
char *name;
/* Pick the right name to use for the new section. */
- if (pa_def_spaces[i].alias && USE_ALIASES)
- name = pa_def_spaces[i].alias;
- else
- name = pa_def_spaces[i].name;
+ name = pa_def_spaces[i].name;
pa_def_spaces[i].segment = subseg_new (name, 0);
create_new_space (pa_def_spaces[i].name, pa_def_spaces[i].spnum,
/* Pick the right name for the new section and pick the right
subsegment number. */
- if (pa_def_subspaces[i].alias && USE_ALIASES)
- {
- name = pa_def_subspaces[i].alias;
- subsegment = pa_def_subspaces[i].subsegment;
- }
- else
- {
- name = pa_def_subspaces[i].name;
- subsegment = 0;
- }
+ name = pa_def_subspaces[i].name;
+ subsegment = 0;
/* 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. */
- if (!strcmp (pa_def_subspaces[i].name, "$CODE$") && !USE_ALIASES)
+ if (!strcmp (pa_def_subspaces[i].name, "$CODE$"))
{
text_section = segment;
applicable = bfd_applicable_section_flags (stdoutput);
| SEC_READONLY
| SEC_HAS_CONTENTS));
}
- else if (!strcmp (pa_def_subspaces[i].name, "$DATA$") && !USE_ALIASES)
+ else if (!strcmp (pa_def_subspaces[i].name, "$DATA$"))
{
data_section = segment;
applicable = bfd_applicable_section_flags (stdoutput);
}
- else if (!strcmp (pa_def_subspaces[i].name, "$BSS$") && !USE_ALIASES)
+ else if (!strcmp (pa_def_subspaces[i].name, "$BSS$"))
{
bss_section = segment;
applicable = bfd_applicable_section_flags (stdoutput);
bfd_set_section_flags (stdoutput, segment,
applicable & SEC_ALLOC);
}
- else if (!strcmp (pa_def_subspaces[i].name, "$LIT$") && !USE_ALIASES)
+ else if (!strcmp (pa_def_subspaces[i].name, "$LIT$"))
+ {
+ applicable = bfd_applicable_section_flags (stdoutput);
+ bfd_set_section_flags (stdoutput, segment,
+ applicable & (SEC_ALLOC | SEC_LOAD
+ | SEC_RELOC
+ | SEC_READONLY
+ | SEC_HAS_CONTENTS));
+ }
+ else if (!strcmp (pa_def_subspaces[i].name, "$MILLICODE$"))
{
applicable = bfd_applicable_section_flags (stdoutput);
bfd_set_section_flags (stdoutput, segment,
| SEC_READONLY
| SEC_HAS_CONTENTS));
}
- else if (!strcmp (pa_def_subspaces[i].name, "$UNWIND$") && !USE_ALIASES)
+ else if (!strcmp (pa_def_subspaces[i].name, "$UNWIND$"))
{
applicable = bfd_applicable_section_flags (stdoutput);
bfd_set_section_flags (stdoutput, segment,
def_space_index].segment);
if (space == NULL)
{
- as_fatal ("Internal error: Unable to find containing space for %s.",
+ as_fatal (_("Internal error: Unable to find containing space for %s."),
pa_def_subspaces[i].name);
}
chain_entry = (sd_chain_struct *) xmalloc (sizeof (sd_chain_struct));
if (!chain_entry)
- as_fatal ("Out of memory: could not allocate new space chain entry: %s\n",
+ as_fatal (_("Out of memory: could not allocate new space chain entry: %s\n"),
name);
SPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1);
chain_entry = (ssd_chain_struct *) xmalloc (sizeof (ssd_chain_struct));
if (!chain_entry)
- as_fatal ("Out of memory: could not allocate new subspace chain entry: %s\n", name);
+ as_fatal (_("Out of memory: could not allocate new subspace chain entry: %s\n"), name);
SUBSPACE_NAME (chain_entry) = (char *) xmalloc (strlen (name) + 1);
strcpy (SUBSPACE_NAME (chain_entry), name);
we'll set it to 1 which "locks-in" the subspace attributes. */
SUBSPACE_DEFINED (chain_entry) = 0;
- chain_entry->ssd_subseg = USE_ALIASES ? pa_next_subseg (space) : 0;
+ chain_entry->ssd_subseg = 0;
chain_entry->ssd_seg = seg;
chain_entry->ssd_next = NULL;
space_chain;
space_chain = space_chain->sd_next)
{
- if (SPACE_SPNUM (space_chain) == number)
+ if (SPACE_SPNUM (space_chain) == (unsigned int) number)
return space_chain;
}
return 0x40000000;
else
return 0;
+ return 0;
}
/* FIXME. Needs documentation. */
space->sd_last_subseg++;
return space->sd_last_subseg;
}
+#endif
/* Helper function for pa_stringer. Used to find the end of
a string. */
{
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)
{
pa_undefine_label ();
}
+#ifdef OBJ_SOM
+
+/* Handle a .COMPILER pseudo-op. */
+
+static void
+pa_compiler (unused)
+ int unused;
+{
+ obj_som_compiler (0);
+ pa_undefine_label ();
+}
+
+#endif
+
/* Handle a .COPYRIGHT pseudo-op. */
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 ();
}
pa_fill (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
s_fill (0);
pa_undefine_label ();
pa_lcomm (needs_align)
int needs_align;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
s_lcomm (needs_align);
pa_undefine_label ();
pa_lsym (unused)
int unused;
{
+#ifdef OBJ_SOM
/* We must have a valid space and subspace. */
pa_check_current_space_and_subspace ();
+#endif
s_lsym (0);
pa_undefine_label ();
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 ();
&& (hppa_fix->segment->flags & SEC_CODE))
{
/* Apparently sy_used_in_reloc never gets set for sub symbols. */
- fixp->fx_subsy->sy_used_in_reloc = 1;
+ symbol_mark_used_in_reloc (fixp->fx_subsy);
return 0;
}
- /* We can't adjust DP relative relocs that use LR% and RR% field
- selectors. That confuses the optimization pass in HP linker. */
- if (fixp->fx_r_type == R_DP_RELATIVE
- && (hppa_fix->fx_r_field == e_lrsel
- || hppa_fix->fx_r_field == e_rrsel))
+ /* We can't adjust any relocs that use LR% and RR% field selectors.
+ That confuses the HP linker. */
+ 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
|| hppa_fix->fx_r_field == e_lpsel)
return 0;
- if (fixp->fx_addsy && fixp->fx_addsy->bsym->flags & BSF_GLOBAL)
+ 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
- || (fixp->fx_addsy->bsym->flags & BSF_FUNCTION) == 0)
+ if (fixp->fx_addsy == 0 || ! S_IS_FUNCTION (fixp->fx_addsy))
return 1;
return 0;
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
|| (fixp->fx_addsy != NULL && fixp->fx_subsy != NULL
&& (hppa_fixp->segment->flags & SEC_CODE) != 0))
return 1;
#define arg_reloc_stub_needed(CALLER, CALLEE) \
((CALLEE) && (CALLER) && ((CALLEE) != (CALLER)))
+#ifdef OBJ_SOM
/* It is necessary to force PC-relative calls/jumps to have a relocation
entry if they're going to need either a argument relocation or long
call stub. FIXME. Can't we need the same for absolute calls? */
if (fixp->fx_pcrel && fixp->fx_addsy
- && (arg_reloc_stub_needed (((obj_symbol_type *)
- fixp->fx_addsy->bsym)->tc_data.hppa_arg_reloc,
-
- hppa_fixp->fx_arg_reloc)))
+ && (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)))
return 1;
+#endif
distance = (fixp->fx_offset + S_GET_VALUE (fixp->fx_addsy)
- md_pcrel_from (fixp));
/* Now check and see if we're going to need a long-branch stub. */
&& (distance > 262143 || distance < -262144))
return 1;
+ if (fixp->fx_r_type == R_HPPA_ABS_CALL)
+ return 1;
#undef arg_reloc_stub_needed
/* No need (yet) to force another relocations to be emitted. */
frag_now);
assert (symbolP);
- symbolP->bsym->flags = BSF_LOCAL;
+ S_CLEAR_EXTERNAL (symbolP);
symbol_table_insert (symbolP);
}
if (symbolP)
last_call_info->end_symbol = symbolP;
else
- as_bad ("Symbol '%s' could not be created.", name);
+ as_bad (_("Symbol '%s' could not be created."), name);
}
else
- as_bad ("No memory for symbol name.");
+ as_bad (_("No memory for symbol name."));
}
call_info_pointer = call_info_pointer->ci_next)
{
elf_symbol_type *esym
- = (elf_symbol_type *) call_info_pointer->start_symbol->bsym;
+ = ((elf_symbol_type *)
+ symbol_get_bfdsym (call_info_pointer->start_symbol));
esym->internal_elf_sym.st_size =
S_GET_VALUE (call_info_pointer->end_symbol)
- S_GET_VALUE (call_info_pointer->start_symbol) + 4;
projects / deliverable / binutils-gdb.git / blobdiff