gdb: Convert language la_lookup_symbol_nonlocal field to a method

[deliverable/binutils-gdb.git] / bfd / cpu-tic4x.c

diff --git a/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
index dfcfe1612414f591921397403d3262120d0205f5..87eeba5691dff2335eb7f2ee412f35a74df19a49 100644 (file)
--- a/bfd/cpu-tic4x.c
+++ b/bfd/cpu-tic4x.c
@@ -1,5 +1,5 @@
 /* bfd back-end for TMS320C[34]x support
 /* bfd back-end for TMS320C[34]x support

-   Copyright 1996, 1997, 2002, 2003, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996-2020 Free Software Foundation, Inc.

 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
 
 
    Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
 


@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program 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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,20 +17,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
 
 
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
 

-static bfd_boolean tic4x_scan
-    PARAMS ((const struct bfd_arch_info *, const char * ));
-
-

 static bfd_boolean
 static bfd_boolean

-tic4x_scan (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
+tic4x_scan (const struct bfd_arch_info *info,
+           const char *string)

 {
   /* Allow strings of form [ti][Cc][34][0-9], let's not be too picky
      about strange numbered machines in C3x or C4x series.  */
 {
   /* Allow strings of form [ti][Cc][34][0-9], let's not be too picky
      about strange numbered machines in C3x or C4x series.  */


@@ -49,37 +45,26 @@ tic4x_scan (info, string)
   return FALSE;
 }
 
   return FALSE;
 }
 

+#define N(NUMBER, NAME, PRINT, DEFAULT, NEXT)          \
+  {                                                    \
+    32,        /* Bits in a word.  */                  \
+    32,        /* Bits in an address.  */              \
+    32,               /* Bits in a byte.  */                   \
+    bfd_arch_tic4x,                                    \
+    NUMBER,                                            \
+    NAME,                                              \
+    PRINT,                                             \
+    0,         /* Section alignment power.  */         \
+    DEFAULT,                                           \
+    bfd_default_compatible,                            \
+    tic4x_scan,                                                \
+    bfd_arch_default_fill,                             \
+    NEXT,                                              \
+    0 /* Maximum offset of a reloc from the start of an insn.  */ \
+  }

 
 const bfd_arch_info_type bfd_tic3x_arch =
 
 const bfd_arch_info_type bfd_tic3x_arch =

-  {
-    32,                                /* 32 bits in a word.  */
-    32,                                /* 32 bits in an address.  */
-    32,                                /* 32 bits in a byte.  */
-    bfd_arch_tic4x,
-    bfd_mach_tic3x,            /* Machine number.  */
-    "tic3x",                   /* Architecture name.  */
-    "tms320c3x",               /* Printable name.  */
-    0,                         /* Alignment power.  */
-    FALSE,                     /* Not the default architecture.  */
-    bfd_default_compatible,
-    tic4x_scan,
-    0
-  };
+  N (bfd_mach_tic3x, "tic3x", "tms320c3x", FALSE, NULL);

 
 const bfd_arch_info_type bfd_tic4x_arch =
 
 const bfd_arch_info_type bfd_tic4x_arch =

-  {
-    32,                                /* 32 bits in a word.  */
-    32,                                /* 32 bits in an address.  */
-    32,                                /* 32 bits in a byte.  */
-    bfd_arch_tic4x,
-    bfd_mach_tic4x,            /* Machine number.  */
-    "tic4x",                   /* Architecture name.  */
-    "tms320c4x",               /* Printable name.  */
-    0,                         /* Alignment power.  */
-    TRUE,                      /* The default architecture.  */
-    bfd_default_compatible,
-    tic4x_scan,
-    &bfd_tic3x_arch,
-  };
-
-
+  N (bfd_mach_tic4x, "tic4x", "tms320c4x", TRUE, &bfd_tic3x_arch);