[Courgette] Disassembler code movement and format fix.

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 161 matching lines @@
 
   // Parsing code for Disassemble().
 
   virtual CheckBool ParseRelocationSection(const Elf32_Shdr* section_header,
                                            InstructionReceptor* receptor) const
       WARN_UNUSED_RESULT = 0;
 
   virtual CheckBool ParseRel32RelocsFromSection(const Elf32_Shdr* section)
       WARN_UNUSED_RESULT = 0;
 
+  CheckBool ParseAbs32Relocs() WARN_UNUSED_RESULT;
+
+  // Extracts all rel32 TypedRVAs. Does not sort the result.
+  CheckBool ParseRel32RelocsFromSections() WARN_UNUSED_RESULT;
+
   // Disassembler interfaces.
   RvaVisitor* CreateAbs32TargetRvaVisitor() override;
   RvaVisitor* CreateRel32TargetRvaVisitor() override;
   void RemoveUnusedRel32Locations(AssemblyProgram* program) override;
 
   CheckBool ParseFile(AssemblyProgram* target,
                       InstructionReceptor* receptor) const WARN_UNUSED_RESULT;
 
   CheckBool ParseProgbitsSection(
       const Elf32_Shdr* section_header,
       std::vector<FileOffset>::iterator* current_abs_offset,
       std::vector<FileOffset>::iterator end_abs_offset,
       std::vector<std::unique_ptr<TypedRVA>>::iterator* current_rel,
       std::vector<std::unique_ptr<TypedRVA>>::iterator end_rel,
       AssemblyProgram* program,
       InstructionReceptor* receptor) const WARN_UNUSED_RESULT;
 
   CheckBool ParseSimpleRegion(FileOffset start_file_offset,
                               FileOffset end_file_offset,
                               InstructionReceptor* receptor) const
       WARN_UNUSED_RESULT;
 
-  CheckBool ParseAbs32Relocs() WARN_UNUSED_RESULT;
-
   CheckBool CheckSection(RVA rva) WARN_UNUSED_RESULT;
 
-  // Extracts all rel32 TypedRVAs. Does not sort the result.
-  CheckBool ParseRel32RelocsFromSections() WARN_UNUSED_RESULT;
-
   const Elf32_Ehdr* header_;
 
   Elf32_Half section_header_table_size_;
 
   // Section header table, ordered by section id.
   std::vector<Elf32_Shdr> section_header_table_;
 
   // An ordering of |section_header_table_|, sorted by file offset.
   std::vector<Elf32_Half> section_header_file_offset_order_;
 
   const Elf32_Phdr* program_header_table_;
   Elf32_Half program_header_table_size_;
 
   // Pointer to string table containing section names.
   const char* default_string_section_;
   size_t default_string_section_size_;
 
   // Sorted abs32 and reel32 RVAs. These are mutable because ParseFile() needs
   // to sort these by file offsets.
   mutable std::vector<RVA> abs32_locations_;
   mutable std::vector<std::unique_ptr<TypedRVA>> rel32_locations_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisassemblerElf32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_ELF_32_H_