[BACK]Return to elf-nacl.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / external / gpl3 / binutils.old / dist / bfd

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/external/gpl3/binutils.old/dist/bfd/elf-nacl.c between version 1.1.1.1 and 1.1.1.1.2.1

version 1.1.1.1, 2016/01/26 17:26:00 version 1.1.1.1.2.1, 2016/11/04 14:43:50
Line 1 
Line 1 
 /* Native Client support for ELF  /* Native Client support for ELF
    Copyright 2012 Free Software Foundation, Inc.     Copyright (C) 2012-2015 Free Software Foundation, Inc.
   
    This file is part of BFD, the Binary File Descriptor library.     This file is part of BFD, the Binary File Descriptor library.
   
Line 20 
Line 20 
   
 #include "sysdep.h"  #include "sysdep.h"
 #include "bfd.h"  #include "bfd.h"
   #include "libbfd.h"
 #include "elf-bfd.h"  #include "elf-bfd.h"
 #include "elf-nacl.h"  #include "elf-nacl.h"
 #include "elf/common.h"  #include "elf/common.h"
Line 33  segment_executable (struct elf_segment_m
Line 34  segment_executable (struct elf_segment_m
   else    else
     {      {
       /* The p_flags value has not been computed yet,        /* The p_flags value has not been computed yet,
          so we have to look through the sections.  */           so we have to look through the sections.  */
       unsigned int i;        unsigned int i;
       for (i = 0; i < seg->count; ++i)        for (i = 0; i < seg->count; ++i)
         if (seg->sections[i]->flags & SEC_CODE)          if (seg->sections[i]->flags & SEC_CODE)
           return TRUE;            return TRUE;
     }      }
   return FALSE;    return FALSE;
 }  }
   
 /* Determine if this segment is eligible to receive the file and program  /* Determine if this segment is eligible to receive the file and program
    headers.  It must be read-only, non-executable, and have contents.     headers.  It must be read-only and non-executable.
    Its first section must start far enough past the page boundary to     Its first section must start far enough past the page boundary to
    allow space for the headers.  */     allow space for the headers.  */
 static bfd_boolean  static bfd_boolean
 segment_eligible_for_headers (struct elf_segment_map *seg,  segment_eligible_for_headers (struct elf_segment_map *seg,
                               bfd_vma maxpagesize, bfd_vma sizeof_headers)                                bfd_vma minpagesize, bfd_vma sizeof_headers)
 {  {
   bfd_boolean any_contents = FALSE;  
   unsigned int i;    unsigned int i;
   if (seg->count == 0 || seg->sections[0]->lma % maxpagesize < sizeof_headers)    if (seg->count == 0 || seg->sections[0]->lma % minpagesize < sizeof_headers)
     return FALSE;      return FALSE;
   for (i = 0; i < seg->count; ++i)    for (i = 0; i < seg->count; ++i)
     {      {
       if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY)        if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY)
         return FALSE;          return FALSE;
       if (seg->sections[i]->flags & SEC_HAS_CONTENTS)  
         any_contents = TRUE;  
     }      }
   return any_contents;    return TRUE;
 }  }
   
   
