2005-05-04 H.J. Lu <hongjiu.lu@intel.com>

[external/binutils.git] / bfd / cpu-h8300.c

diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index 1a4f4d7..547d3c7 100644 (file)
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -1,6 +1,6 @@
 /* BFD library support routines for the Renesas H8/300 architecture.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2000, 2001, 2002,
+   2003, 2004 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -17,17 +17,12 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 
-static bfd_boolean h8300_scan
-  (const struct bfd_arch_info *, const char *);
-static const bfd_arch_info_type * compatible
-  (const bfd_arch_info_type *, const bfd_arch_info_type *);
-
 static bfd_boolean
 h8300_scan (const struct bfd_arch_info *info, const char *string)
 {
@@ -101,8 +96,18 @@ h8300_scan (const struct bfd_arch_info *info, const char *string)
 static const bfd_arch_info_type *
 compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
 {
+  if (in->arch != out->arch)
+    return 0;
+  if (in->mach == bfd_mach_h8300sx && out->mach == bfd_mach_h8300s)
+    return in;
+  if (in->mach == bfd_mach_h8300s && out->mach == bfd_mach_h8300sx)
+    return out;
+  if (in->mach == bfd_mach_h8300sxn && out->mach == bfd_mach_h8300sn)
+    return in;
+  if (in->mach == bfd_mach_h8300sn && out->mach == bfd_mach_h8300sxn)
+    return out;
   /* It's really not a good idea to mix and match modes.  */
-  if (in->arch != out->arch || in->mach != out->mach)
+  if (in->mach != out->mach)
     return 0;
   else
     return in;
@@ -111,7 +116,7 @@ compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
 static const bfd_arch_info_type h8300sxn_info_struct =
 {
   32,                          /* 32 bits in a word */
-  32,                          /* 32 bits in an address */
+  16,                          /* 16 bits in an address */
   8,                           /* 8 bits in a byte */
   bfd_arch_h8300,
   bfd_mach_h8300sxn,
@@ -143,7 +148,7 @@ static const bfd_arch_info_type h8300sx_info_struct =
 static const bfd_arch_info_type h8300sn_info_struct =
 {
   32,                          /* 32 bits in a word.  */
-  32,                          /* 32 bits in an address.  */
+  16,                          /* 16 bits in an address.  */
   8,                           /* 8 bits in a byte.  */
   bfd_arch_h8300,
   bfd_mach_h8300sn,
@@ -156,11 +161,10 @@ static const bfd_arch_info_type h8300sn_info_struct =
   &h8300sx_info_struct
 };
 
-
 static const bfd_arch_info_type h8300hn_info_struct =
 {
   32,                          /* 32 bits in a word.  */
-  32,                          /* 32 bits in an address.  */
+  16,                          /* 16 bits in an address.  */
   8,                           /* 8 bits in a byte.  */
   bfd_arch_h8300,
   bfd_mach_h8300hn,