use XNEW and related macros more

[deliverable/binutils-gdb.git] / gas / config / tc-m68k.c

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index acfe3499d886bf333e88e09a94ba763a38bea911..50e910bbe674b7f706d6385f7d8cbb443419be3d 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -1,5 +1,5 @@
 /* tc-m68k.c -- Assemble for the m68k family
-   Copyright (C) 1987-2015 Free Software Foundation, Inc.
+   Copyright (C) 1987-2016 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -122,7 +122,7 @@ struct label_line
 {
   struct label_line *next;
   symbolS *label;
-  char *file;
+  const char *file;
   unsigned int line;
   int text;
 };
@@ -2348,7 +2348,7 @@ m68k_ip (char *instring)
              const struct m68k_cpu *cpu;
              int any = 0;
              size_t space = 400;
-             char *buf = xmalloc (space + 1);
+             char *buf = XNEWVEC (char, space + 1);
              size_t len;
              int paren = 1;
 
@@ -4599,10 +4599,7 @@ md_begin (void)
   /* First sort the opcode table into alphabetical order to seperate
      the order that the assembler wants to see the opcodes from the
      order that the disassembler wants to see them.  */
-  m68k_sorted_opcodes = xmalloc (m68k_numopcodes * sizeof (* m68k_sorted_opcodes));
-  if (!m68k_sorted_opcodes)
-    as_fatal (_("Internal Error:  Can't allocate m68k_sorted_opcodes of size %d"),
-             m68k_numopcodes * ((int) sizeof (* m68k_sorted_opcodes)));
+  m68k_sorted_opcodes = XNEWVEC (const struct m68k_opcode *, m68k_numopcodes);
 
   for (i = m68k_numopcodes; i--;)
     m68k_sorted_opcodes[i] = m68k_opcodes + i;
@@ -4615,7 +4612,7 @@ md_begin (void)
   obstack_begin (&robyn, 4000);
   for (i = 0; i < m68k_numopcodes; i++)
     {
-      hack = slak = obstack_alloc (&robyn, sizeof (struct m68k_incant));
+      hack = slak = XOBNEW (&robyn, struct m68k_incant);
       do
        {
          ins = m68k_sorted_opcodes[i];
@@ -4645,7 +4642,7 @@ md_begin (void)
          if (i + 1 != m68k_numopcodes
              && !strcmp (ins->name, m68k_sorted_opcodes[i + 1]->name))
            {
-             slak->m_next = obstack_alloc (&robyn, sizeof (struct m68k_incant));
+             slak->m_next = XOBNEW (&robyn, struct m68k_incant);
              i++;
            }
          else
@@ -4762,7 +4759,7 @@ md_begin (void)
 
     while (mote_pseudo_table[n].poc_name)
       {
-       hack = obstack_alloc (&robyn, sizeof (struct m68k_incant));
+       hack = XOBNEW (&robyn, struct m68k_incant);
        hash_insert (op_hash,
                     mote_pseudo_table[n].poc_name, (char *) hack);
        hack->m_operands = 0;
@@ -4792,7 +4789,7 @@ m68k_frob_label (symbolS *sym)
   n = (struct label_line *) xmalloc (sizeof *n);
   n->next = labels;
   n->label = sym;
-  as_where (&n->file, &n->line);
+  n->file = as_where (&n->line);
   n->text = 0;
   labels = n;
   current_label = n;
@@ -4879,7 +4876,7 @@ m68k_mri_mode_change (int on)
     }
 }
 
-char *
+const char *
 md_atof (int type, char *litP, int *sizeP)
 {
   return ieee_md_atof (type, litP, sizeP, TRUE);
@@ -5703,7 +5700,7 @@ mri_chip (void)
   int i;
 
   s = input_line_pointer;
-  /* We can't use get_symbol_end since the processor names are not proper
+  /* We can't use get_symbol_name since the processor names are not proper
      symbols.  */
   while (is_part_of_name (c = *input_line_pointer++))
     ;
@@ -5731,7 +5728,7 @@ mri_chip (void)
     {
       ++input_line_pointer;
       s = input_line_pointer;
-      /* We can't use get_symbol_end since the processor names are not
+      /* We can't use get_symbol_name since the processor names are not
         proper symbols.  */
       while (is_part_of_name (c = *input_line_pointer++))
        ;
@@ -5896,8 +5893,7 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
          t = 0;
        }
 
-      s = input_line_pointer;
-      c = get_symbol_end ();
+      c = get_symbol_name (&s);
 
       for (i = 0, o = opt_table; i < OPTCOUNT; i++, o++)
        {
@@ -5907,14 +5903,14 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
                {
                  /* Restore input_line_pointer now in case the option
                     takes arguments.  */
-                 *input_line_pointer = c;
+                 (void) restore_line_pointer (c);
                  (*o->pfn) (o->arg, t);
                }
              else if (o->pvar != NULL)
                {
                  if (! t && o->arg == o->notarg)
                    as_bad (_("option `%s' may not be negated"), s);
-                 *input_line_pointer = c;
+                 restore_line_pointer (c);
                  *o->pvar = t ? o->arg : o->notarg;
                }
              else
@@ -5925,7 +5921,7 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
       if (i >= OPTCOUNT)
        {
          as_bad (_("option `%s' not recognized"), s);
-         *input_line_pointer = c;
+         restore_line_pointer (c);
        }
     }
   while (*input_line_pointer++ == ',');
@@ -7541,7 +7537,7 @@ struct option md_longopts[] = {
 size_t md_longopts_size = sizeof (md_longopts);
 
 int
-md_parse_option (int c, char *arg)
+md_parse_option (int c, const char *arg)
 {
   switch (c)
     {
@@ -7889,7 +7885,7 @@ md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size)
   int align;
 
   align = bfd_get_section_alignment (stdoutput, segment);
-  size = ((size + (1 << align) - 1) & ((valueT) -1 << align));
+  size = ((size + (1 << align) - 1) & (-((valueT) 1 << align)));
 #endif
 
   return size;
@@ -8099,7 +8095,7 @@ m68k_elf_cons (int nbytes /* 4=.long */)
 #endif
 
 int
-tc_m68k_regname_to_dw2regnum (char *regname)
+tc_m68k_regname_to_dw2regnum (const char *regname)
 {
   unsigned int regnum;
   static const char *const regnames[] =