Fri Sep 25 11:11:57 1992 Steve Chamberlain (sac@thepub.cygnus.com)

	* coff-z8k.c: getting closer
	* coffcode.h (coff_get_relocated_section_contents): allow
	EXTRA_CASES hooks for different arches to provide different reloc
	types.
	* seclet.h: #ifndef around it to allow multiple inclusion
	* srec.c: minor doc fix

4 files changed, 241 insertions, 3 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d39bd44..8518e41 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,18 @@
+Fri Sep 25 11:11:57 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* coff-z8k.c: getting closer
+	* coffcode.h (coff_get_relocated_section_contents): allow
+	EXTRA_CASES hooks for different arches to provide different reloc
+	types.
+	* seclet.h: #ifndef around it to allow multiple inclusion
+	* srec.c: minor doc fix
+	
+	
+
+Mon Sep 21 14:33:58 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* hosts/hp9000.h, hosts/irix3.h: changes from WRS.
+
 Sun Sep 20 08:48:25 1992  Fred Fish  (fnf@cygnus.com)
 
 	* configure.in:  Use i386-elf for all i386/i486 sysv4 hosts, not
diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
new file mode 100644
index 0000000..ab29dba
--- /dev/null
+++ b/bfd/coff-z8k.c
@@ -0,0 +1,211 @@
+/* Zilog Z800n COFF back-end for BFD.
+   Copyright (C) 1992 Free Software Foundation, Inc.
+   Written by Steve Chamberlain
+   sac@cygnus.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
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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"
+#include "obstack.h"
+#include "coff/z8k.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+#include "seclet.h"
+extern bfd_error_vector_type bfd_error_vector;
+func_da() {}
+func_jr() {}
+
+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_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;
+{
+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 __A_MAGIC_SET__
+
+
+
+/* Code to swap in the reloc */
+#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
+#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'; 
+
+/* 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)
+{
+  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;
+    }
+}
+
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
+
+
+/* Perform any necessaru magic to the addend in a reloc entry */
+
+
+#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)
+{
+  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;*/
+}
+
+static bfd_vma get_value();
+static
+extra_case(in_abfd, seclet, reloc, data, src_ptr, dst_ptr)
+bfd *in_abfd;
+bfd_seclet_type *seclet;
+arelent *reloc;
+bfd_byte *data;
+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();
+  }
+}
+#define EXTRA_CASES default: extra_case(in_abfd,seclet,reloc, data, &src_address, &dst_address);
+
+
+
+
+#include "coffcode.h"
+
+
+#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
+
+bfd_target z8kcoff_vec =
+{
+  "coff-z8k",		/* name */
+  bfd_target_coff_flavour,
+  true,				/* data byte order is big */
+  true,				/* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |		/* object flags */
+   HAS_LINENO | HAS_DEBUG |
+   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT),
+
+  ( SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  '/',				/* 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 */
+
+  {_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},
+  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
+     _bfd_write_archive_contents, bfd_false},
+
+     JUMP_TABLE(coff),
+    COFF_SWAP_TABLE
+};
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index dfe7127..17f6283 100644
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -2657,10 +2657,15 @@ DEFUN(coff_write_object_contents,(abfd),
   internal_a.magic = PAGEMAGICBCS;
 #endif				/* M88 */
 
-#if M68 || I386 || MIPS || WE32K
+#if M68 || MIPS || WE32K
 #define __A_MAGIC_SET__
   /* Never was anything here for the 68k */
-#endif				/* M68 || I386 || MIPS || WE32K */
+#endif				/* M68 || MIPS || WE32K */
+
+#if I386
+# define __A_MAGIC_SET__
+  internal_a.magic = ZMAGIC;
+#endif /* I386 */
 
 #if RS6000COFF_C
 #define __A_MAGIC_SET__
@@ -4162,9 +4167,13 @@ DEFUN(bfd_coff_get_relocated_section_contents,(in_abfd, seclet, data),
 	  dst_address+=2;
 	  src_address+=2;
 	  break;
-	
+#ifdef EXTRA_CASES
+	EXTRA_CASES
+#else
+
 	default:
 	  abort();
+#endif
 	}
       }    
     }
diff --git a/bfd/seclet.h b/bfd/seclet.h
index d4e9452..7b58b39 100644
--- a/bfd/seclet.h
+++ b/bfd/seclet.h
@@ -1,3 +1,5 @@
+#ifndef _SECLET_H
+#define _SECLET_H
 typedef enum 
 {
   
@@ -29,3 +31,4 @@ struct bfd_seclet_struct
 typedef struct bfd_seclet_struct bfd_seclet_type;
 
 bfd_seclet_type *EXFUN(bfd_new_seclet,(bfd*,asection*));
+#endif