These changes cut the size of libbfd.a on a Sun4 by about 11%.

Somewhat more could be done.

Fri Jan  8 15:47:53 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)

	* coffcode.h: Moved many generic functions into coffgen.c.  Moved
	swapping functions into coffswap.h for ECOFF use.  Moved
	relocation functions, only used by h8300 and z8k, into reloc16.c.
	Added hooks for coffgen.c functions to backend data structure, and
	added hook functions.  Still more could be done.
	* coffswap.h: New file to hold COFF swapping routines.
	* coffgen.c: New file to hold generic COFF functions.
	* reloc16.c: New file to hold h8300 and z8k specific relocation
	functions.
	* libcoff-in.h: Added declarations for functions in coffgen.c.
	* libcoff.h: Rebuilt to incorporate changes.
	* coff-h8300.c: Function name changes.
	* coff-z8k.c: Function name changes.  Use coff_reloc16_extra_cases
	hook rather than defining EXTRA_CASES.
	* Makefile.in: Build new files coffgen and reloc16.  Added
	dependencies of coff-*.o on coffswap.h and seclet.h.

1 files changed, 167 insertions, 115 deletions

diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
index 864b51e..d2ad241 100644
--- a/bfd/coff-z8k.c
+++ b/bfd/coff-z8k.c
@@ -1,7 +1,7 @@
-/* Zilog Z800n COFF back-end for BFD.
-   Copyright (C) 1992 Free Software Foundation, Inc.
-   Written by Steve Chamberlain
-   sac@cygnus.com
+/* BFD back-end for Zilog Z800n COFF binaries.
+   Copyright 1992 Free Software Foundation, Inc.
+   Contributed by Cygnus Support.
+   Written by Steve Chamberlain, <sac@cygnus.com>.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -19,7 +19,6 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
@@ -33,51 +32,74 @@ extern bfd_error_vector_type bfd_error_vector;
 
 /* Dummy for now */
 static bfd_reloc_status_type
-DEFUN(func_da, (abfd, reloc_entry, symbol, data, input_section, output_bfd),
-    bfd *abfd AND
-    arelent *reloc_entry AND
-    struct symbol_cache_entry *symbol AND
-    PTR data AND
-    asection *input_section AND 
-    bfd *output_bfd)
+DEFUN (func_da, (abfd, reloc_entry, symbol, data, input_section, output_bfd),
+       bfd * abfd AND
+       arelent * reloc_entry AND
+       struct symbol_cache_entry *symbol AND
+       PTR data AND
+       asection * input_section AND
+       bfd * output_bfd)
 {
 }
 
 /* Dummy for now */
 static bfd_reloc_status_type
-DEFUN(func_jr, (abfd, reloc_entry, symbol, data, input_section, output_bfd),
-    bfd *abfd AND
-    arelent *reloc_entry AND
-    struct symbol_cache_entry *symbol AND
-    PTR data AND
-    asection *input_section AND 
-    bfd *output_bfd)
+DEFUN (func_imm8, (abfd, reloc_entry, symbol, data, input_section, output_bfd),
+       bfd * abfd AND
+       arelent * reloc_entry AND
+       struct symbol_cache_entry *symbol AND
+       PTR data AND
+       asection * input_section AND
+       bfd * output_bfd)
 {
 }
 
-static reloc_howto_type r_da =
-  HOWTO(R_DA , 0,  1, 	16, false, 0, true,
-true,func_da,"r_da",	true, 0x0000ffff,0x0000ffff, false);
+/* Dummy for now */
+static bfd_reloc_status_type
+DEFUN (func_jr, (abfd, reloc_entry, symbol, data, input_section, output_bfd),
+       bfd * abfd AND
+       arelent * reloc_entry AND
+       struct symbol_cache_entry *symbol AND
+       PTR data AND
+       asection * input_section AND
+       bfd * output_bfd)
+{
+}
 
-static reloc_howto_type r_jr = 
- HOWTO(R_JR, 0,1,8,true,0,true,true,func_jr,"r_jr", true,0,0,true);
 
+static reloc_howto_type r_imm32 =
+HOWTO (R_IMM32, 0, 1, 32, false, 0, true,
+       true, func_jr, "r_imm32", true, 0xffffffff, 0xffffffff, false);
 
+static reloc_howto_type r_imm4l =
+HOWTO (R_IMM4L, 0, 1, 4, false, 0, true,
+       true, func_jr, "r_imm4l", true, 0xf, 0xf, false);
 
