Automatic date update in version.in

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

diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index 2e6f6c690508671038c1cc12a1cc80f93f9d6401..7ab11c6b542aa6518d4f9e0cde5977ba472bc6cb 100644 (file)
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -1,13 +1,12 @@
 /* BFD library support routines for architectures.
 /* BFD library support routines for architectures.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1997, 1998, 2000, 2001, 2002,
-   2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Hacked by Steve Chamberlain of Cygnus Support.
 
    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
    Hacked by Steve Chamberlain of Cygnus Support.
 
    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,


@@ -17,19 +16,22 @@
 
    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 "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "opcode/m68k.h"
 #include "libbfd.h"
 #include "opcode/m68k.h"

+#include "cpu-m68k.h"

 
 static const bfd_arch_info_type *
 bfd_m68k_compatible (const bfd_arch_info_type *a,
                     const bfd_arch_info_type *b);
 
 #define N(name, print,d,next)  \
 
 static const bfd_arch_info_type *
 bfd_m68k_compatible (const bfd_arch_info_type *a,
                     const bfd_arch_info_type *b);
 
 #define N(name, print,d,next)  \

-{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible,bfd_default_scan, next, }
+{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible, \
+   bfd_default_scan, bfd_arch_default_fill, next, 0 }

 
 static const bfd_arch_info_type arch_info_struct[] =
   {
 
 static const bfd_arch_info_type arch_info_struct[] =
   {


@@ -76,19 +78,31 @@ static const bfd_arch_info_type arch_info_struct[] =
       FALSE, &arch_info_struct[24]),
     N(bfd_mach_mcf_isa_b_float_emac, "m68k:isa-b:float:emac",
       FALSE, &arch_info_struct[25]),
       FALSE, &arch_info_struct[24]),
     N(bfd_mach_mcf_isa_b_float_emac, "m68k:isa-b:float:emac",
       FALSE, &arch_info_struct[25]),

+    N(bfd_mach_mcf_isa_c, "m68k:isa-c",
+      FALSE, &arch_info_struct[26]),
+    N(bfd_mach_mcf_isa_c_mac, "m68k:isa-c:mac",
+      FALSE, &arch_info_struct[27]),
+    N(bfd_mach_mcf_isa_c_emac, "m68k:isa-c:emac",
+      FALSE, &arch_info_struct[28]),
+    N(bfd_mach_mcf_isa_c_nodiv, "m68k:isa-c:nodiv",
+      FALSE, &arch_info_struct[29]),
+    N(bfd_mach_mcf_isa_c_nodiv_mac, "m68k:isa-c:nodiv:mac",
+      FALSE, &arch_info_struct[30]),
+    N(bfd_mach_mcf_isa_c_nodiv_emac, "m68k:isa-c:nodiv:emac",
+      FALSE, &arch_info_struct[31]),

 
     /* Legacy names for CF architectures */
 
     /* Legacy names for CF architectures */

-    N(bfd_mach_mcf_isa_a_nodiv, "m68k:5200", FALSE, &arch_info_struct[26]),
-    N(bfd_mach_mcf_isa_a_mac,"m68k:5206e", FALSE, &arch_info_struct[27]),
-    N(bfd_mach_mcf_isa_a_mac, "m68k:5307", FALSE, &arch_info_struct[28]),
-    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:5407", FALSE, &arch_info_struct[29]),
-    N(bfd_mach_mcf_isa_aplus_emac, "m68k:528x", FALSE, &arch_info_struct[30]),
-    N(bfd_mach_mcf_isa_aplus_emac, "m68k:521x", FALSE, &arch_info_struct[31]),
-    N(bfd_mach_mcf_isa_a_emac, "m68k:5249", FALSE, &arch_info_struct[32]),
+    N(bfd_mach_mcf_isa_a_nodiv, "m68k:5200", FALSE, &arch_info_struct[32]),
+    N(bfd_mach_mcf_isa_a_mac,"m68k:5206e", FALSE, &arch_info_struct[33]),
+    N(bfd_mach_mcf_isa_a_mac, "m68k:5307", FALSE, &arch_info_struct[34]),
+    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:5407", FALSE, &arch_info_struct[35]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:528x", FALSE, &arch_info_struct[36]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:521x", FALSE, &arch_info_struct[37]),
+    N(bfd_mach_mcf_isa_a_emac, "m68k:5249", FALSE, &arch_info_struct[38]),

     N(bfd_mach_mcf_isa_b_float_emac, "m68k:547x",
     N(bfd_mach_mcf_isa_b_float_emac, "m68k:547x",

-      FALSE, &arch_info_struct[33]),
+      FALSE, &arch_info_struct[39]),

     N(bfd_mach_mcf_isa_b_float_emac, "m68k:548x",
     N(bfd_mach_mcf_isa_b_float_emac, "m68k:548x",

-      FALSE, &arch_info_struct[34]),
+      FALSE, &arch_info_struct[40]),

     N(bfd_mach_mcf_isa_b_float_emac, "m68k:cfv4e", FALSE, 0),
   };
 
     N(bfd_mach_mcf_isa_b_float_emac, "m68k:cfv4e", FALSE, 0),
   };
 


