daily update

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

diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index daef763a29b0c8496869394fb3b3b9d3763d305a..e1c77bfe2e61edfce74610f20653dc030ae2b615 100644 (file)
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -69,16 +69,31 @@ h8300_scan (info, string)
 
   if (*string == 'h' || *string == 'H')
     {
+      string++;
+      if (*string == 'n' || *string == 'N')
+       return (info->mach == bfd_mach_h8300hn);
+
       return (info->mach == bfd_mach_h8300h);
     }
   else if (*string == 's' || *string == 'S')
     {
+      string++;
+      if (*string == 'n' || *string == 'N')
+       return (info->mach == bfd_mach_h8300sn);
+
+      if (*string == 'x' || *string == 'X')
+       {
+         string++;
+         if (*string == 'n' || *string == 'N')
+           return (info->mach == bfd_mach_h8300sxn);
+
+         return (info->mach == bfd_mach_h8300sx);
+       }
+      
       return (info->mach == bfd_mach_h8300s);
     }
   else
-    {
-      return info->mach == bfd_mach_h8300;
-    }
+    return info->mach == bfd_mach_h8300;
 }
 
 /* This routine is provided two arch_infos and works out the machine
@@ -97,15 +112,15 @@ compatible (in, out)
     return in;
 }
 
-static const bfd_arch_info_type h8300s_info_struct =
+static const bfd_arch_info_type h8300sxn_info_struct =
 {
   32,                          /* 32 bits in a word */
   32,                          /* 32 bits in an address */
   8,                           /* 8 bits in a byte */
   bfd_arch_h8300,
-  bfd_mach_h8300s,
-  "h8300s",                    /* arch_name  */
-  "h8300s",                    /* printable name */
+  bfd_mach_h8300sxn,
+  "h8300sxn",                  /* arch_name  */
+  "h8300sxn",                  /* printable name */
   1,
   FALSE,                       /* the default machine */
   compatible,
@@ -113,33 +128,98 @@ static const bfd_arch_info_type h8300s_info_struct =
   0
 };
 
-static const bfd_arch_info_type h8300h_info_struct =
+static const bfd_arch_info_type h8300sx_info_struct =
 {
   32,                          /* 32 bits in a word */
   32,                          /* 32 bits in an address */
   8,                           /* 8 bits in a byte */
   bfd_arch_h8300,
-  bfd_mach_h8300h,
-  "h8300h",                    /* arch_name  */
-  "h8300h",                    /* printable name */
+  bfd_mach_h8300sx,
+  "h8300sx",                   /* arch_name  */
+  "h8300sx",                   /* printable name */
   1,
   FALSE,                       /* the default machine */
   compatible,
   h8300_scan,
+  &h8300sxn_info_struct
+};
+
+static const bfd_arch_info_type h8300sn_info_struct =
+{
+  32,                          /* 32 bits in a word.  */
+  32,                          /* 32 bits in an address.  */
+  8,                           /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300sn,
+  "h8300sn",                   /* Architecture name.  */
+  "h8300sn",                   /* Printable name.  */
+  1,
+  FALSE,                       /* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300sx_info_struct
+};
+
+
+static const bfd_arch_info_type h8300hn_info_struct =
+{
+  32,                          /* 32 bits in a word.  */
+  32,                          /* 32 bits in an address.  */
+  8,                           /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300hn,
+  "h8300hn",                   /* Architecture name.  */
+  "h8300hn",                   /* Printable name.  */
+  1,
+  FALSE,                       /* The default machine.  */
+  compatible,
+  h8300_scan,
+  &h8300sn_info_struct
+};
+
+static const bfd_arch_info_type h8300s_info_struct =
+{
+  32,                          /* 32 bits in a word.  */
+  32,                          /* 32 bits in an address.  */
+  8,                           /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300s,
+  "h8300s",                    /* Architecture name.  */
+  "h8300s",                    /* Printable name.  */
+  1,
+  FALSE,                       /* The default machine.  */
+  compatible,
+  h8300_scan,
+  & h8300hn_info_struct
+};
+
+static const bfd_arch_info_type h8300h_info_struct =
+{
+  32,                          /* 32 bits in a word.  */
+  32,                          /* 32 bits in an address.  */
+  8,                           /* 8 bits in a byte.  */
+  bfd_arch_h8300,
+  bfd_mach_h8300h,
+  "h8300h",                    /* Architecture name.  */
+  "h8300h",                    /* Printable name.  */
+  1,
+  FALSE,                       /* The default machine.  */
+  compatible,
+  h8300_scan,
   &h8300s_info_struct
 };
 
 const bfd_arch_info_type bfd_h8300_arch =
 {
-  16,                          /* 16 bits in a word */
-  16,                          /* 16 bits in an address */
-  8,                           /* 8 bits in a byte */
+  16,                          /* 16 bits in a word.  */
+  16,                          /* 16 bits in an address.  */
+  8,                           /* 8 bits in a byte.  */
   bfd_arch_h8300,
   bfd_mach_h8300,
-  "h8300",                     /* arch_name  */
-  "h8300",                     /* printable name */
+  "h8300",                     /* Architecture name.  */
+  "h8300",                     /* Printable name.  */
   1,
-  TRUE,                                /* the default machine */
+  TRUE,                                /* The default machine.  */
   compatible,
   h8300_scan,
   &h8300h_info_struct