+static reloc_howto_type r_da =
+HOWTO (R_DA, 0, 1, 16, false, 0, true,
+       true, func_da, "r_da", true, 0x0000ffff, 0x0000ffff, false);
+
+static reloc_howto_type r_imm8 =
+HOWTO (R_IMM8, 0, 1, 8, false, 0, true,
+       true, func_imm8, "r_imm8", true, 0x000000ff, 0x000000ff, false);
 
+static reloc_howto_type r_jr =
+HOWTO (R_JR, 0, 1, 8, true, 0, true, true, func_jr, "r_jr", true, 0, 0, true);
 
 /* Turn a howto into a reloc number */
 
-static int coff_z8k_select_reloc(howto)
-reloc_howto_type *howto;
+static int 
+coff_z8k_select_reloc (howto)
+     reloc_howto_type *howto;
 {
-return howto->type;
+  return howto->type;
 }
+
 #define SELECT_RELOC(x,howto) x= coff_z8k_select_reloc(howto)
 
 
 #define BADMAG(x) Z8KBADMAG(x)
-#define Z8K 1		/* Customize coffcode.h */
+#define Z8K 1			/* Customize coffcode.h */
 #define __A_MAGIC_SET__
 
 
@@ -87,24 +109,35 @@ return howto->type;
 #define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
   dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C'; 
+  dst->r_stuff[1] = 'C';
 
 /* Code to turn a r_type into a howto ptr, uses the above howto table
    */
 
-static void 
-DEFUN(rtype2howto,(internal, dst),
-arelent *internal AND
-struct internal_reloc *dst)
+static void
+DEFUN (rtype2howto, (internal, dst),
+       arelent * internal AND
+       struct internal_reloc *dst)
 {
-  switch (dst->r_type) {
-   default:
-    printf("BAD %x\n", dst->r_type);
-   case R_DA:
-    internal->howto = &r_da;
-    break;
-   case R_JR:
-    internal->howto = &r_jr;
+  switch (dst->r_type)
+    {
+      default:
+      printf ("BAD %x\n", dst->r_type);
+    case R_IMM8:
+      internal->howto = &r_imm8;
+      break;
+    case R_DA:
+      internal->howto = &r_da;
+      break;
+    case R_JR:
+      internal->howto = &r_jr;
+      break;
+    case R_IMM32:
+      internal->howto = &r_imm32;
+      break;
+    case R_IMM4L:
+      internal->howto = &r_imm4l;
+      break;
     }
 }
 
@@ -117,43 +150,37 @@ struct internal_reloc *dst)
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
  cache_ptr->addend =  ext_reloc.r_offset;
 
- 
+
 #define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
  reloc_processing(relent, reloc, symbols, abfd, section)
 
-static void DEFUN(reloc_processing,(relent,reloc, symbols, abfd, section) ,
-	   arelent *relent AND
-	   struct internal_reloc *reloc AND
-	   asymbol **symbols AND
-	   bfd *abfd AND
-	   asection *section)
+static void 
+DEFUN (reloc_processing, (relent, reloc, symbols, abfd, section),
+       arelent * relent AND
+       struct internal_reloc *reloc AND
+       asymbol ** symbols AND
+       bfd * abfd AND
+       asection * section)
 {
-  relent->address = reloc->r_vaddr;		
-  rtype2howto(relent,reloc);
-
-  if (reloc->r_symndx > 0) 
-  {
-    
-    relent->sym_ptr_ptr = symbols + obj_convert(abfd)[reloc->r_symndx];
-
-  }
-  else 
-  {
-    relent->sym_ptr_ptr = &(bfd_abs_symbol);
-  }
-  
-
-  
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
+
+  if (reloc->r_symndx > 0)
+    {
+      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+    }
+  else
+    {
+      relent->sym_ptr_ptr = &(bfd_abs_symbol);
+    }
+
+
   relent->addend = reloc->r_offset;
-  
-  relent->address-= section->vma;
-/*  relent->section = 0;*/
+  relent->address -= section->vma;
 }
 
-static bfd_vma get_value();
-
 static void
-extra_case(in_abfd, seclet, reloc, data, src_ptr, dst_ptr)
+extra_case (in_abfd, seclet, reloc, data, src_ptr, dst_ptr)
      bfd *in_abfd;
      bfd_seclet_type *seclet;
      arelent *reloc;
