[Courgette] Refactor: Unify Disassembler::Disassemble() and instantiate AssemblyProgram there.

courgette/disassembler_win32.h

 // Copyright 2016 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_WIN32_H_
 #define COURGETTE_DISASSEMBLER_WIN32_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "courgette/disassembler.h"
 #include "courgette/image_utils.h"
+#include "courgette/instruction_utils.h"
 #include "courgette/memory_allocator.h"
 #include "courgette/types_win_pe.h"
 
 namespace courgette {
 
 class AssemblyProgram;
-class InstructionReceptor;
 
 class DisassemblerWin32 : public Disassembler {
  public:
   virtual ~DisassemblerWin32() = default;
 
   // Disassembler interfaces.
   RVA FileOffsetToRVA(FileOffset file_offset) const override;
   FileOffset RVAToFileOffset(RVA rva) const override;
   ExecutableType kind() const override = 0;
   uint64_t image_base() const override { return image_base_; }
   RVA PointerToTargetRVA(const uint8_t* p) const override = 0;
   bool ParseHeader() override;
-  bool Disassemble(AssemblyProgram* program) override;
 
   // Exposed for test purposes
   bool has_text_section() const { return has_text_section_; }
   uint32_t size_of_code() const { return size_of_code_; }
 
   // Returns 'true' if the base relocation table can be parsed.
   // Output is a vector of the RVAs corresponding to locations within executable
   // that are listed in the base relocation table.
   bool ParseRelocs(std::vector<RVA>* addresses);
 
   // Returns Section containing the relative virtual address, or null if none.
   const Section* RVAToSection(RVA rva) const;
 
   static std::string SectionName(const Section* section);
 
  protected:
   // Returns true if a valid executable is detected using only quick checks.
   // Derived classes should inject |magic| corresponding to their architecture,
   // which will be checked against the detected one.
   static bool QuickDetect(const uint8_t* start, size_t length, uint16_t magic);
 
   bool ParseAbs32Relocs();
   void ParseRel32RelocsFromSections();
 
   // Disassembler interfaces.
+  bool ExtractAbs32Locations() override;
+  bool ExtractRel32Locations() override;
   RvaVisitor* CreateAbs32TargetRvaVisitor() override;
   RvaVisitor* CreateRel32TargetRvaVisitor() override;
   void RemoveUnusedRel32Locations(AssemblyProgram* program) override;
+  InstructionGenerator GetInstructionGenerator(
+      AssemblyProgram* program) override;
 
   DisassemblerWin32(const uint8_t* start, size_t length);
 
   CheckBool ParseFile(AssemblyProgram* target,
                       InstructionReceptor* receptor) const WARN_UNUSED_RESULT;
   virtual void ParseRel32RelocsFromSection(const Section* section) = 0;
 
   CheckBool ParseNonSectionFileRegion(FileOffset start_file_offset,
                                       FileOffset end_file_offset,
                                       InstructionReceptor* receptor) const
@@ skipping 71 matching lines @@
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisassemblerWin32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_WIN32_H_