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

Side by Side Diff: courgette/program_detector.cc

Issue 1855133002: convert //courgette to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comment in memory_allocator.h Created 4 years, 8 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/third_party/bsdiff_create.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 scoped_ptr<Disassembler> DetectDisassembler(const void* buffer, size_t length) { 22 std::unique_ptr<Disassembler> DetectDisassembler(const void* buffer,
23 scoped_ptr<Disassembler> disassembler; 23 size_t length) {
24 std::unique_ptr<Disassembler> disassembler;
24 25
25 disassembler.reset(new DisassemblerWin32X86(buffer, length)); 26 disassembler.reset(new DisassemblerWin32X86(buffer, length));
26 if (disassembler->ParseHeader()) 27 if (disassembler->ParseHeader())
27 return disassembler; 28 return disassembler;
28 29
29 disassembler.reset(new DisassemblerWin32X64(buffer, length)); 30 disassembler.reset(new DisassemblerWin32X64(buffer, length));
30 if (disassembler->ParseHeader()) 31 if (disassembler->ParseHeader())
31 return disassembler; 32 return disassembler;
32 33
33 disassembler.reset(new DisassemblerElf32X86(buffer, length)); 34 disassembler.reset(new DisassemblerElf32X86(buffer, length));
34 if (disassembler->ParseHeader()) 35 if (disassembler->ParseHeader())
35 return disassembler; 36 return disassembler;
36 37
37 disassembler.reset(new DisassemblerElf32ARM(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 return nullptr; 42 return nullptr;
42 } 43 }
43 44
44 } // namespace 45 } // namespace
45 46
46 Status DetectExecutableType(const void* buffer, 47 Status DetectExecutableType(const void* buffer,
47 size_t length, 48 size_t length,
48 ExecutableType* type, 49 ExecutableType* type,
49 size_t* detected_length) { 50 size_t* detected_length) {
50 scoped_ptr<Disassembler> disassembler(DetectDisassembler(buffer, length)); 51 std::unique_ptr<Disassembler> disassembler(
52 DetectDisassembler(buffer, length));
51 53
52 if (!disassembler) { // We failed to detect anything. 54 if (!disassembler) { // We failed to detect anything.
53 *type = EXE_UNKNOWN; 55 *type = EXE_UNKNOWN;
54 *detected_length = 0; 56 *detected_length = 0;
55 return C_INPUT_NOT_RECOGNIZED; 57 return C_INPUT_NOT_RECOGNIZED;
56 } 58 }
57 59
58 *type = disassembler->kind(); 60 *type = disassembler->kind();
59 *detected_length = disassembler->length(); 61 *detected_length = disassembler->length();
60 return C_OK; 62 return C_OK;
61 } 63 }
62 64
63 Status ParseDetectedExecutable(const void* buffer, 65 Status ParseDetectedExecutable(const void* buffer,
64 size_t length, 66 size_t length,
65 scoped_ptr<AssemblyProgram>* output) { 67 std::unique_ptr<AssemblyProgram>* output) {
66 output->reset(); 68 output->reset();
67 69
68 scoped_ptr<Disassembler> disassembler(DetectDisassembler(buffer, length)); 70 std::unique_ptr<Disassembler> disassembler(
71 DetectDisassembler(buffer, length));
69 if (!disassembler) 72 if (!disassembler)
70 return C_INPUT_NOT_RECOGNIZED; 73 return C_INPUT_NOT_RECOGNIZED;
71 74
72 scoped_ptr<AssemblyProgram> program( 75 std::unique_ptr<AssemblyProgram> program(
73 new AssemblyProgram(disassembler->kind())); 76 new AssemblyProgram(disassembler->kind()));
74 77
75 if (!disassembler->Disassemble(program.get())) 78 if (!disassembler->Disassemble(program.get()))
76 return C_DISASSEMBLY_FAILED; 79 return C_DISASSEMBLY_FAILED;
77 80
78 if (!program->TrimLabels()) 81 if (!program->TrimLabels())
79 return C_TRIM_FAILED; 82 return C_TRIM_FAILED;
80 83
81 *output = std::move(program); 84 *output = std::move(program);
82 return C_OK; 85 return C_OK;
83 } 86 }
84 87
85 } // namespace courgette 88 } // namespace courgette
OLDNEW
« no previous file with comments | « courgette/program_detector.h ('k') | courgette/third_party/bsdiff_create.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698