gas various other const pointer changes

This removes a bunch of casts involving const pointers, in some cases
by making variables const pointers so a cast is not needed.  In a
couple of places the cast hid errors with "&array" written rather than
"array", see iq2000_macro_defs and s_pru_align.  tc-xgate.c cmp_opcode
is changed to be the standard qsort predicate to avoid a function
cast.

Author: amodra

gas/config/kvx-parse.c

@@ -68,7 +68,7 @@ has_relocation_of_size (const struct kvx_reloc **relocs)
   if (!relocs)
     return 0;
 
-  struct kvx_reloc **relocs_it = (struct kvx_reloc **) relocs;
+  const struct kvx_reloc **relocs_it = relocs;
   int has_only_one_p = relocs[0] && !relocs[1];
 
   while (*relocs_it)
@@ -101,15 +101,13 @@ has_relocation_of_size (const struct kvx_reloc **relocs)
   return 0;
 }
 
-struct pseudo_func *
-kvx_get_pseudo_func2 (symbolS * sym, struct kvx_reloc **relocs);
-struct pseudo_func *
-kvx_get_pseudo_func2 (symbolS *sym, struct kvx_reloc **relocs)
+static struct pseudo_func *
+kvx_get_pseudo_func2 (symbolS *sym, const struct kvx_reloc **relocs)
 {
   if (!relocs)
     return NULL;
 
-  struct kvx_reloc **relocs_it = (struct kvx_reloc **) relocs;
+  const struct kvx_reloc **relocs_it = relocs;
 
   for (int i = 0; i < 26; i++)
   {

gas/config/obj-elf.c

@@ -942,13 +942,12 @@ obj_elf_parse_section_letters (char *str, size_t len,
 	      if (ISDIGIT (*str))
 		{
 		  char * end;
-		  struct elf_backend_data *bed;
+		  const struct elf_backend_data *bed;
 		  bfd_vma numeric_flags = strtoul (str, &end, 0);
 
 		  attr |= numeric_flags;
 
-		  bed = (struct elf_backend_data *)
-		    get_elf_backend_data (stdoutput);
+		  bed = get_elf_backend_data (stdoutput);
 
 		  if (bed->elf_osabi == ELFOSABI_NONE
 		      || bed->elf_osabi == ELFOSABI_STANDALONE

gas/config/tc-alpha.c

@@ -2180,7 +2180,7 @@ emit_ir_load (const expressionS *tok,
     basereg = tok[2].X_add_number;
 
   lituse = load_expression (tok[0].X_add_number, &tok[1],
-			    &basereg, &newtok[1], (const char *) opname);
+			    &basereg, &newtok[1], opname);
 
   if (basereg == alpha_gp_register &&
       (symlen > 4 && strcmp (&symname [symlen - 4], "..lk") == 0))
@@ -2189,7 +2189,7 @@ emit_ir_load (const expressionS *tok,
   newtok[0] = tok[0];
   set_tok_preg (newtok[2], basereg);
 
-  assemble_tokens_to_insn ((const char *) opname, newtok, 3, &insn);
+  assemble_tokens_to_insn (opname, newtok, 3, &insn);
 
   if (lituse)
     {
@@ -2227,7 +2227,7 @@ emit_loadstore (const expressionS *tok,
 	as_bad (_("macro requires $at register while noat in effect"));
 
       lituse = load_expression (AXP_REG_AT, &tok[1],
-				&basereg, &newtok[1], (const char *) opname);
+				&basereg, &newtok[1], opname);
     }
   else
     {
@@ -2238,7 +2238,7 @@ emit_loadstore (const expressionS *tok,
   newtok[0] = tok[0];
   set_tok_preg (newtok[2], basereg);
 
-  assemble_tokens_to_insn ((const char *) opname, newtok, 3, &insn);
+  assemble_tokens_to_insn (opname, newtok, 3, &insn);
 
   if (lituse)
     {
@@ -2684,7 +2684,7 @@ emit_division (const expressionS *tok,
 	}
     }
 
-  sym = symbol_find_or_make ((const char *) symname);
+  sym = symbol_find_or_make (symname);
 
   set_tok_reg (newtok[0], AXP_REG_AT);
   set_tok_sym (newtok[1], sym, 0);
@@ -2737,7 +2737,7 @@ emit_division (const expressionS *tok,
   else
     rr = regno (tok[2].X_add_number);
 
-  sym = symbol_find_or_make ((const char *) symname);
+  sym = symbol_find_or_make (symname);
 
   /* Move the operands into the right place.  */
   if (yr == AXP_REG_T10 && xr == AXP_REG_T11)
@@ -2818,7 +2818,7 @@ emit_jsrjmp (const expressionS *tok,
 	     int ntok,
 	     const void * vopname)
 {
-  const char *opname = (const char *) vopname;
+  const char *opname = vopname;
   struct alpha_insn insn;
   expressionS newtok[3];
   int r, tokidx = 0;
@@ -2914,7 +2914,7 @@ emit_retjcr (const expressionS *tok,
 	     int ntok,
 	     const void * vopname)
 {
-  const char *opname = (const char *) vopname;
+  const char *opname = vopname;
   expressionS newtok[3];
   int r, tokidx = 0;
 

gas/config/tc-arc.c

@@ -3659,7 +3659,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;
@@ -4673,7 +4673,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);
 }

gas/config/tc-d10v.c

@@ -275,7 +275,7 @@ void
 md_begin (void)
 {
   const char *prev_name = "";
-  struct d10v_opcode *opcode;
+  const struct d10v_opcode *opcode;
   d10v_hash = str_htab_create ();
 
   /* Insert unique names into hash table.  The D10v instruction set
@@ -325,7 +325,7 @@ postfix (char *p)
 }
 
 static bfd_reloc_code_real_type
-get_reloc (struct d10v_operand *op)
+get_reloc (const struct d10v_operand *op)
 {
   int bits = op->bits;
 
@@ -564,7 +564,7 @@ build_insn (struct d10v_opcode *opcode,
 	  else
 	    {
 	      fixups->fix[fixups->fc].reloc =
-		get_reloc ((struct d10v_operand *) &d10v_operands[opcode->operands[i]]);
+		get_reloc (&d10v_operands[opcode->operands[i]]);
 
 	      /* Check that an immediate was passed to ops that expect one.  */
 	      if ((flags & OPERAND_NUM)
@@ -1521,7 +1521,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 	}
       else
 	fixP->fx_r_type =
-	  get_reloc ((struct d10v_operand *) &d10v_operands[op_type]);
+	  get_reloc (&d10v_operands[op_type]);
     }
 
   /* Fetch the instruction, insert the fully resolved operand

gas/config/tc-iq2000.c

@@ -198,29 +198,29 @@ static const char * li_expn    = "\n\
 
 static iq2000_macro_defs_s iq2000_macro_defs[] =
 {
-  {"abs",   (const char **) & abs_expn,   (const char **) & abs_args},
-  {"la",    (const char **) & la_expn,    (const char **) & la_args},
-  {"bge",   (const char **) & bge_expn,   (const char **) & bxx_args},
-  {"bgeu",  (const char **) & bgeu_expn,  (const char **) & bxx_args},
-  {"bgt",   (const char **) & bgt_expn,   (const char **) & bxx_args},
-  {"bgtu",  (const char **) & bgtu_expn,  (const char **) & bxx_args},
-  {"ble",   (const char **) & ble_expn,   (const char **) & bxx_args},
-  {"bleu",  (const char **) & bleu_expn,  (const char **) & bxx_args},
-  {"blt",   (const char **) & blt_expn,   (const char **) & bxx_args},
-  {"bltu",  (const char **) & bltu_expn,  (const char **) & bxx_args},
-  {"sge",   (const char **) & sge_expn,   (const char **) & sxx_args},
-  {"sgeu",  (const char **) & sgeu_expn,  (const char **) & sxx_args},
-  {"sle",   (const char **) & sle_expn,   (const char **) & sxx_args},
-  {"sleu",  (const char **) & sleu_expn,  (const char **) & sxx_args},
-  {"sgt",   (const char **) & sgt_expn,   (const char **) & sxx_args},
-  {"sgtu",  (const char **) & sgtu_expn,  (const char **) & sxx_args},
-  {"seq",   (const char **) & seq_expn,   (const char **) & sxx_args},
-  {"sne",   (const char **) & sne_expn,   (const char **) & sxx_args},
-  {"neg",   (const char **) & neg_expn,   (const char **) & neg_args},
-  {"negu",  (const char **) & negu_expn,  (const char **) & neg_args},
-  {"li",    (const char **) & li_expn,    (const char **) & li_args},
-  {"ori32", (const char **) & ori32_expn, (const char **) & ai32_args},
-  {"andi32",(const char **) & andi32_expn,(const char **) & ai32_args},
+  {"abs",    &abs_expn,    abs_args},
+  {"la",     &la_expn,     la_args},
+  {"bge",    &bge_expn,    bxx_args},
+  {"bgeu",   &bgeu_expn,   bxx_args},
+  {"bgt",    &bgt_expn,    bxx_args},
+  {"bgtu",   &bgtu_expn,   bxx_args},
+  {"ble",    &ble_expn,    bxx_args},
+  {"bleu",   &bleu_expn,   bxx_args},
+  {"blt",    &blt_expn,    bxx_args},
+  {"bltu",   &bltu_expn,   bxx_args},
+  {"sge",    &sge_expn,    sxx_args},
+  {"sgeu",   &sgeu_expn,   sxx_args},
+  {"sle",    &sle_expn,    sxx_args},
+  {"sleu",   &sleu_expn,   sxx_args},
+  {"sgt",    &sgt_expn,    sxx_args},
+  {"sgtu",   &sgtu_expn,   sxx_args},
+  {"seq",    &seq_expn,    sxx_args},
+  {"sne",    &sne_expn,    sxx_args},
+  {"neg",    &neg_expn,    neg_args},
+  {"negu",   &negu_expn,   neg_args},
+  {"li",     &li_expn,     li_args},
+  {"ori32",  &ori32_expn,  ai32_args},
+  {"andi32", &andi32_expn, ai32_args},
 };
 
 static void

gas/config/tc-kvx.c

@@ -700,7 +700,7 @@ assemble_insn (const struct kvxopc * opcode, struct token_list *tok, struct kvxi
   insn->immx1 = NOIMMX;
 
   struct token_list *tok_ = tok;
-  struct kvx_operand **format = (struct kvx_operand **) opcode->format;
+  struct kvx_operand *const *format = opcode->format;
 
   while (tok_)
     {
@@ -1441,8 +1441,8 @@ kvx_set_cpu (void)
 static int
 kvxop_compar (const void *a, const void *b)
 {
-  const struct kvxopc *opa = (const struct kvxopc *) a;
-  const struct kvxopc *opb = (const struct kvxopc *) b;
+  const struct kvxopc *opa = a;
+  const struct kvxopc *opb = b;
   int res = strcmp (opa->as_op, opb->as_op);
 
   if (res)

gas/config/tc-metag.c

@@ -267,7 +267,7 @@ parse_gp_reg (const char *name)
 
   entry.name = name;
 
-  reg = (const metag_reg *) htab_find (reg_htab, &entry);
+  reg = htab_find (reg_htab, &entry);
 
   return reg;
 }
@@ -4112,7 +4112,7 @@ __parse_dsp_reg (const char *line, const metag_reg **reg, htab_t dsp_regtab)
   name[len] = '\0';
   entry.name = name;
 
-  _reg = (const metag_reg *) htab_find (dsp_regtab, &entry);
+  _reg = htab_find (dsp_regtab, &entry);
   if (!_reg)
     return NULL;
 
@@ -6003,7 +6003,7 @@ parse_split_condition (const char *line, metag_insn *insn)
 
   entry.name = buf;
 
-  scond = (const split_condition *) htab_find (scond_htab, &entry);
+  scond = htab_find (scond_htab, &entry);
 
   if (!scond)
     return NULL;
@@ -6324,16 +6324,15 @@ create_mnemonic_htab (void)
   for (i = 0; i < num_templates; i++)
     {
       const insn_template *template = &metag_optab[i];
-      insn_templates **slot = NULL;
+      void **slot;
       insn_templates *new_entry;
 
       new_entry = XNEW (insn_templates);
 
       new_entry->template = template;
       new_entry->next = NULL;
 
-      slot = (insn_templates **) htab_find_slot (mnemonic_htab, new_entry,
-						 INSERT);
+      slot = htab_find_slot (mnemonic_htab, new_entry, INSERT);
 
       if (*slot)
 	{
@@ -6355,7 +6354,7 @@ create_mnemonic_htab (void)
 static hashval_t
 hash_regs (const void *p)
 {
-  metag_reg *rp = (metag_reg *)p;
+  const metag_reg *rp = p;
   char buf[MAX_REG_LEN];
 
   strupper (buf, rp->name);
@@ -6367,8 +6366,8 @@ hash_regs (const void *p)
 static int
 eq_regs (const void *a, const void *b)
 {
-  metag_reg *ra = (metag_reg *)a;
-  metag_reg *rb = (metag_reg *)b;
+  const metag_reg *ra = a;
+  const metag_reg *rb = b;
   return strcasecmp (ra->name, rb->name) == 0;
 }
 

gas/config/tc-nds32.c

@@ -5209,7 +5209,7 @@ static struct nds32_relax_hint_table relax_ls_table[] =
    elimination itself or not, we have to return the next instruction range.  */
 
 static int
-nds32_elf_sethi_range (struct nds32_relocs_pattern *pattern)
+nds32_elf_sethi_range (const struct nds32_relocs_pattern *pattern)
 {
   int range = 0;
   while (pattern)
@@ -5658,12 +5658,12 @@ static struct nds32_hint_map hint_map [] =
 /* Find the relaxation pattern according to instructions.  */
 
 static bool
-nds32_find_reloc_table (struct nds32_relocs_pattern *relocs_pattern,
+nds32_find_reloc_table (const struct nds32_relocs_pattern *relocs_pattern,
 			struct nds32_relax_hint_table *hint_info)
 {
   unsigned int opcode, seq_size;
   enum nds32_br_range range;
-  struct nds32_relocs_pattern *pattern, *hi_pattern = NULL;
+  const struct nds32_relocs_pattern *pattern, *hi_pattern = NULL;
   const char *opc = NULL;
   relax_info_t *relax_info = NULL;
   nds32_relax_fixup_info_t *fixup_info, *hint_fixup;
@@ -5928,9 +5928,8 @@ nds32_match_hint_insn (struct nds32_opcode *opcode, uint32_t seq)
 static void
 nds32_elf_append_relax_relocs (const char *key, const void *value)
 {
-  struct nds32_relocs_pattern *relocs_pattern =
-    (struct nds32_relocs_pattern *) value;
-  struct nds32_relocs_pattern *pattern_temp, *pattern_now;
+  const struct nds32_relocs_pattern *relocs_pattern = value;
+  const struct nds32_relocs_pattern *pattern_temp, *pattern_now;
   symbolS *sym, *hi_sym = NULL;
   expressionS exp;
   fragS *fragP;
@@ -6265,7 +6264,7 @@ static int
 nds32_elf_append_relax_relocs_traverse (void **slot, void *arg ATTRIBUTE_UNUSED)
 {
   string_tuple_t *tuple = *((string_tuple_t **) slot);
-  nds32_elf_append_relax_relocs (tuple->key, (void *) tuple->value);
+  nds32_elf_append_relax_relocs (tuple->key, (const void *) tuple->value);
   return 1;
 }
 

gas/config/tc-pru.c

@@ -341,10 +341,10 @@ s_pru_align (int ignore ATTRIBUTE_UNUSED)
     {
       input_line_pointer++;
       fill = get_absolute_expression ();
-      pfill = (const char *) &fill;
+      pfill = &fill;
     }
   else if (subseg_text_p (now_seg))
-    pfill = (const char *) &nop;
+    pfill = nop;
   else
     {
       pfill = NULL;