/* GAS interface for targets using CGEN: Cpu tools GENerator.
- Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996-2015 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
along with GAS; see the file COPYING. If not, write to the Free Software
Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
-#include <setjmp.h>
#include "as.h"
+#include <setjmp.h>
#include "symcat.h"
#include "cgen-desc.h"
#include "subsegs.h"
#ifdef TC_CGEN_PARSE_FIX_EXP
opinfo_1 = TC_CGEN_PARSE_FIX_EXP (opinfo_1, & exp);
-#endif
+#endif
/* FIXME: Need to check `want'. */
if (exp.X_op == O_symbol
&& reloc_type == BFD_RELOC_RELC
&& exp.X_add_symbol->sy_value.X_op == O_constant
- && exp.X_add_symbol->bsym->section != expr_section
- && exp.X_add_symbol->bsym->section != absolute_section
- && exp.X_add_symbol->bsym->section != undefined_section)
+ && (!exp.X_add_symbol->bsym
+ || (exp.X_add_symbol->bsym->section != expr_section
+ && exp.X_add_symbol->bsym->section != absolute_section
+ && exp.X_add_symbol->bsym->section != undefined_section)))
{
/* Local labels will have been (eagerly) turned into constants
by now, due to the inappropriately deep insight of the
stmp = symbol_create (FAKE_LABEL_NAME, expr_section, 0,
& zero_address_frag);
symbol_set_value_expression (stmp, & exp);
- }
- else
+ }
+ else
stmp = make_expr_symbol (& exp);
/* If this is a pc-relative RELC operand, we
- need to subtract "." from the expression. */
+ need to subtract "." from the expression. */
if (reloc_type == BFD_RELOC_RELC
&& CGEN_OPERAND_ATTR_VALUE (operand, CGEN_OPERAND_PCREL_ADDR))
- stmp = expr_build_binary (O_subtract, stmp, expr_build_dot ());
+ stmp = expr_build_binary (O_subtract, stmp, expr_build_dot ());
/* FIXME: this is not a perfect heuristic for figuring out
whether an operand is signed: it only works when the operand
values will be signed relocs, but it's possible. */
if (operand && (operand->hw_type == HW_H_SINT))
signed_p = 1;
-
- if (stmp->bsym && (stmp->bsym->section == expr_section))
+
+ if (stmp->bsym && (stmp->bsym->section == expr_section)
+ && ! S_IS_LOCAL (stmp))
{
if (signed_p)
stmp->bsym->flags |= BSF_SRELC;
else
stmp->bsym->flags |= BSF_RELC;
}
-
+
/* Now package it all up for the fixup emitter. */
exp.X_op = O_symbol;
exp.X_op_symbol = 0;
exp.X_add_symbol = stmp;
exp.X_add_number = 0;
-
+
/* Re-init rightshift quantity, just in case. */
rightshift = operand->length;
- queue_fixup_recursively (opindex, opinfo_1, & exp,
+ queue_fixup_recursively (opindex, opinfo_1, & exp,
(reloc_type == BFD_RELOC_RELC) ?
& (operand->index_fields) : 0,
signed_p, -1);
queue_fixup (opindex, opinfo_1, &exp);
*valueP = 0;
*resultP = CGEN_PARSE_OPERAND_RESULT_QUEUED;
-#endif
+#endif
break;
}
if (field && field->count)
{
int i;
-
+
for (i = 0; i < field->count; ++ i)
- queue_fixup_recursively (opindex, opinfo, expP,
+ queue_fixup_recursively (opindex, opinfo, expP,
& (field->val.multi[i]), signed_p, i);
}
else
/* Shift reloc value by number of bits remaining after this
field. */
if (rightshift)
- new_exp = make_right_shifted_expr (expP, rightshift, signed_p);
+ new_exp = make_right_shifted_expr (expP, rightshift, signed_p);
}
-
+
/* Truncate reloc values to length, *after* leftmost one. */
fixups[num_fixups].msb_field_p = (part_of_multi <= 0);
fixups[num_fixups].field = (CGEN_MAYBE_MULTI_IFLD *) field;
-
+
queue_fixup (opindex, opinfo, new_exp);
}
}
/* Encode the self-describing RELC reloc format's addend. */
-static unsigned long
+static unsigned long
gas_cgen_encode_addend (const unsigned long start, /* in bits */
const unsigned long len, /* in bits */
const unsigned long oplen, /* in bits */
parse. when these %operators are translated to expressions by the macro
expander, the ambiguity returns. we attempt to disambiguate by field
size.
-
+
Method: check to see if the expression's top node is an O_and operator,
and the mask is larger than the operand length. This would be an
overflow, so signal it by returning an error string. Any other case is
if (exp->X_op != O_bit_and)
{
/* Check for implicit overflow flag. */
- if (CGEN_OPERAND_ATTR_VALUE
+ if (CGEN_OPERAND_ATTR_VALUE
(operand, CGEN_OPERAND_RELOC_IMPLIES_OVERFLOW))
return _("a reloc on this operand implies an overflow");
return NULL;
}
-
+
mask = exp->X_add_number;
- if (exp->X_add_symbol &&
- exp->X_add_symbol->sy_value.X_op == O_constant)
+ if (exp->X_add_symbol
+ && exp->X_add_symbol->sy_value.X_op == O_constant)
mask |= exp->X_add_symbol->sy_value.X_add_number;
- if (exp->X_op_symbol &&
- exp->X_op_symbol->sy_value.X_op == O_constant)
+ if (exp->X_op_symbol
+ && exp->X_op_symbol->sy_value.X_op == O_constant)
mask |= exp->X_op_symbol->sy_value.X_add_number;
- /* Want to know if mask covers more bits than opmask.
+ /* Want to know if mask covers more bits than opmask.
this is the same as asking if mask has any bits not in opmask,
or whether (mask & ~opmask) is nonzero. */
if (mask && (mask & ~opmask))
return _("operand mask overflow");
}
- return NULL;
+ return NULL;
}
-
static expressionS *
make_right_shifted_expr (expressionS * exp,
const int amount,
symbolS * stmp = 0;
expressionS * new_exp;
- stmp = expr_build_binary (O_right_shift,
+ stmp = expr_build_binary (O_right_shift,
make_expr_symbol (exp),
expr_build_uconstant (amount));
-
+
if (signed_p)
stmp->bsym->flags |= BSF_SRELC;
else
stmp->bsym->flags |= BSF_RELC;
-
+
/* Then wrap that in a "symbol expr" for good measure. */
new_exp = xmalloc (sizeof (expressionS));
memset (new_exp, 0, sizeof (expressionS));
new_exp->X_op_symbol = 0;
new_exp->X_add_symbol = stmp;
new_exp->X_add_number = 0;
-
+
return new_exp;
}
+
#endif
+
/* Apply a fixup to the object code. This is called for all the
fixups we generated by the call to fix_new_exp, above. In the call
above we used a reloc code which was the largest legal reloc code
bfd_reloc_code_real_type reloc_type;
CGEN_FIELDS *fields = alloca (CGEN_CPU_SIZEOF_FIELDS (cd));
const CGEN_INSN *insn = fixP->fx_cgen.insn;
+#ifdef OBJ_COMPLEX_RELC
int start;
int length;
int signed_p = 0;
if (fixP->fx_cgen.field)
- {
+ {
/* Use the twisty little pointer path
back to the ifield if it exists. */
start = fixP->fx_cgen.field->val.leaf->start;
values will be signed relocs, but it's possible. */
if (operand && (operand->hw_type == HW_H_SINT))
signed_p = 1;
+#endif
/* If the reloc has been fully resolved finish the operand here. */
/* FIXME: This duplicates the capabilities of code in BFD. */
/* Change addend to "self-describing" form,
for BFD to handle in the linker. */
value = gas_cgen_encode_addend (start, operand->length,
- length, fixP->fx_size,
- cd->insn_chunk_bitsize / 8,
- signed_p,
+ length, fixP->fx_size,
+ cd->insn_chunk_bitsize / 8,
+ signed_p,
! (fixP->fx_cgen.msb_field_p));
}
#endif
fixP->fx_addnumber = value;
}
+bfd_reloc_code_real_type
+gas_cgen_pcrel_r_type (bfd_reloc_code_real_type r)
+{
+ switch (r)
+ {
+ case BFD_RELOC_8: r = BFD_RELOC_8_PCREL; break;
+ case BFD_RELOC_16: r = BFD_RELOC_16_PCREL; break;
+ case BFD_RELOC_24: r = BFD_RELOC_24_PCREL; break;
+ case BFD_RELOC_32: r = BFD_RELOC_32_PCREL; break;
+ case BFD_RELOC_64: r = BFD_RELOC_64_PCREL; break;
+ default:
+ break;
+ }
+ return r;
+}
+
/* Translate internal representation of relocation info to BFD target format.
FIXME: To what extent can we get all relevant targets to use this? */
asection * section ATTRIBUTE_UNUSED;
fixS * fixP;
{
+ bfd_reloc_code_real_type r_type = fixP->fx_r_type;
arelent *reloc;
+
reloc = (arelent *) xmalloc (sizeof (arelent));
- reloc->howto = bfd_reloc_type_lookup (stdoutput, fixP->fx_r_type);
+#ifdef GAS_CGEN_PCREL_R_TYPE
+ if (fixP->fx_pcrel)
+ r_type = GAS_CGEN_PCREL_R_TYPE (r_type);
+#endif
+ reloc->howto = bfd_reloc_type_lookup (stdoutput, r_type);
+
if (reloc->howto == (reloc_howto_type *) NULL)
{
as_bad_where (fixP->fx_file, fixP->fx_line,
return NULL;
}
- assert (!fixP->fx_pcrel == !reloc->howto->pc_relative);
+ gas_assert (!fixP->fx_pcrel == !reloc->howto->pc_relative);
reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
*reloc->sym_ptr_ptr = symbol_get_bfdsym (fixP->fx_addsy);
else
cgen_clear_signed_overflow_ok (gas_cgen_cpu_desc);
}
-