Refactor rel32 searching process for x64 to make it more similar to x86.

courgette/disassembler_win32_x86.cc

 // 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.
 
 #include "courgette/disassembler_win32_x86.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
-#include "courgette/rel32_finder_win32_x86.h"
+#include "courgette/rel32_finder_x86.h"
 
 #if COURGETTE_HISTOGRAM_TARGETS
 #include <iostream>
 #endif
 
 namespace courgette {
 
 DisassemblerWin32X86::DisassemblerWin32X86(const void* start, size_t length)
     : DisassemblerWin32(start, length) {}
 
@@ skipping 20 matching lines @@
 
   FileOffset start_file_offset = section->file_offset_of_raw_data;
   FileOffset end_file_offset = start_file_offset + section->size_of_raw_data;
 
   const uint8_t* start_pointer = FileOffsetToPointer(start_file_offset);
   const uint8_t* end_pointer = FileOffsetToPointer(end_file_offset);
 
   RVA start_rva = FileOffsetToRVA(start_file_offset);
   RVA end_rva = start_rva + section->virtual_size;
 
-  Rel32FinderWin32X86_Basic finder(
+  Rel32FinderX86 finder(
       base_relocation_table().address_,
       base_relocation_table().address_ + base_relocation_table().size_);
   finder.Find(start_pointer, end_pointer, start_rva, end_rva, abs32_locations_);
   finder.SwapRel32Locations(&rel32_locations_);
 
 #if COURGETTE_HISTOGRAM_TARGETS
   DCHECK(rel32_target_rvas_.empty());
   finder.SwapRel32TargetRVAs(&rel32_target_rvas_);
 #endif
 }
 
 }  // namespace courgette