2001-06-07 H.J. Lu <hjl@gnu.org>

[deliverable/binutils-gdb.git] / bfd / aout-cris.c

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 36f85533697061ee6b367b2a0ad2d0ab68ff782f..32357f4b6bf2bf4067e1e2f9acab880ceae035f9 100644 (file)
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -28,6 +28,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ENTRY_CAN_BE_ZERO
 #define TEXT_START_ADDR 0
 
+/* Without reading symbols to get the text start symbol, there is no way
+   to know where the text segment starts in an a.out file.  Defaulting to
+   anything as constant as TEXT_START_ADDR is bad.  But we can guess from
+   the entry point, which is usually within the first 64k of the text
+   segment.  We also assume here that the text segment is 64k-aligned.
+   FIXME: It is also wrong to assume that data and bss follow immediately
+   after text, but with those, we don't have any choice besides reading
+   symbol info, and luckily there's no pressing need for correctness for
+   those vma:s at this time.  */
+#define N_TXTADDR(x) ((x).a_entry & ~0xffff)
+
 /* If you change this to 4, you can not link to an address N*4+2.  */
 #define SEGMENT_SIZE 2
 
@@ -36,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    adata(abfd).zmagic_disk_block_size, even though the exec_header is
    *not* included in the text segment.  A simple workaround is to
    #define ZMAGIC_DISK_BLOCK_SIZE, which is used if defined; otherwise
-   TARGET_PAGE_SIZE is used. */
+   TARGET_PAGE_SIZE is used.  */
 #define ZMAGIC_DISK_BLOCK_SIZE N_TXTOFF (0)
 
 /* It seems odd at first to set a page-size this low, but gives greater
@@ -101,11 +112,12 @@ static boolean MY(set_sizes) PARAMS ((bfd *));
 #define MY_get_section_contents aout_32_get_section_contents
 #endif
 
+#define MACHTYPE_OK(mtype) ((mtype) == M_CRIS)
+
 /* Include generic functions (some are overridden above).  */
 #include "aout32.c"
 #include "aout-target.h"
 
-
 /* We need our own version to set header flags.  */
 
 static boolean
@@ -133,10 +145,9 @@ MY(write_object_contents) (abfd)
   return true;
 }
 
-
 /* We need our own for these reasons:
-   - Assert that a normal 8, 16 or 32 reloc is output. 
-   - Fix what seems to be a weak-bug (perhaps there for valid reasons).  */ 
+   - Assert that a normal 8, 16 or 32 reloc is output.
+   - Fix what seems to be a weak-bug (perhaps there for valid reasons).  */
 
 static void
 MY(swap_ext_reloc_out) (abfd, g, natptr)
@@ -195,7 +206,7 @@ MY(swap_ext_reloc_out) (abfd, g, natptr)
     {
       (*_bfd_error_handler) (_("%s: Invalid relocation type exported: %d"),
                             bfd_get_filename (abfd), r_type);
-    
+
       bfd_set_error (bfd_error_wrong_format);
     }
 
@@ -210,7 +221,6 @@ MY(swap_ext_reloc_out) (abfd, g, natptr)
   PUT_WORD (abfd, r_addend, natptr->r_addend);
 }
 
-
 /* We need our own to assert that a normal 8, 16 or 32 reloc is input.  */
 
 static void
@@ -240,10 +250,10 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
     {
       (*_bfd_error_handler) (_("%s: Invalid relocation type imported: %d"),
                             bfd_get_filename (abfd), r_type);
-    
+
       bfd_set_error(bfd_error_wrong_format);
     }
-    
+
   cache_ptr->howto =  howto_table_ext + r_type;
 
   if (r_extern && r_index > symcount)
@@ -251,7 +261,7 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
       (*_bfd_error_handler)
         (_("%s: Bad relocation record imported: %d"),
          bfd_get_filename (abfd), r_index);
-    
+
       bfd_set_error (bfd_error_wrong_format);
 
       /* We continue, so we can catch further errors.  */
@@ -264,7 +274,6 @@ MY(swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
   MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
 }
 
-
 /* We use the same as the default, except that we also set
    "obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;", to avoid changing
    NAME (aout, set_arch_mach) in aoutx.  */
@@ -286,7 +295,7 @@ MY(set_sizes) (abfd)
      target-specific things should not be added there.  */
 
   obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-  
+
   return true;
 }