gdb/tui: Link source and assembler scrolling .... again

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

diff --git a/bfd/cpu-ip2k.c b/bfd/cpu-ip2k.c
index 9e303d744c55c66154ed3c590da21c72b605e34e..13c9b893571a2a1edabdbafba79c29bee0a46964 100644 (file)
--- a/bfd/cpu-ip2k.c
+++ b/bfd/cpu-ip2k.c
@@ -1,11 +1,11 @@
 /* BFD support for the Scenix IP2xxx processor.
 /* BFD support for the Scenix IP2xxx processor.

-   Copyright 2000, 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
    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 file is part of BFD, the Binary File Descriptor library.
 
    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,


@@ -15,40 +15,34 @@
 
    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"
 

+#define N(NUMBER, PRINT, DEFAULT, NEXT)                        \
+  {                                                    \
+    32,         /* Bits in a word.  */                 \
+    16,         /* Bits in an address.  */             \
+    8,         /* Bits in a byte.  */                  \
+    bfd_arch_ip2k,                                     \
+    NUMBER,                                            \
+    "ip2k",                                            \
+    PRINT,                                             \
+    1,         /* Section alignment power.  */         \
+    DEFAULT,                                           \
+    bfd_default_compatible,                            \
+    bfd_default_scan,                                  \
+    bfd_arch_default_fill,                             \
+    NEXT,                                              \
+    0 /* Maximum offset of a reloc from the start of an insn.  */ \
+  }
+

 const bfd_arch_info_type bfd_ip2k_nonext_arch =
 const bfd_arch_info_type bfd_ip2k_nonext_arch =

-{
-  32,                          /* Bits per word - not really true.  */
-  16,                          /* Bits per address.  */
-  8,                           /* Bits per byte.  */
-  bfd_arch_ip2k,               /* Architecture.  */
-  bfd_mach_ip2022,             /* Machine.  */
-  "ip2k",                      /* Architecture name.  */
-  "ip2022",                    /* Machine name.  */
-  1,                           /* Section align power.  */
-  FALSE,                       /* The default ?  */
-  bfd_default_compatible,      /* Architecture comparison fn.  */
-  bfd_default_scan,            /* String to architecture convert fn.  */
-  NULL                         /* Next in list.  */
-};
+  N (bfd_mach_ip2022, "ip2022", FALSE, NULL);

 
 const bfd_arch_info_type bfd_ip2k_arch =
 
 const bfd_arch_info_type bfd_ip2k_arch =

-{
-  32,                          /* Bits per word - not really true.  */
-  16,                          /* Bits per address.  */
-  8,                           /* Bits per byte.  */
-  bfd_arch_ip2k,               /* Architecture.  */
-  bfd_mach_ip2022ext,          /* Machine.  */
-  "ip2k",                      /* Architecture name.  */
-  "ip2022ext",                 /* Machine name.  */
-  1,                           /* Section align power.  */
-  TRUE,                                /* The default ?  */
-  bfd_default_compatible,      /* Architecture comparison fn.  */
-  bfd_default_scan,            /* String to architecture convert fn.  */
-  & bfd_ip2k_nonext_arch       /* Next in list.  */
-};
+  N (bfd_mach_ip2022ext, "ip2022ext", TRUE, & bfd_ip2k_nonext_arch);
+