[Courgette] Simple AssemblyProgram and Disassembler cleanups.

courgette/disassembler.h

 // Copyright (c) 2011 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_H_
 #define COURGETTE_DISASSEMBLER_H_
 
-#include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/macros.h"
 #include "courgette/courgette.h"
 #include "courgette/image_utils.h"
 
 namespace courgette {
 
@@ skipping 29 matching lines @@
 
    private:
     const AddressTranslator& translator_;
 
     DISALLOW_COPY_AND_ASSIGN(RvaVisitor_Rel32);
   };
 
   virtual ~Disassembler();
 
   // AddressTranslator interfaces.
-  virtual RVA FileOffsetToRVA(FileOffset file_offset) const override = 0;
-  virtual FileOffset RVAToFileOffset(RVA rva) const override = 0;
+  RVA FileOffsetToRVA(FileOffset file_offset) const override = 0;
+  FileOffset RVAToFileOffset(RVA rva) const override = 0;
   const uint8_t* FileOffsetToPointer(FileOffset file_offset) const override;
   const uint8_t* RVAToPointer(RVA rva) const override;
-  RVA PointerToTargetRVA(const uint8_t* p) const = 0;
+  RVA PointerToTargetRVA(const uint8_t* p) const override = 0;
 
   virtual ExecutableType kind() const = 0;
 
+  // Returns the preferred image base address. Using uint64_t to accommodate the
+  // general case of 64-bit architectures.
+  virtual uint64_t image_base() const = 0;
+
   // Returns a caller-owned new RvaVisitor to iterate through abs32 target RVAs.
   virtual RvaVisitor* CreateAbs32TargetRvaVisitor() = 0;
 
   // Returns a caller-owned new RvaVisitor to iterate through rel32 target RVAs.
   virtual RvaVisitor* CreateRel32TargetRvaVisitor() = 0;
 
   // Removes unused rel32 locations (architecture-specific). This is needed
   // because we may remove rel32 Labels along the way. As a result the matching
   // matching rel32 addresses become unused. Removing them saves space.
   virtual void RemoveUnusedRel32Locations(AssemblyProgram* program) = 0;
@@ skipping 44 matching lines @@
   size_t length_;         // In current memory.
   const uint8_t* start_;  // In current memory, base for 'file offsets'.
   const uint8_t* end_;    // In current memory.
 
   DISALLOW_COPY_AND_ASSIGN(Disassembler);
 };
 
 }  // namespace courgette
 
 #endif  // COURGETTE_DISASSEMBLER_H_