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

Side by Side Diff: courgette/program_detector.cc

Issue 2583373002: [Courgette] Simple AssemblyProgram and Disassembler cleanups. (Closed)
Patch Set: Tune up header inclusion. Created 3 years, 11 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/disassembler_win32.cc ('k') | no next file » | 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 "base/memory/ptr_util.h"
9 #include "courgette/assembly_program.h" 10 #include "courgette/assembly_program.h"
10 #include "courgette/disassembler.h" 11 #include "courgette/disassembler.h"
11 #include "courgette/disassembler_elf_32_arm.h" 12 #include "courgette/disassembler_elf_32_arm.h"
12 #include "courgette/disassembler_elf_32_x86.h" 13 #include "courgette/disassembler_elf_32_x86.h"
13 #include "courgette/disassembler_win32_x64.h" 14 #include "courgette/disassembler_win32_x64.h"
14 #include "courgette/disassembler_win32_x86.h" 15 #include "courgette/disassembler_win32_x86.h"
15 16
16 namespace courgette { 17 namespace courgette {
17 18
18 namespace { 19 namespace {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 Status ParseDetectedExecutable(const uint8_t* buffer, 70 Status ParseDetectedExecutable(const uint8_t* buffer,
70 size_t length, 71 size_t length,
71 std::unique_ptr<AssemblyProgram>* output) { 72 std::unique_ptr<AssemblyProgram>* output) {
72 output->reset(); 73 output->reset();
73 74
74 std::unique_ptr<Disassembler> disassembler( 75 std::unique_ptr<Disassembler> disassembler(
75 DetectDisassembler(buffer, length)); 76 DetectDisassembler(buffer, length));
76 if (!disassembler) 77 if (!disassembler)
77 return C_INPUT_NOT_RECOGNIZED; 78 return C_INPUT_NOT_RECOGNIZED;
78 79
79 std::unique_ptr<AssemblyProgram> program( 80 auto program = base::MakeUnique<AssemblyProgram>(disassembler->kind(),
80 new AssemblyProgram(disassembler->kind())); 81 disassembler->image_base());
81 82
82 if (!disassembler->Disassemble(program.get())) 83 if (!disassembler->Disassemble(program.get()))
83 return C_DISASSEMBLY_FAILED; 84 return C_DISASSEMBLY_FAILED;
84 85
85 *output = std::move(program); 86 *output = std::move(program);
86 return C_OK; 87 return C_OK;
87 } 88 }
88 89
89 } // namespace courgette 90 } // namespace courgette
OLDNEW
« no previous file with comments | « courgette/disassembler_win32.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698