[Courgette] Fix AssemblyProgram parsing for ELF-ARM.

courgette/disassembler_elf_32.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COURGETTE_DISASSEMBLER_ELF_32_H_
 #define COURGETTE_DISASSEMBLER_ELF_32_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 98 matching lines @@
 
   const Elf32_Shdr *SectionHeader(int id) const {
     assert(id >= 0 && id < SectionHeaderCount());
     return section_header_table_ + id;
   }
 
   const uint8_t* SectionBody(int id) const {
     return OffsetToPointer(SectionHeader(id)->sh_offset);
   }
 
-  Elf32_Word SectionBodySize(int id) const {
-    return SectionHeader(id)->sh_size;
-  }
-
   // Misc Segment Helpers
 
   Elf32_Half ProgramSegmentHeaderCount() const {
     return program_header_table_size_;
   }
 
   const Elf32_Phdr *ProgramSegmentHeader(int id) const {
     assert(id >= 0 && id < ProgramSegmentHeaderCount());
     return program_header_table_ + id;
   }
 
-  // The virtual memory address at which this program segment will be loaded
-  Elf32_Addr ProgramSegmentMemoryBegin(int id) const {
-    return ProgramSegmentHeader(id)->p_vaddr;
-  }
-
-  // The number of virtual memory bytes for this program segment
-  Elf32_Word ProgramSegmentMemorySize(int id) const {
-    return ProgramSegmentHeader(id)->p_memsz;
-  }
-
-  // Pointer into the source file for this program segment
-  Elf32_Addr ProgramSegmentFileOffset(int id) const {
-    return ProgramSegmentHeader(id)->p_offset;
-  }
-
-  // Number of file bytes for this program segment. Is <= ProgramMemorySize.
-  Elf32_Word ProgramSegmentFileSize(int id) const {
-    return ProgramSegmentHeader(id)->p_filesz;
-  }
-
   // Misc address space helpers
 
   CheckBool IsValidRVA(RVA rva) const WARN_UNUSED_RESULT;
 
   // Convert an ELF relocation struction into an RVA
   virtual CheckBool RelToRVA(Elf32_Rel rel, RVA* result)
     const WARN_UNUSED_RESULT = 0;
 
   // Returns kNoOffset if there is no file offset corresponding to 'rva'.
   CheckBool RVAToFileOffset(RVA rva, size_t* result) const WARN_UNUSED_RESULT;
@@ skipping 40 matching lines @@
 
   std::vector<RVA> abs32_locations_;
   ScopedVector<TypedRVA> rel32_locations_;
 
   DISALLOW_COPY_AND_ASSIGN(DisassemblerElf32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_ELF_32_H_