[Courgette] Simple AssemblyProgram and Disassembler cleanups.

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>
 
@@ skipping 13 matching lines @@
 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* target) 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);
 
@@ skipping 38 matching lines @@
   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) 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_;
   }
 
   // Returns description of the RVA, e.g. ".text+0x1243". For debugging only.
   std::string DescribeRVA(RVA rva) const;
 
   // Finds the first section at file_offset or above. Does not return sections
   // that have no raw bytes in the file.
   const Section* FindNextSection(FileOffset file_offset) const;
@@ skipping 14 matching lines @@
   uint16_t number_of_sections_ = 0;
   const Section* sections_ = nullptr;
   bool has_text_section_ = false;
 
   uint32_t size_of_code_ = 0;
   uint32_t size_of_initialized_data_ = 0;
   uint32_t size_of_uninitialized_data_ = 0;
   RVA base_of_code_ = 0;
   RVA base_of_data_ = 0;
 
-  uint64_t image_base_ = 0;  // Range limited to 32 bits for 32 bit executable
+  uint64_t image_base_ = 0;  // Range limited to 32 bits for 32 bit executable.
   uint32_t size_of_image_ = 0;
   int number_of_data_directories_ = 0;
 
   ImageDataDirectory export_table_;
   ImageDataDirectory import_table_;
   ImageDataDirectory resource_table_;
   ImageDataDirectory exception_table_;
   ImageDataDirectory base_relocation_table_;
   ImageDataDirectory bound_import_table_;
   ImageDataDirectory import_address_table_;
   ImageDataDirectory delay_import_descriptor_;
   ImageDataDirectory clr_runtime_header_;
 
 #if COURGETTE_HISTOGRAM_TARGETS
   std::map<RVA, int> abs32_target_rvas_;
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisassemblerWin32);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_WIN32_H_