@@ -161,49 +188,73 @@ extra_case(in_abfd, seclet, reloc, data, src_ptr, dst_ptr)
      unsigned int *src_ptr;
      unsigned int *dst_ptr;
 {
-  switch (reloc->howto->type) 
-  {
-   case R_DA:
-    bfd_put_16(in_abfd, get_value(reloc, seclet), data+*dst_ptr);
-    (*dst_ptr)+=2;
-    ( *src_ptr)+=2;
-    break;
-   case R_JR:
-   {
-     bfd_vma dst = get_value(reloc,seclet);
-     bfd_vma dot = seclet->offset 
-      + *dst_ptr
-       + seclet->u.indirect.section->output_section->vma;	  
-     int gap = dst - dot - 1 ; /* -1 since were in the odd byte of the
-				  word */
-     if (gap & 1) 
-      abort();
-     gap/=2;
-     if (gap > 128 || gap< -128) 
-     {
-       bfd_error_vector.reloc_value_truncated(reloc, seclet);
-     }
-     bfd_put_8(in_abfd, gap, data+*dst_ptr);
-     (*dst_ptr)++;
-     (*src_ptr)++;
-     break;
-   }
-   default:
-    abort();
-  }
+  switch (reloc->howto->type)
+    {
+    case R_IMM8:
+      bfd_put_8 (in_abfd, bfd_coff_reloc16_get_value (reloc, seclet),
+		 data + *dst_ptr);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_IMM32:
+      bfd_put_32 (in_abfd, bfd_coff_reloc16_get_value (reloc, seclet),
+		  data + *dst_ptr);
+      (*dst_ptr) += 4;
+      (*src_ptr) += 4;
+      break;
+
+    case R_IMM4L:
+      bfd_put_8 (in_abfd,
+		 (bfd_get_8 (in_abfd, data + *dst_ptr) & 0xf0) 
+		 | (0x0f & bfd_coff_reloc16_get_value (reloc, seclet)),
+		 data + *dst_ptr);
+      (*dst_ptr) += 1;
+      (*src_ptr) += 1;
+      break;
+
+    case R_DA:
+      bfd_put_16 (in_abfd, bfd_coff_reloc16_get_value (reloc, seclet),
+		  data + *dst_ptr);
+      (*dst_ptr) += 2;
+      (*src_ptr) += 2;
+      break;
+
+    case R_JR:
+      {
+	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, seclet);
+	bfd_vma dot = seclet->offset
+	+ *dst_ptr
+	+ seclet->u.indirect.section->output_section->vma;
+	int gap = dst - dot - 1;/* -1 since were in the odd byte of the
+				    word and the pc's been incremented */
+
+	if (gap & 1)
+	  abort ();
+	gap /= 2;
+	if (gap > 128 || gap < -128)
+	  {
+	    bfd_error_vector.reloc_value_truncated (reloc, seclet);
+	  }
+	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
+	(*dst_ptr)++;
+	(*src_ptr)++;
+	break;
+      }
+    default:
+      abort ();
+    }
 }
-#define EXTRA_CASES default: extra_case(in_abfd,seclet,reloc, data, &src_address, &dst_address);
-
-
 
+#define coff_reloc16_extra_cases extra_case
 
 #include "coffcode.h"
 
 
-#undef  coff_bfd_get_relocated_section_contents 
+#undef  coff_bfd_get_relocated_section_contents
 #undef coff_bfd_relax_section
-#define  coff_bfd_get_relocated_section_contents bfd_coff_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_relax_section
+#define  coff_bfd_get_relocated_section_contents bfd_coff_reloc16_get_relocated_section_contents
+#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
 bfd_target z8kcoff_vec =
 {
@@ -216,21 +267,22 @@ bfd_target z8kcoff_vec =
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT),
 
-  ( SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
   '_',				/* leading symbol underscore */
   '/',				/* ar_pad_char */
   15,				/* ar_max_namelen */
   1,				/* minimum section alignment */
-  _do_getb64, _do_putb64,  _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */
-  _do_getb64, _do_putb64,  _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */
+  _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16,	/* data */
+  _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16,	/* hdrs */
 
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
    bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
+  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
    bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
    _bfd_write_archive_contents, bfd_false},
 
-  JUMP_TABLE(coff),
-  COFF_SWAP_TABLE
- };
+  JUMP_TABLE (coff),
+  0, 0,
+  COFF_SWAP_TABLE,
+};