Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Side by Side Diff: courgette/program_detector.cc

Issue 2055343002: Courgette: Add static method QuickDetect() to optimize program detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « courgette/program_detector.h ('k') | courgette/program_detector_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "courgette/program_detector.h" 5 #include "courgette/program_detector.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "courgette/assembly_program.h" 9 #include "courgette/assembly_program.h"
10 #include "courgette/disassembler.h" 10 #include "courgette/disassembler.h"
11 #include "courgette/disassembler_elf_32_arm.h" 11 #include "courgette/disassembler_elf_32_arm.h"
12 #include "courgette/disassembler_elf_32_x86.h" 12 #include "courgette/disassembler_elf_32_x86.h"
13 #include "courgette/disassembler_win32_x64.h" 13 #include "courgette/disassembler_win32_x64.h"
14 #include "courgette/disassembler_win32_x86.h" 14 #include "courgette/disassembler_win32_x86.h"
15 15
16 namespace courgette { 16 namespace courgette {
17 17
18 namespace { 18 namespace {
19 19
20 // Returns a new instance of Disassembler subclass if binary data given in 20 // Returns a new instance of Disassembler subclass if binary data given in
21 // |buffer| and |length| matches a known binary format, otherwise null. 21 // |buffer| and |length| matches a known binary format, otherwise null.
22 std::unique_ptr<Disassembler> DetectDisassembler(const void* buffer, 22 std::unique_ptr<Disassembler> DetectDisassembler(const uint8_t* buffer,
23 size_t length) { 23 size_t length) {
24 std::unique_ptr<Disassembler> disassembler; 24 std::unique_ptr<Disassembler> disassembler;
25 25
26 disassembler.reset(new DisassemblerWin32X86(buffer, length)); 26 if (DisassemblerWin32X86::QuickDetect(buffer, length)) {
27 if (disassembler->ParseHeader()) 27 disassembler.reset(new DisassemblerWin32X86(buffer, length));
28 return disassembler; 28 if (disassembler->ParseHeader())
29 29 return disassembler;
30 disassembler.reset(new DisassemblerWin32X64(buffer, length)); 30 }
31 if (disassembler->ParseHeader()) 31 if (DisassemblerWin32X64::QuickDetect(buffer, length)) {
32 return disassembler; 32 disassembler.reset(new DisassemblerWin32X64(buffer, length));
33 33 if (disassembler->ParseHeader())
34 disassembler.reset(new DisassemblerElf32X86(buffer, length)); 34 return disassembler;
35 if (disassembler->ParseHeader()) 35 }
36 return disassembler; 36 if (DisassemblerElf32X86::QuickDetect(buffer, length)) {
37 37 disassembler.reset(new DisassemblerElf32X86(buffer, length));
38 disassembler.reset(new DisassemblerElf32ARM(buffer, length)); 38 if (disassembler->ParseHeader())
39 if (disassembler->ParseHeader()) 39 return disassembler;
40 return disassembler; 40 }
41 41 if (DisassemblerElf32ARM::QuickDetect(buffer, length)) {
42 disassembler.reset(new DisassemblerElf32ARM(buffer, length));
43 if (disassembler->ParseHeader())
44 return disassembler;
45 }
42 return nullptr; 46 return nullptr;
43 } 47 }
44 48
45 } // namespace 49 } // namespace
46 50
47 Status DetectExecutableType(const void* buffer, 51 Status DetectExecutableType(const uint8_t* buffer,
48 size_t length, 52 size_t length,
49 ExecutableType* type, 53 ExecutableType* type,
50 size_t* detected_length) { 54 size_t* detected_length) {
51 std::unique_ptr<Disassembler> disassembler( 55 std::unique_ptr<Disassembler> disassembler(
52 DetectDisassembler(buffer, length)); 56 DetectDisassembler(buffer, length));
53 57
54 if (!disassembler) { // We failed to detect anything. 58 if (!disassembler) { // We failed to detect anything.
55 *type = EXE_UNKNOWN; 59 *type = EXE_UNKNOWN;
56 *detected_length = 0; 60 *detected_length = 0;
57 return C_INPUT_NOT_RECOGNIZED; 61 return C_INPUT_NOT_RECOGNIZED;
58 } 62 }
59 63
60 *type = disassembler->kind(); 64 *type = disassembler->kind();
61 *detected_length = disassembler->length(); 65 *detected_length = disassembler->length();
62 return C_OK; 66 return C_OK;
63 } 67 }
64 68
65 Status ParseDetectedExecutable(const void* buffer, 69 Status ParseDetectedExecutable(const uint8_t* buffer,
66 size_t length, 70 size_t length,
67 std::unique_ptr<AssemblyProgram>* output) { 71 std::unique_ptr<AssemblyProgram>* output) {
68 output->reset(); 72 output->reset();
69 73
70 std::unique_ptr<Disassembler> disassembler( 74 std::unique_ptr<Disassembler> disassembler(
71 DetectDisassembler(buffer, length)); 75 DetectDisassembler(buffer, length));
72 if (!disassembler) 76 if (!disassembler)
73 return C_INPUT_NOT_RECOGNIZED; 77 return C_INPUT_NOT_RECOGNIZED;
74 78
75 std::unique_ptr<AssemblyProgram> program( 79 std::unique_ptr<AssemblyProgram> program(
76 new AssemblyProgram(disassembler->kind())); 80 new AssemblyProgram(disassembler->kind()));
77 81
78 if (!disassembler->Disassemble(program.get())) 82 if (!disassembler->Disassemble(program.get()))
79 return C_DISASSEMBLY_FAILED; 83 return C_DISASSEMBLY_FAILED;
80 84
81 *output = std::move(program); 85 *output = std::move(program);
82 return C_OK; 86 return C_OK;
83 } 87 }
84 88
85 } // namespace courgette 89 } // namespace courgette
OLDNEW
« no previous file with comments | « courgette/program_detector.h ('k') | courgette/program_detector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698