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

courgette/rel32_finder.h

-// Copyright 2015 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef COURGETTE_REL32_FINDER_WIN32_X86_H_
-#define COURGETTE_REL32_FINDER_WIN32_X86_H_
+#ifndef COURGETTE_REL32_FINDER_H_
+#define COURGETTE_REL32_FINDER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <vector>
 
 #include "courgette/image_utils.h"
 
 namespace courgette {
 
 // A helper class to scan through a section of code to extract RVAs.
-class Rel32FinderWin32X86 {
+class Rel32Finder {
  public:
-  Rel32FinderWin32X86(RVA relocs_start_rva, RVA relocs_end_rva);
-  virtual ~Rel32FinderWin32X86();
+  Rel32Finder() = default;

[huangs, 2016/05/26 22:40:55]

If the default constructor is unused (perhaps by std::vector) then we may as
well exclude it.  I'm open to third opinion though (e.g., ask grt@).

[etiennep, 2016/05/27 18:12:34]

Done.

+  Rel32Finder(RVA relocs_start_rva, RVA relocs_end_rva);
+  virtual ~Rel32Finder() = default;
 
   // Swaps data in |rel32_locations_| with |dest|.
   void SwapRel32Locations(std::vector<RVA>* dest);
 
 #if COURGETTE_HISTOGRAM_TARGETS
   // Swaps data in |rel32_target_rvas_| with |dest|.
   void SwapRel32TargetRVAs(std::map<RVA, int>* dest);
 #endif
 
   // Scans through [|start_pointer|, |end_pointer|) for rel32 addresses. Seeks
   // RVAs that satisfy the following:
   // - Do not overlap with |abs32_locations| (assumed sorted).
   // - Do not overlap with [relocs_start_rva, relocs_end_rva).
   // - Whose targets are in [|start_rva|, |end_rva|).

[huangs, 2016/05/26 22:11:17]

Update comment re. role of |size_of_image|?

[etiennep, 2016/05/27 18:12:33]

Done.

   // The sorted results are written to |rel32_locations_|.
   virtual void Find(const uint8_t* start_pointer,
                     const uint8_t* end_pointer,
                     RVA start_rva,
                     RVA end_rva,
+                    uint32_t size_of_image_,

[huangs, 2016/05/26 22:11:17]

|size_of_image|.  Trailing underscore is for private member variables of a
class.

[etiennep, 2016/05/27 18:12:34]

Done.

                     const std::vector<RVA>& abs32_locations) = 0;
 
  protected:
-  const RVA relocs_start_rva_;
-  const RVA relocs_end_rva_;
+  const RVA relocs_start_rva_ = 0;

[huangs, 2016/05/26 22:40:55]

Remove " = 0" if we remove default constructor.

[etiennep, 2016/05/27 18:12:33]

Done.

+  const RVA relocs_end_rva_ = 0;
 
   std::vector<RVA> rel32_locations_;
 
 #if COURGETTE_HISTOGRAM_TARGETS
   std::map<RVA, int> rel32_target_rvas_;
 #endif
 };
 
-// The basic implementation performs naive scan for rel32 JMP and Jcc opcodes
-// (excluding JPO/JPE) disregarding instruction alignment.
-class Rel32FinderWin32X86_Basic : public Rel32FinderWin32X86 {
- public:
-  Rel32FinderWin32X86_Basic(RVA relocs_start_rva, RVA relocs_end_rva);
-  virtual ~Rel32FinderWin32X86_Basic();
-
-  // Rel32FinderWin32X86 implementation.
-  void Find(const uint8_t* start_pointer,
-            const uint8_t* end_pointer,
-            RVA start_rva,
-            RVA end_rva,
-            const std::vector<RVA>& abs32_locations) override;
-};
-
 }  // namespace courgette
 
-#endif  // COURGETTE_REL32_FINDER_WIN32_X86_H_
+#endif  // COURGETTE_REL32_FINDER_H_