[Courgette] Simple AssemblyProgram and Disassembler cleanups.

courgette/disassembler.h

Index: courgette/disassembler.h
diff --git a/courgette/disassembler.h b/courgette/disassembler.h
index 6a40e873851393e7729195ec00fa094e3bfa77cf..58846a2e99c8445fb0958e61a15ff544afae6239 100644
--- a/courgette/disassembler.h
+++ b/courgette/disassembler.h
@@ -55,14 +55,18 @@ class Disassembler : public AddressTranslator {
   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;