@@ -97,7 +111,7 @@ const bfd_arch_info_type bfd_m68k_arch =
 
 /* Table indexed by bfd_mach_arch number indicating which
    architectural features are supported.  */
 
 /* Table indexed by bfd_mach_arch number indicating which
    architectural features are supported.  */

-static const unsigned m68k_arch_features[] = 
+static const unsigned m68k_arch_features[] =

 {
   0,
   m68000|m68881|m68851,
 {
   0,
   m68000|m68881|m68851,


@@ -125,6 +139,12 @@ static const unsigned m68k_arch_features[] =
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfmac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfemac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfmac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfemac,

+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp,
+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_c|mcfusp|mcfemac,
+  mcfisa_a|mcfisa_c|mcfusp,
+  mcfisa_a|mcfisa_c|mcfusp|mcfmac,
+  mcfisa_a|mcfisa_c|mcfusp|mcfemac,

 };
 
 /* Return the count of bits set in MASK  */
 };
 
 /* Return the count of bits set in MASK  */


@@ -166,7 +186,7 @@ int bfd_m68k_features_to_mach (unsigned features)
        ix++)
     {
       unsigned this_extra, this_missing;
        ix++)
     {
       unsigned this_extra, this_missing;

-      
+

       if (m68k_arch_features[ix] == features)
        return ix;
       this_extra = bit_count (m68k_arch_features[ix] & ~features);
       if (m68k_arch_features[ix] == features)
        return ix;
       this_extra = bit_count (m68k_arch_features[ix] & ~features);


@@ -175,7 +195,7 @@ int bfd_m68k_features_to_mach (unsigned features)
          extra = this_extra;
          superset = ix;
        }
          extra = this_extra;
          superset = ix;
        }

-      
+

       this_missing = bit_count (features & ~m68k_arch_features[ix]);
       if (this_missing < missing)
        {
       this_missing = bit_count (features & ~m68k_arch_features[ix]);
       if (this_missing < missing)
        {


@@ -200,7 +220,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
     return b;
   if (!b->mach)
     return a;
     return b;
   if (!b->mach)
     return a;

-  
+

   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;
   if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
     /* Merge m68k machine. */
     return a->mach > b->mach ? a : b;


@@ -222,6 +242,10 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
       if ((~features & (mcfisa_aa | mcfisa_b)) == 0)
        return NULL;
 
       if ((~features & (mcfisa_aa | mcfisa_b)) == 0)
        return NULL;
 

+      /* ISA B and ISA C are incompatible.  */
+      if ((~features & (mcfisa_b | mcfisa_c)) == 0)
+       return NULL;
+

       /* MAC and EMAC code cannot be merged.  */
       if ((~features & (mcfmac | mcfemac)) == 0)
        return NULL;
       /* MAC and EMAC code cannot be merged.  */
       if ((~features & (mcfmac | mcfemac)) == 0)
        return NULL;


@@ -236,7 +260,7 @@ bfd_m68k_compatible (const bfd_arch_info_type *a,
          if (!cpu32_fido_mix_warning)
            {
              cpu32_fido_mix_warning = 1;
          if (!cpu32_fido_mix_warning)
            {
              cpu32_fido_mix_warning = 1;

-             (*_bfd_error_handler) ("warning: linking CPU32 objects with fido objects");
+             _bfd_error_handler ("warning: linking CPU32 objects with fido objects");

            }
          return bfd_lookup_arch (a->arch,
                                  bfd_m68k_features_to_mach (fido_a | m68881));
            }
          return bfd_lookup_arch (a->arch,
                                  bfd_m68k_features_to_mach (fido_a | m68881));