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

courgette/rel32_finder_x86.h

+// Copyright 2015 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_X86_H_
+#define COURGETTE_REL32_FINDER_X86_H_
+
+#include <stdint.h>
+
+#include <map>
+#include <vector>
+
+#include "courgette/image_utils.h"
+#include "courgette/rel32_finder.h"
+
+namespace courgette {
+
+// The basic implementation performs naive scan for rel32 JMP and Jcc opcodes

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

Update comment (this is no longer the "basic" Rel32 finder).

Perhaps JMP/Jcc is too much implementation detail here.  Move them to before
Rel32FinderX86::Find in the .cc file?

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

Done.

+// (excluding JPO/JPE) disregarding instruction alignment.
+class Rel32FinderX86 : public Rel32Finder {
+ public:
+  Rel32FinderX86() = default;

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

Remove default constructor if it turns out we don't need them.

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

Done.

+  Rel32FinderX86(RVA relocs_start_rva, RVA relocs_end_rva);
+  ~Rel32FinderX86() override = default;
+
+  void Find(const uint8_t* start_pointer,
+            const uint8_t* end_pointer,
+            RVA start_rva,
+            RVA end_rva,
+            uint32_t size_of_image,
+            const std::vector<RVA>& abs32_locations) override;
+};
+
+}  // namespace courgette
+
+#endif  // COURGETTE_REL32_FINDER_X86_H_