Line 71  segment_eligible_for_headers (struct elf
Line 69  segment_eligible_for_headers (struct elf
 bfd_boolean  bfd_boolean
 nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)  nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
 {  {
   struct elf_segment_map **m = &elf_tdata (abfd)->segment_map;    const struct elf_backend_data *const bed = get_elf_backend_data (abfd);
     struct elf_segment_map **m = &elf_seg_map (abfd);
   struct elf_segment_map **first_load = NULL;    struct elf_segment_map **first_load = NULL;
   struct elf_segment_map **last_load = NULL;    struct elf_segment_map **last_load = NULL;
   bfd_boolean moved_headers = FALSE;    bfd_boolean moved_headers = FALSE;
   int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info);    int sizeof_headers;
   bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize;  
   
   if (info != NULL && info->user_phdrs)    if (info != NULL && info->user_phdrs)
     /* The linker script used PHDRS explicitly, so don't change what the      /* The linker script used PHDRS explicitly, so don't change what the
        user asked for.  */         user asked for.  */
     return TRUE;      return TRUE;
   
     if (info != NULL)
       /* We're doing linking, so evalute SIZEOF_HEADERS as in a linker script.  */
       sizeof_headers = bfd_sizeof_headers (abfd, info);
     else
       {
         /* We're not doing linking, so this is objcopy or suchlike.
            We just need to collect the size of the existing headers.  */
         struct elf_segment_map *seg;
         sizeof_headers = bed->s->sizeof_ehdr;
         for (seg = *m; seg != NULL; seg = seg->next)
           sizeof_headers += bed->s->sizeof_phdr;
       }
   
   while (*m != NULL)    while (*m != NULL)
     {      {
       struct elf_segment_map *seg = *m;        struct elf_segment_map *seg = *m;
   
       if (seg->p_type == PT_LOAD)        if (seg->p_type == PT_LOAD)
         {          {
           /* First, we're just finding the earliest PT_LOAD.            bfd_boolean executable = segment_executable (seg);
              By the normal rules, this will be the lowest-addressed one.  
              We only have anything interesting to do if it's executable.  */  
           last_load = m;  
           if (first_load == NULL)  
             {  
               if (!segment_executable (*m))  
                 return TRUE;  
               first_load = m;  
             }  
           /* Now that we've noted the first PT_LOAD, we're looking for  
              the first non-executable PT_LOAD with a nonempty p_filesz.  */  
           else if (!moved_headers  
                    && segment_eligible_for_headers (seg, maxpagesize,  
                                                     sizeof_headers))  
             {  
               /* This is the one we were looking for!  
   
                  First, clear the flags on previous segments that  
                  say they include the file header and phdrs.  */  
               struct elf_segment_map *prevseg;  
               for (prevseg = *first_load;  
                    prevseg != seg;  
                    prevseg = prevseg->next)  
                 if (prevseg->p_type == PT_LOAD)  
                   {  
                     prevseg->includes_filehdr = 0;  
                     prevseg->includes_phdrs = 0;  
                   }  
   
               /* This segment will include those headers instead.  */  
               seg->includes_filehdr = 1;  
               seg->includes_phdrs = 1;  
   
               moved_headers = TRUE;  
             }  
         }  
   
             if (executable
                 && seg->count > 0
                 && seg->sections[0]->vma % bed->minpagesize == 0)
               {
                 asection *lastsec = seg->sections[seg->count - 1];
                 bfd_vma end = lastsec->vma + lastsec->size;
                 if (end % bed->minpagesize != 0)
                   {
                     /* This is an executable segment that starts on a page
                        boundary but does not end on a page boundary.  Fill
                        it out to a whole page with code fill (the tail of
                        the segment will not be within any section).  Thus
                        the entire code segment can be mapped from the file
                        as whole pages and that mapping will contain only
                        valid instructions.
   
                        To accomplish this, we must fake out the code in
                        assign_file_positions_for_load_sections (elf.c) so
                        that it advances past the rest of the final page,
                        rather than trying to put the next (unaligned, or
                        unallocated) section.  We do this by appending a
                        dummy section record to this element in the segment
                        map.  No such output section ever actually exists,
                        but this gets the layout logic to advance the file
                        positions past this partial page.  Since we are
                        lying to BFD like this, nothing will ever know to
                        write the section contents.  So we do that by hand
                        after the fact, in nacl_final_write_processing, below.  */
   
                     struct elf_segment_map *newseg;
                     asection *sec;
                     struct bfd_elf_section_data *secdata;
   
                     BFD_ASSERT (!seg->p_size_valid);
   
                     secdata = bfd_zalloc (abfd, sizeof *secdata);
                     if (secdata == NULL)
                       return FALSE;
   
                     sec = bfd_zalloc (abfd, sizeof *sec);
                     if (sec == NULL)
                       return FALSE;
   
                     /* Fill in only the fields that actually affect the logic
                        in assign_file_positions_for_load_sections.  */
                     sec->vma = end;
                     sec->lma = lastsec->lma + lastsec->size;
                     sec->size = bed->minpagesize - (end % bed->minpagesize);
                     sec->flags = (SEC_ALLOC | SEC_LOAD
                                   | SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED);
                     sec->used_by_bfd = secdata;
   
                     secdata->this_hdr.sh_type = SHT_PROGBITS;
                     secdata->this_hdr.sh_flags = SHF_ALLOC | SHF_EXECINSTR;
                     secdata->this_hdr.sh_addr = sec->vma;
                     secdata->this_hdr.sh_size = sec->size;
   
                     newseg = bfd_alloc (abfd,
                                         sizeof *newseg + ((seg->count + 1)
                                                           * sizeof (asection *)));
                     if (newseg == NULL)
                       return FALSE;
                     memcpy (newseg, seg,
                             sizeof *newseg + (seg->count * sizeof (asection *)));
                     newseg->sections[newseg->count++] = sec;
                     *m = seg = newseg;
                   }
               }
   
             /* First, we're just finding the earliest PT_LOAD.
                By the normal rules, this will be the lowest-addressed one.
                We only have anything interesting to do if it's executable.  */
             last_load = m;
             if (first_load == NULL)
               {
                 if (!executable)
                   goto next;
                 first_load = m;
               }
             /* Now that we've noted the first PT_LOAD, we're looking for
                the first non-executable PT_LOAD with a nonempty p_filesz.  */
             else if (!moved_headers
                      && segment_eligible_for_headers (seg, bed->minpagesize,
                                                       sizeof_headers))
               {
                 /* This is the one we were looking for!
   
                    First, clear the flags on previous segments that
                    say they include the file header and phdrs.  */
                 struct elf_segment_map *prevseg;
                 for (prevseg = *first_load;
                      prevseg != seg;
                      prevseg = prevseg->next)
                   if (prevseg->p_type == PT_LOAD)
                     {
                       prevseg->includes_filehdr = 0;
                       prevseg->includes_phdrs = 0;
                     }
   
                 /* This segment will include those headers instead.  */
                 seg->includes_filehdr = 1;
                 seg->includes_phdrs = 1;
   
                 moved_headers = TRUE;
               }
           }
   
       next:
       m = &seg->next;        m = &seg->next;
     }      }
   
   if (first_load != last_load && moved_headers)    if (first_load != last_load && moved_headers)
     {      {
       /* Now swap the first and last PT_LOAD segments'        /* Now swap the first and last PT_LOAD segments'
          positions in segment_map.  */           positions in segment_map.  */
       struct elf_segment_map *first = *first_load;        struct elf_segment_map *first = *first_load;
       struct elf_segment_map *last = *last_load;        struct elf_segment_map *last = *last_load;
       *first_load = first->next;        *first_load = first->next;
Line 151  nacl_modify_segment_map (bfd *abfd, stru
Line 234  nacl_modify_segment_map (bfd *abfd, stru
 bfd_boolean  bfd_boolean
 nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info)  nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info)
 {  {
   struct elf_segment_map **m = &elf_tdata (abfd)->segment_map;    struct elf_segment_map **m = &elf_seg_map (abfd);
   Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;    Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
   Elf_Internal_Phdr *p = phdr;    Elf_Internal_Phdr *p = phdr;
   
Line 164  nacl_modify_program_headers (bfd *abfd, 
Line 247  nacl_modify_program_headers (bfd *abfd, 
   while (*m != NULL)    while (*m != NULL)
     {      {
       if ((*m)->p_type == PT_LOAD && (*m)->includes_filehdr)        if ((*m)->p_type == PT_LOAD && (*m)->includes_filehdr)
         break;          break;
   
       m = &(*m)->next;        m = &(*m)->next;
       ++p;        ++p;
Line 178  nacl_modify_program_headers (bfd *abfd, 
Line 261  nacl_modify_program_headers (bfd *abfd, 
       Elf_Internal_Phdr *next_load_phdr = NULL;        Elf_Internal_Phdr *next_load_phdr = NULL;
   
       /* Now move past that first one and find the PT_LOAD that should be        /* Now move past that first one and find the PT_LOAD that should be
          before it by address order.  */           before it by address order.  */
   
       m = &(*m)->next;        m = &(*m)->next;
       ++p;        ++p;
   
       while ((*m) != NULL)        while (*m != NULL)
         {          {
           if (p->p_type == PT_LOAD && p->p_vaddr < first_load_phdr->p_vaddr)            if (p->p_type == PT_LOAD && p->p_vaddr < first_load_phdr->p_vaddr)
             {              {
               next_load_seg = m;                next_load_seg = m;
               next_load_phdr = p;                next_load_phdr = p;
               break;                break;
             }              }
   
           m = &(*m)->next;            m = &(*m)->next;
           ++p;            ++p;
         }          }
   
       /* Swap their positions in the segment_map back to how they used to be.        /* Swap their positions in the segment_map back to how they used to be.
          The phdrs have already been set up by now, so we have to slide up           The phdrs have already been set up by now, so we have to slide up
          the earlier ones to insert the one that should be first.  */           the earlier ones to insert the one that should be first.  */
       if (next_load_seg != NULL)        if (next_load_seg != NULL)
         {          {
           Elf_Internal_Phdr move_phdr;            Elf_Internal_Phdr move_phdr;
           struct elf_segment_map *first_seg = *first_load_seg;            struct elf_segment_map *first_seg = *first_load_seg;
           struct elf_segment_map *next_seg = *next_load_seg;            struct elf_segment_map *next_seg = *next_load_seg;
           struct elf_segment_map *first_next = first_seg->next;            struct elf_segment_map *first_next = first_seg->next;
           struct elf_segment_map *next_next = next_seg->next;            struct elf_segment_map *next_next = next_seg->next;
   
           first_seg->next = next_next;            if (next_load_seg == &first_seg->next)
           *first_load_seg = next_seg;              {
                 *first_load_seg = next_seg;
           next_seg->next = first_next;                next_seg->next = first_seg;
           *next_load_seg = first_seg;                first_seg->next = next_next;
               }
           move_phdr = *next_load_phdr;            else
           memmove (first_load_phdr + 1, first_load_phdr,              {
                    (next_load_phdr - first_load_phdr) * sizeof move_phdr);                *first_load_seg = first_next;
           *first_load_phdr = move_phdr;                *next_load_seg = next_next;
         }  
                 first_seg->next = *next_load_seg;
                 *next_load_seg = first_seg;
   
                 next_seg->next = *first_load_seg;
                 *first_load_seg = next_seg;
               }
   
             move_phdr = *next_load_phdr;
             memmove (first_load_phdr + 1, first_load_phdr,
                      (next_load_phdr - first_load_phdr) * sizeof move_phdr);
             *first_load_phdr = move_phdr;
           }
     }      }
   
   return TRUE;    return TRUE;
 }  }
   
   void
   nacl_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED)
   {
     struct elf_segment_map *seg;
     for (seg = elf_seg_map (abfd); seg != NULL; seg = seg->next)
       if (seg->p_type == PT_LOAD
           && seg->count > 1
           && seg->sections[seg->count - 1]->owner == NULL)
         {
           /* This is a fake section added in nacl_modify_segment_map, above.
              It's not a real BFD section, so nothing wrote its contents.
              Now write out its contents.  */
   
           asection *sec = seg->sections[seg->count - 1];
           char *fill;
   
           BFD_ASSERT (sec->flags & SEC_LINKER_CREATED);
           BFD_ASSERT (sec->flags & SEC_CODE);
           BFD_ASSERT (sec->size > 0);
   
           fill = abfd->arch_info->fill (sec->size, bfd_big_endian (abfd), TRUE);
   
           if (fill == NULL
               || bfd_seek (abfd, sec->filepos, SEEK_SET) != 0
               || bfd_bwrite (fill, sec->size, abfd) != sec->size)
             {
               /* We don't have a proper way to report an error here.  So
                  instead fudge things so that elf_write_shdrs_and_ehdr will
                  fail.  */
               elf_elfheader (abfd)->e_shoff = (file_ptr) -1;
             }
   
           free (fill);
         }
   }

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.1.2.1

CVSweb <webmaster@jp.NetBSD.org>