[Courgette] Simple AssemblyProgram and Disassembler cleanups.

courgette/disassembler_win32.cc

 // 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.
 
 #include "courgette/disassembler_win32.h"
 
 #include <stddef.h>

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

already included in .h

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

Done.

 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
 
 #if COURGETTE_HISTOGRAM_TARGETS
@@ skipping 199 matching lines @@
   // Pretend our in-memory copy is only as long as our detected length.
   ReduceLength(detected_length);
 
   if (!has_text_section()) {
     return Bad("Resource-only executables are not yet supported");
   }
 
   return Good();
 }
 
-bool DisassemblerWin32::Disassemble(AssemblyProgram* target) {
+bool DisassemblerWin32::Disassemble(AssemblyProgram* program) {
   if (!ok())
     return false;
 
-  target->set_image_base(image_base());
-
   if (!ParseAbs32Relocs())
     return false;
 
   ParseRel32RelocsFromSections();
 
-  PrecomputeLabels(target);
-  RemoveUnusedRel32Locations(target);
+  PrecomputeLabels(program);
+  RemoveUnusedRel32Locations(program);
 
-  if (!target->GenerateInstructions(
+  if (!program->GenerateInstructions(
           base::Bind(&DisassemblerWin32::ParseFile, base::Unretained(this)))) {
     return false;
   }
 
-  target->DefaultAssignIndexes();
+  program->DefaultAssignIndexes();
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool DisassemblerWin32::ParseRelocs(std::vector<RVA>* relocs) {
   relocs->clear();
 
   size_t relocs_size = base_relocation_table_.size_;
   if (relocs_size == 0)
@@ skipping 425 matching lines @@
     directory->size_ = static_cast<uint32_t>(size);
     return true;
   } else {
     directory->address_ = 0;
     directory->size_ = 0;
     return true;
   }
 }
 
 }  // namespace courgette