espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 22:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/tc-mips.c (append_insn): Handle constant expressions with

Browse Source 
no associated relocation.
(mips_ip): Cancel the expression after use for the Q format
specifier.
(parse_relocation): Return no relocation for unsupported
operators.
(my_getSmallExpression): Return no relocation if no relocation
operators are used.
This commit is contained in:
Maciej W. Rozycki
2004-07-20 17:55:02 +00:00
parent 1586d91e32
commit 01a3f561ab
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gas/ChangeLog
View File

@ -1,3 +1,14 @@
2004-07-20 Maciej W. Rozycki <macro@linux-mips.org>
* config/tc-mips.c (append_insn): Handle constant expressions with
no associated relocation.
(mips_ip): Cancel the expression after use for the Q format
specifier.
(parse_relocation): Return no relocation for unsupported
operators.
(my_getSmallExpression): Return no relocation if no relocation
operators are used.
2004-07-19 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> 2004-07-19 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
* config/obj-som.c (adjust_stab_sections): Add prototype. * config/obj-som.c (adjust_stab_sections): Add prototype.

15
gas/config/tc-mips.c
View File

@ -2083,7 +2083,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr,
} }
fixp[0] = fixp[1] = fixp[2] = NULL; fixp[0] = fixp[1] = fixp[2] = NULL;
if (address_expr != NULL && *reloc_type < BFD_RELOC_UNUSED) if (address_expr != NULL && *reloc_type <= BFD_RELOC_UNUSED)
{ {
if (address_expr->X_op == O_constant) if (address_expr->X_op == O_constant)
{ {
@ -2116,6 +2116,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr,
ip->insn_opcode |= (address_expr->X_add_number >> 16) & 0xffff; ip->insn_opcode |= (address_expr->X_add_number >> 16) & 0xffff;
break; break;
case BFD_RELOC_UNUSED:
case BFD_RELOC_LO16: case BFD_RELOC_LO16:
case BFD_RELOC_MIPS_GOT_DISP: case BFD_RELOC_MIPS_GOT_DISP:
ip->insn_opcode |= address_expr->X_add_number & 0xffff; ip->insn_opcode |= address_expr->X_add_number & 0xffff;
@ -2151,7 +2152,7 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr,
internalError (); internalError ();
} }
} }
else else if (*reloc_type < BFD_RELOC_UNUSED)
need_reloc: need_reloc:
{ {
reloc_howto_type *howto; reloc_howto_type *howto;
@ -8600,6 +8601,7 @@ do_msbd:
ip->insn_opcode |= (imm_expr.X_add_number ip->insn_opcode |= (imm_expr.X_add_number
<< (OP_SH_VSEL + << (OP_SH_VSEL +
(is_qh ? 2 : 1))); (is_qh ? 2 : 1)));
imm_expr.X_op = O_absent;
if (*s != ']') if (*s != ']')
as_warn(_("Expecting ']' found '%s'"), s); as_warn(_("Expecting ']' found '%s'"), s);
else else
@ -9813,7 +9815,7 @@ parse_relocation (char **str, bfd_reloc_code_real_type *reloc)
{ {
as_bad ("relocation %s isn't supported by the current ABI", as_bad ("relocation %s isn't supported by the current ABI",
percent_op[i].str); percent_op[i].str);
*reloc = BFD_RELOC_LO16; *reloc = BFD_RELOC_UNUSED;
} }
return TRUE; return TRUE;
} }
@ -9825,8 +9827,7 @@ parse_relocation (char **str, bfd_reloc_code_real_type *reloc)
expression in *EP and the relocations in the array starting expression in *EP and the relocations in the array starting
at RELOC. Return the number of relocation operators used. at RELOC. Return the number of relocation operators used.
On exit, EXPR_END points to the first character after the expression. On exit, EXPR_END points to the first character after the expression. */
If no relocation operators are used, RELOC[0] is set to BFD_RELOC_LO16. */
static size_t static size_t
my_getSmallExpression (expressionS *ep, bfd_reloc_code_real_type *reloc, my_getSmallExpression (expressionS *ep, bfd_reloc_code_real_type *reloc,
@ -9872,9 +9873,7 @@ my_getSmallExpression (expressionS *ep, bfd_reloc_code_real_type *reloc,
expr_end = str; expr_end = str;
if (reloc_index == 0) if (reloc_index != 0)
reloc[0] = BFD_RELOC_LO16;
else
{ {
prev_reloc_op_frag = frag_now; prev_reloc_op_frag = frag_now;
for (i = 0; i < reloc_index; i++) for (i = 0; i < reloc_index; i++)