1 files changed, 39 insertions, 8 deletions
diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
index e1c77bfe2e6..1a4f4d7a065 100644
--- a/bfd/cpu-h8300.c
+++ b/bfd/cpu-h8300.c
@@ -24,14 +24,12 @@
 #include "libbfd.h"
 
 static bfd_boolean h8300_scan
-  PARAMS ((const struct bfd_arch_info *, const char *));
+  (const struct bfd_arch_info *, const char *);
 static const bfd_arch_info_type * compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
+  (const bfd_arch_info_type *, const bfd_arch_info_type *);
 
 static bfd_boolean
-h8300_scan (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
+h8300_scan (const struct bfd_arch_info *info, const char *string)
 {
   if (*string != 'h' && *string != 'H')
     return FALSE;
@@ -101,9 +99,7 @@ h8300_scan (info, string)
    info structure.  */
 
 static const bfd_arch_info_type *
-compatible (in, out)
-     const bfd_arch_info_type *in;
-     const bfd_arch_info_type *out;
+compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
 {
   /* It's really not a good idea to mix and match modes.  */
   if (in->arch != out->arch || in->mach != out->mach)
@@ -224,3 +220,38 @@ const bfd_arch_info_type bfd_h8300_arch =
   h8300_scan,
   &h8300h_info_struct
 };
+
+/* Pad the given address to 32 bits, converting 16-bit and 24-bit
+   addresses into the values they would have had on a h8s target.  */
+
+bfd_vma
+bfd_h8300_pad_address (bfd *abfd, bfd_vma address)
+{
+  /* Cope with bfd_vma's larger than 32 bits.  */
+  address &= 0xffffffffu;
+
+  switch (bfd_get_mach (abfd))
+    {
+    case bfd_mach_h8300:
+    case bfd_mach_h8300hn:
+    case bfd_mach_h8300sn:
+    case bfd_mach_h8300sxn:
+      /* Sign extend a 16-bit address.  */
+      if (address >= 0x8000)
+	return address | 0xffff0000u;
+      return address;
+
+    case bfd_mach_h8300h:
+      /* Sign extend a 24-bit address.  */
+      if (address >= 0x800000)
+	return address | 0xff000000u;
+      return address;
+
+    case bfd_mach_h8300s:
+    case bfd_mach_h8300sx:
+      return address;
+
+    default:
+      abort ();
+    }
+}