[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>

[grt (UTC plus 2), 2017/01/12 11:56:41]

is this needed here and elsewhere?

[huangs, 2017/01/12 19:54:42]

<stddef.h> for nullptr.
<stdint.h> for uint8_t, etc.

[grt (UTC plus 2), 2017/01/13 08:27:33]

nullptr is a keyword, so no headers are needed for it.

[huangs, 2017/01/13 16:44:54]

Ah okay. Removed.

 #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;

[grt (UTC plus 2), 2017/01/12 11:56:41]

nit: blank line before this since it isn't part of AddressTranslator

[huangs, 2017/01/12 19:54:42]

Actually it is, but I missed the override keyword. Added.

[grt (UTC plus 2), 2017/01/13 08:27:32]

Huh. I would have thought you'd have gotten a compile error in that case. Ack.

[huangs, 2017/01/13 16:44:54]

I thought error would arise if "override" exists, but there's no matching
virtual function in the base class?

 
   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_