[Courgette] Refactor: Add and use Instruction*Receptor classes; call ParseFile() in 2 passes.

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/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;
-  virtual ExecutableType kind() const override = 0;
-  virtual RVA PointerToTargetRVA(const uint8_t* p) const override = 0;
+  ExecutableType kind() const override = 0;
+  RVA PointerToTargetRVA(const uint8_t* p) const override = 0;
   bool ParseHeader() override;
   bool Disassemble(AssemblyProgram* target) 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.
@@ skipping 10 matching lines @@
   // which will be checked against the detected one.
   static bool QuickDetect(const uint8_t* start, size_t length, uint16_t magic);
 
   // Disassembler interfaces.
   RvaVisitor* CreateAbs32TargetRvaVisitor() override;
   RvaVisitor* CreateRel32TargetRvaVisitor() override;
   void RemoveUnusedRel32Locations(AssemblyProgram* program) override;
 
   DisassemblerWin32(const uint8_t* start, size_t length);
 
-  CheckBool ParseFile(AssemblyProgram* target) WARN_UNUSED_RESULT;
+  CheckBool ParseFile(AssemblyProgram* target,
+                      InstructionReceptor* receptor) const WARN_UNUSED_RESULT;
   bool ParseAbs32Relocs();
   void ParseRel32RelocsFromSections();
   virtual void ParseRel32RelocsFromSection(const Section* section) = 0;
 
   CheckBool ParseNonSectionFileRegion(FileOffset start_file_offset,
                                       FileOffset end_file_offset,
-                                      AssemblyProgram* program)
+                                      InstructionReceptor* receptor) const
       WARN_UNUSED_RESULT;
   CheckBool ParseFileRegion(const Section* section,
                             FileOffset start_file_offset,
                             FileOffset end_file_offset,
-                            AssemblyProgram* program) WARN_UNUSED_RESULT;
+                            AssemblyProgram* program,
+                            InstructionReceptor* receptor) const
+      WARN_UNUSED_RESULT;
 
   // Returns address width in byte count.
   virtual int AbsVAWidth() const = 0;
-  // Emits Abs 32/64 |label| to the |program|.
-  virtual CheckBool EmitAbs(Label* label, AssemblyProgram* program) = 0;
+  // Emits Abs 32/64 |label| to the |receptor|.
+  virtual CheckBool EmitAbs(Label* label,
+                            InstructionReceptor* receptor) const = 0;
   // Returns true if type is recognized.
   virtual bool SupportsRelTableType(int type) const = 0;
   virtual uint16_t OffsetOfDataDirectories() const = 0;
 
 #if COURGETTE_HISTOGRAM_TARGETS
-  void HistogramTargets(const char* kind, const std::map<RVA, int>& map);
+  void HistogramTargets(const char* kind, const std::map<RVA, int>& map) const;
 #endif
 
   // Most addresses are represented as 32-bit RVAs. The one address we can't
   // do this with is the image base address.
   uint64_t image_base() const { return image_base_; }
 
   const ImageDataDirectory& base_relocation_table() const {
     return base_relocation_table_;
   }
 
@@ skipping 46 matching lines @@
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisassemblerWin32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_WIN32_H_