Add support for ARM Cortex-M33 processor

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

diff --git a/gas/config/tc-pj.c b/gas/config/tc-pj.c
index dff23145bad8dc5db7c5a6c94bb355761b2b71ef..e4a0379f5b6cea36d43c9e8dfcf3ac368cd5910f 100644 (file)
--- a/gas/config/tc-pj.c
+++ b/gas/config/tc-pj.c
@@ -1,13 +1,11 @@
-/*-
-   tc-pj.c -- Assemble code for Pico Java
-   Copyright 1999, 2000, 2001, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+/* tc-pj.c -- Assemble code for Pico Java
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -98,7 +96,8 @@ parse_exp_save_ilp (char *s, expressionS *op)
    we want to handle magic pending reloc expressions specially.  */
 
 void
    we want to handle magic pending reloc expressions specially.  */
 
 void

-pj_cons_fix_new_pj (fragS *frag, int where, int nbytes, expressionS *exp)
+pj_cons_fix_new_pj (fragS *frag, int where, int nbytes, expressionS *exp,
+                   bfd_reloc_code_real_type r ATTRIBUTE_UNUSED)

 {
   static int rv[5][2] =
   { { 0, 0 },
 {
   static int rv[5][2] =
   { { 0, 0 },


@@ -172,7 +171,7 @@ static void
 fake_opcode (const char *name,
             void (*func) (struct pj_opc_info_t *, char *))
 {
 fake_opcode (const char *name,
             void (*func) (struct pj_opc_info_t *, char *))
 {

-  pj_opc_info_t * fake = xmalloc (sizeof (pj_opc_info_t));
+  pj_opc_info_t * fake = XNEW (pj_opc_info_t);

 
   fake->opcode = -1;
   fake->opcode_next = -1;
 
   fake->opcode = -1;
   fake->opcode_next = -1;


@@ -184,9 +183,9 @@ fake_opcode (const char *name,
    can have another name.  */
 
 static void
    can have another name.  */
 
 static void

-alias (const char *new, const char *old)
+alias (const char *new_name, const char *old)

 {
 {

-  hash_insert (opcode_hash_control, new,
+  hash_insert (opcode_hash_control, new_name,

               (char *) hash_find (opcode_hash_control, old));
 }
 
               (char *) hash_find (opcode_hash_control, old));
 }
 


@@ -262,6 +261,7 @@ md_assemble (char *str)
       return;
     }
 
       return;
     }
 

+  dwarf2_emit_insn (0);

   if (opcode->opcode == -1)
     {
       /* It's a fake opcode.  Dig out the args and pretend that was
   if (opcode->opcode == -1)
     {
       /* It's a fake opcode.  Dig out the args and pretend that was


@@ -286,7 +286,7 @@ md_assemble (char *str)
            op_end++;
 
          if (*op_end == 0)
            op_end++;
 
          if (*op_end == 0)

-           as_bad ("expected expresssion");
+           as_bad (_("expected expression"));

 
          op_end = parse_exp_save_ilp (op_end, &arg);
 
 
          op_end = parse_exp_save_ilp (op_end, &arg);
 


@@ -305,67 +305,18 @@ md_assemble (char *str)
        op_end++;
 
       if (*op_end != 0)
        op_end++;
 
       if (*op_end != 0)

-       as_warn ("extra stuff on line ignored");
+       as_warn (_("extra stuff on line ignored"));

 
     }
 
   if (pending_reloc)
 
     }
 
   if (pending_reloc)

-    as_bad ("Something forgot to clean up\n");
-
+    as_bad (_("Something forgot to clean up\n"));

 }
 
 }
 

-/* Turn a string in input_line_pointer into a floating point constant
-   of type type, and store the appropriate bytes in *LITP.  The number
-   of LITTLENUMS emitted is stored in *SIZEP .  An error message is
-   returned, or NULL on OK.  */
-
-char *
+const char *

 md_atof (int type, char *litP, int *sizeP)
 {
 md_atof (int type, char *litP, int *sizeP)
 {

-  int prec;
-  LITTLENUM_TYPE words[4];
-  char *t;
-  int i;
-
-  switch (type)
-    {
-    case 'f':
-      prec = 2;
-      break;
-
-    case 'd':
-      prec = 4;
-      break;
-
-    default:
-      *sizeP = 0;
-      return _("bad call to md_atof");
-    }
-
-  t = atof_ieee (input_line_pointer, type, words);
-  if (t)
-    input_line_pointer = t;
-
-  *sizeP = prec * 2;
-
-  if (!target_big_endian)
-    {
-      for (i = prec - 1; i >= 0; i--)
-       {
-         md_number_to_chars (litP, (valueT) words[i], 2);
-         litP += 2;
-       }
-    }
-  else
-    {
-      for (i = 0; i < prec; i++)
-       {
-         md_number_to_chars (litP, (valueT) words[i], 2);
-         litP += 2;
-       }
-    }
-
-  return NULL;
+  return ieee_md_atof (type, litP, sizeP, target_big_endian);

 }
 \f
 const char *md_shortopts = "";
 }
 \f
 const char *md_shortopts = "";


@@ -382,7 +333,7 @@ struct option md_longopts[] =
 size_t md_longopts_size = sizeof (md_longopts);
 
 int
 size_t md_longopts_size = sizeof (md_longopts);
 
 int

-md_parse_option (int c, char *arg ATTRIBUTE_UNUSED)
+md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

 {
   switch (c)
     {
 {
   switch (c)
     {


@@ -415,10 +366,8 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long val = *valP;
   long max, min;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long val = *valP;
   long max, min;

-  int shift;

 
   max = min = 0;
 
   max = min = 0;

-  shift = 0;

   switch (fixP->fx_r_type)
     {
     case BFD_RELOC_VTABLE_INHERIT:
   switch (fixP->fx_r_type)
     {
     case BFD_RELOC_VTABLE_INHERIT:


@@ -491,6 +440,10 @@ md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
        }
       break;
 
        }
       break;
 

+    case BFD_RELOC_PJ_CODE_REL32:
+      fixP->fx_done = 0;
+      return;
+

     default:
       abort ();
     }
     default:
       abort ();
     }


@@ -523,8 +476,8 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
   arelent *rel;
   bfd_reloc_code_real_type r_type;
 
   arelent *rel;
   bfd_reloc_code_real_type r_type;
 

-  rel = xmalloc (sizeof (arelent));
-  rel->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
+  rel = XNEW (arelent);
+  rel->sym_ptr_ptr = XNEW (asymbol *);

   *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
   rel->address = fixp->fx_frag->fr_address + fixp->fx_where;
 
   *rel->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
   rel->address = fixp->fx_frag->fr_address + fixp->fx_where;
 


@@ -539,7 +492,7 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
                    bfd_get_reloc_code_name (r_type));
       /* Set howto to a garbage value so that we can keep going.  */
       rel->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_32);
                    bfd_get_reloc_code_name (r_type));
       /* Set howto to a garbage value so that we can keep going.  */
       rel->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_32);

-      assert (rel->howto != NULL);
+      gas_assert (rel->howto != NULL);

     }
 
   return rel;
     }
 
   return rel;