* ld-elfcomm/elfcomm.exp: Run $READELF not readelf.

[deliverable/binutils-gdb.git] / bfd / coff-z80.c

diff --git a/bfd/coff-z80.c b/bfd/coff-z80.c
index fe401d77b867e28a9c4809a9c57b07f0f03157c2..b866d2f1c420394fdc2af667bd3cdcfcc4f38f6d 100644 (file)
--- a/bfd/coff-z80.c
+++ b/bfd/coff-z80.c
@@ -1,12 +1,12 @@
 /* BFD back-end for Zilog Z80 COFF binaries.
 /* BFD back-end for Zilog Z80 COFF binaries.

-   Copyright 2005 Free Software Foundation, Inc.
+   Copyright 2005, 2007 Free Software Foundation, Inc.

    Contributed by Arnold Metselaar <arnold_m@operamail.com>
 
    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
    Contributed by Arnold Metselaar <arnold_m@operamail.com>
 
    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,


@@ -19,8 +19,8 @@
    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 "bfdlink.h"
 #include "coff/z80.h"
 #include "libbfd.h"
 #include "bfdlink.h"
 #include "coff/z80.h"


@@ -34,6 +34,11 @@ HOWTO (R_IMM32, 0, 1, 32, FALSE, 0,
        complain_overflow_dont, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff,
        FALSE);
 
        complain_overflow_dont, 0, "r_imm32", TRUE, 0xffffffff, 0xffffffff,
        FALSE);
 

+static reloc_howto_type r_imm24 =
+HOWTO (R_IMM24, 0, 1, 24, FALSE, 0,
+       complain_overflow_dont, 0, "r_imm24", TRUE, 0x00ffffff, 0x00ffffff,
+       FALSE);
+

 static reloc_howto_type r_imm16 =
 HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
        complain_overflow_dont, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff,
 static reloc_howto_type r_imm16 =
 HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
        complain_overflow_dont, 0, "r_imm16", TRUE, 0x0000ffff, 0x0000ffff,


@@ -84,6 +89,9 @@ rtype2howto (arelent *internal, struct internal_reloc *dst)
     case R_IMM16:
       internal->howto = &r_imm16;
       break;
     case R_IMM16:
       internal->howto = &r_imm16;
       break;

+    case R_IMM24:
+      internal->howto = &r_imm24;
+      break;

     case R_IMM32:
       internal->howto = &r_imm32;
       break;
     case R_IMM32:
       internal->howto = &r_imm32;
       break;


@@ -106,6 +114,7 @@ coff_z80_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
     {
     case BFD_RELOC_8:          return & r_imm8;
     case BFD_RELOC_16:         return & r_imm16;
     {
     case BFD_RELOC_8:          return & r_imm8;
     case BFD_RELOC_16:         return & r_imm16;

+    case BFD_RELOC_24:         return & r_imm24;

     case BFD_RELOC_32:         return & r_imm32;
     case BFD_RELOC_8_PCREL:    return & r_jr;
     case BFD_RELOC_Z80_DISP8:  return & r_off8;
     case BFD_RELOC_32:         return & r_imm32;
     case BFD_RELOC_8_PCREL:    return & r_jr;
     case BFD_RELOC_Z80_DISP8:  return & r_off8;


@@ -114,6 +123,26 @@ coff_z80_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
     }
 }
 
     }
 }
 

+static reloc_howto_type *
+coff_z80_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  if (strcasecmp (r_imm8.name, r_name) == 0)
+    return &r_imm8;
+  if (strcasecmp (r_imm16.name, r_name) == 0)
+    return &r_imm16;
+  if (strcasecmp (r_imm24.name, r_name) == 0)
+    return &r_imm24;
+  if (strcasecmp (r_imm32.name, r_name) == 0)
+    return &r_imm32;
+  if (strcasecmp (r_jr.name, r_name) == 0)
+    return &r_jr;
+  if (strcasecmp (r_off8.name, r_name) == 0)
+    return &r_off8;
+
+  return NULL;
+}
+

 /* Perform any necessary magic to the addend in a reloc entry.  */
 
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
 /* Perform any necessary magic to the addend in a reloc entry.  */
 
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \


@@ -173,7 +202,7 @@ extra_case (bfd *in_abfd,
       break;
 
     case R_IMM8:
       break;
 
     case R_IMM8:

-      val = bfd_get_16 ( in_abfd, data+*src_ptr)
+      val = bfd_get_8 ( in_abfd, data+*src_ptr)

        + bfd_coff_reloc16_get_value (reloc, link_info, input_section);
       bfd_put_8 (in_abfd, val, data + *dst_ptr);
       (*dst_ptr) += 1;
        + bfd_coff_reloc16_get_value (reloc, link_info, input_section);
       bfd_put_8 (in_abfd, val, data + *dst_ptr);
       (*dst_ptr) += 1;


@@ -188,6 +217,16 @@ extra_case (bfd *in_abfd,
       (*src_ptr) += 2;
       break;
 
       (*src_ptr) += 2;
       break;
 

+    case R_IMM24:
+      val = bfd_get_16 ( in_abfd, data+*src_ptr)
+       + (bfd_get_8 ( in_abfd, data+*src_ptr+2) << 16)
+       + bfd_coff_reloc16_get_value (reloc, link_info, input_section);
+      bfd_put_16 (in_abfd, val, data + *dst_ptr);
+      bfd_put_8 (in_abfd, val >> 16, data + *dst_ptr+2);
+      (*dst_ptr) += 3;
+      (*src_ptr) += 3;
+      break;
+

     case R_IMM32:
       val = bfd_get_32 ( in_abfd, data+*src_ptr)
        + bfd_coff_reloc16_get_value (reloc, link_info, input_section);
     case R_IMM32:
       val = bfd_get_32 ( in_abfd, data+*src_ptr)
        + bfd_coff_reloc16_get_value (reloc, link_info, input_section);


@@ -200,8 +239,8 @@ extra_case (bfd *in_abfd,
       {
        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
                                                  input_section);
       {
        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
                                                  input_section);

-       bfd_vma dot = (link_order->offset
-                      + *dst_ptr
+       bfd_vma dot = (*dst_ptr
+                      + input_section->output_offset

                       + input_section->output_section->vma);
        int gap = dst - dot - 1;  /* -1, Since the offset is relative
                                     to the value of PC after reading
                       + input_section->output_section->vma);
        int gap = dst - dot - 1;  /* -1, Since the offset is relative
                                     to the value of PC after reading


@@ -229,6 +268,7 @@ extra_case (bfd *in_abfd,
 
 #define coff_reloc16_extra_cases    extra_case
 #define coff_bfd_reloc_type_lookup  coff_z80_reloc_type_lookup
 
 #define coff_reloc16_extra_cases    extra_case
 #define coff_bfd_reloc_type_lookup  coff_z80_reloc_type_lookup

+#define coff_bfd_reloc_name_lookup coff_z80_reloc_name_lookup

 
 #include "coffcode.h"
 
 
 #include "coffcode.h"