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

courgette/disassembler_elf_32_arm.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_ARM_H_
 #define COURGETTE_DISASSEMBLER_ELF_32_ARM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 
 #include "base/macros.h"
 #include "courgette/disassembler_elf_32.h"
 #include "courgette/types_elf.h"
 
 namespace courgette {
 
 class AssemblyProgram;
+class InstructionReceptor;
 
 enum ARM_RVA {
   ARM_OFF8,
   ARM_OFF11,
   ARM_OFF24,
   ARM_OFF25,
   ARM_OFF21,
 };
 
 class DisassemblerElf32ARM : public DisassemblerElf32 {
  public:
   // Returns true if a valid executable is detected using only quick checks.
   static bool QuickDetect(const uint8_t* start, size_t length) {
     return DisassemblerElf32::QuickDetect(start, length, EM_ARM);
   }
 
   class TypedRVAARM : public TypedRVA {
    public:
     TypedRVAARM(ARM_RVA type, RVA rva) : TypedRVA(rva), type_(type) { }
     ~TypedRVAARM() override { }
 
     // TypedRVA interfaces.
     CheckBool ComputeRelativeTarget(const uint8_t* op_pointer) override;
-    CheckBool EmitInstruction(AssemblyProgram* program,
-                              Label* label) override;
+    CheckBool EmitInstruction(Label* label,
+                              InstructionReceptor* receptor) override;
     uint16_t op_size() const override;
 
     uint16_t c_op() const { return c_op_; }
 
    private:
     ARM_RVA type_;
     uint16_t c_op_;  // Set by ComputeRelativeTarget().
     const uint8_t* arm_op_;
   };
 
@@ skipping 24 matching lines @@
   static CheckBool Decompress(ARM_RVA type,
                               uint16_t c_op,
                               uint32_t addr,
                               uint32_t* arm_op /* out */);
 
  protected:
   // DisassemblerElf32 interfaces.
   CheckBool RelToRVA(Elf32_Rel rel,
                      RVA* result) const override WARN_UNUSED_RESULT;
   CheckBool ParseRelocationSection(const Elf32_Shdr* section_header,
-                                   AssemblyProgram* program)
-      override WARN_UNUSED_RESULT;
+                                   InstructionReceptor* receptor) const override
+      WARN_UNUSED_RESULT;
   CheckBool ParseRel32RelocsFromSection(const Elf32_Shdr* section)
       override WARN_UNUSED_RESULT;
 
 #if COURGETTE_HISTOGRAM_TARGETS
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(DisassemblerElf32ARM);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_ELF_32_ARM_H_