aboutsummaryrefslogtreecommitdiff
path: root/gas/config/tc-arc.c
diff options
context:
space:
mode:
Diffstat (limited to 'gas/config/tc-arc.c')
-rw-r--r--gas/config/tc-arc.c47
1 files changed, 18 insertions, 29 deletions
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 30d6cb9..be1c79a 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -522,7 +522,7 @@ static unsigned cl_features = 0;
#define ARC_RELOC_TABLE(op) \
(&arc_reloc_op[ ((!USER_RELOC_P (op)) \
? (abort (), 0) \
- : (int) (op) - (int) O_gotoff) ])
+ : (op) - O_gotoff) ])
#define DEF(NAME, RELOC, REQ) \
{ #NAME, sizeof (#NAME)-1, O_##NAME, RELOC, REQ}
@@ -686,7 +686,7 @@ const unsigned arc_num_relaxable_ins = ARRAY_SIZE (arc_relaxable_insns);
/* Pre-defined "_GLOBAL_OFFSET_TABLE_". */
symbolS * GOT_symbol = 0;
-/* Set to TRUE when we assemble instructions. */
+/* Set to TRUE for a special parsing action when assembling instructions. */
static bool assembling_insn = false;
/* List with attributes set explicitly. */
@@ -778,7 +778,7 @@ arc_insert_opcode (const struct arc_opcode *opcode)
static void
arc_opcode_free (void *elt)
{
- string_tuple_t *tuple = (string_tuple_t *) elt;
+ string_tuple_t *tuple = elt;
struct arc_opcode_hash_entry *entry = (void *) tuple->value;
free (entry->opcode);
free (entry);
@@ -1275,9 +1275,8 @@ tokenize_arguments (char *str,
/* Parse @label. */
input_line_pointer++;
- tok->X_op = O_symbol;
- tok->X_md = O_absent;
expression (tok);
+ tok->X_md = O_absent;
if (*input_line_pointer == '@')
parse_reloc_symbol (tok);
@@ -1304,9 +1303,11 @@ tokenize_arguments (char *str,
if ((saw_arg && !saw_comma) || num_args == ntok)
goto err;
- tok->X_op = O_absent;
- tok->X_md = O_absent;
+ /* Tell arc_parse_name to do its job. */
+ assembling_insn = true;
expression (tok);
+ assembling_insn = false;
+ tok->X_md = O_absent;
/* Legacy: There are cases when we have
identifier@relocation_type, if it is the case parse the
@@ -1444,7 +1445,7 @@ apply_fixups (struct arc_insn *insn, fragS *fragP, int fix)
offset = insn->len;
/* Some fixups are only used internally, thus no howto. */
- if ((int) fixup->reloc == 0)
+ if (fixup->reloc == 0)
as_fatal (_("Unhandled reloc type"));
if ((int) fixup->reloc < 0)
@@ -1457,8 +1458,7 @@ apply_fixups (struct arc_insn *insn, fragS *fragP, int fix)
else
{
reloc_howto_type *reloc_howto =
- bfd_reloc_type_lookup (stdoutput,
- (bfd_reloc_code_real_type) fixup->reloc);
+ bfd_reloc_type_lookup (stdoutput, fixup->reloc);
gas_assert (reloc_howto);
/* FIXME! the reloc size is wrong in the BFD file.
@@ -2523,9 +2523,6 @@ md_assemble (char *str)
opnamelen = strspn (str, "abcdefghijklmnopqrstuvwxyz_0123456789");
opname = xmemdup0 (str, opnamelen);
- /* Signalize we are assembling the instructions. */
- assembling_insn = true;
-
/* Tokenize the flags. */
if ((nflg = tokenize_flags (str + opnamelen, flags, MAX_INSN_FLGS)) == -1)
{
@@ -2549,7 +2546,6 @@ md_assemble (char *str)
/* Finish it off. */
assemble_tokens (opname, tok, ntok, flags, nflg);
- assembling_insn = false;
}
/* Callback to insert a register into the hash table. */
@@ -2768,7 +2764,7 @@ md_pcrel_from_section (fixS *fixP,
pr_debug ("pcrel_from_section, fx_offset = %d\n", (int) fixP->fx_offset);
- if (fixP->fx_addsy != (symbolS *) NULL
+ if (fixP->fx_addsy != NULL
&& (!S_IS_DEFINED (fixP->fx_addsy)
|| S_GET_SEGMENT (fixP->fx_addsy) != sec))
{
@@ -3387,9 +3383,8 @@ md_operand (expressionS *expressionP)
if (*p == '@')
{
input_line_pointer++;
- expressionP->X_op = O_symbol;
- expressionP->X_md = O_absent;
expression (expressionP);
+ expressionP->X_md = O_absent;
}
}
@@ -3407,10 +3402,6 @@ arc_parse_name (const char *name,
if (!assembling_insn)
return false;
- if (e->X_op == O_symbol
- && e->X_md == O_absent)
- return false;
-
sym = str_hash_find (arc_reg_hash, name);
if (sym)
{
@@ -3660,7 +3651,7 @@ find_reloc (const char *name,
if (!nflg)
continue;
found_flag = false;
- unsigned * psflg = (unsigned *)r->flags;
+ const unsigned *psflg = r->flags;
do
{
tmp = false;
@@ -3918,7 +3909,7 @@ assemble_insn (const struct arc_opcode *opcode,
for (argidx = opcode->operands; *argidx; ++argidx)
{
const struct arc_operand *operand = &arc_operands[*argidx];
- const expressionS *t = (const expressionS *) 0;
+ const expressionS *t = NULL;
if (ARC_OPERAND_IS_FAKE (operand))
continue;
@@ -4058,8 +4049,7 @@ assemble_insn (const struct arc_opcode *opcode,
{
/* sanity checks. */
reloc_howto_type *reloc_howto
- = bfd_reloc_type_lookup (stdoutput,
- (bfd_reloc_code_real_type) reloc);
+ = bfd_reloc_type_lookup (stdoutput, reloc);
unsigned reloc_bitsize = reloc_howto->bitsize;
if (reloc_howto->rightshift)
reloc_bitsize -= reloc_howto->rightshift;
@@ -4083,8 +4073,7 @@ assemble_insn (const struct arc_opcode *opcode,
else
{
reloc_howto_type *reloc_howto =
- bfd_reloc_type_lookup (stdoutput,
- (bfd_reloc_code_real_type) fixup->reloc);
+ bfd_reloc_type_lookup (stdoutput, fixup->reloc);
pcrel = reloc_howto->pc_relative;
}
fixup->pcrel = pcrel;
@@ -4676,7 +4665,7 @@ arc_extinsn (int ignore ATTRIBUTE_UNUSED)
as_warn ("%s", errmsg);
/* Insert the extension instruction. */
- arc_insert_opcode ((const struct arc_opcode *) arc_ext_opcodes);
+ arc_insert_opcode (arc_ext_opcodes);
create_extinst_section (&einsn);
}
@@ -4974,7 +4963,7 @@ arc_stralloc (char * s1, const char * s2)
gas_assert (s2);
len += strlen (s2) + 1;
- p = (char *) xmalloc (len);
+ p = xmalloc (len);
if (s1)
{
generated by cgit v1.1 at 2025-10-14 23:21:40 +0000