OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/disassembler.h" | 5 #include "courgette/disassembler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 | 13 |
14 #include "courgette/assembly_program.h" | 14 #include "courgette/assembly_program.h" |
15 #include "courgette/courgette.h" | 15 #include "courgette/courgette.h" |
| 16 #include "courgette/disassembler_elf_32_x86.h" |
16 #include "courgette/disassembler_win32_x86.h" | 17 #include "courgette/disassembler_win32_x86.h" |
17 #include "courgette/encoded_program.h" | 18 #include "courgette/encoded_program.h" |
18 | 19 |
19 // COURGETTE_HISTOGRAM_TARGETS prints out a histogram of how frequently | 20 // COURGETTE_HISTOGRAM_TARGETS prints out a histogram of how frequently |
20 // different target addresses are referenced. Purely for debugging. | 21 // different target addresses are referenced. Purely for debugging. |
21 #define COURGETTE_HISTOGRAM_TARGETS 0 | 22 #define COURGETTE_HISTOGRAM_TARGETS 0 |
22 | 23 |
23 namespace courgette { | 24 namespace courgette { |
24 | 25 |
25 //////////////////////////////////////////////////////////////////////////////// | 26 //////////////////////////////////////////////////////////////////////////////// |
26 | 27 |
27 Disassembler* DetectDisassembler(const void* buffer, size_t length) { | 28 Disassembler* DetectDisassembler(const void* buffer, size_t length) { |
28 Disassembler* disassembler = NULL; | 29 Disassembler* disassembler = NULL; |
29 | 30 |
30 disassembler = new DisassemblerWin32X86(buffer, length); | 31 disassembler = new DisassemblerWin32X86(buffer, length); |
31 if (disassembler->ParseHeader()) | 32 if (disassembler->ParseHeader()) |
32 return disassembler; | 33 return disassembler; |
| 34 else |
| 35 delete disassembler; |
33 | 36 |
34 delete disassembler; | 37 disassembler = new DisassemblerElf32X86(buffer, length); |
| 38 if (disassembler->ParseHeader()) |
| 39 return disassembler; |
| 40 else |
| 41 delete disassembler; |
35 | 42 |
36 return NULL; | 43 return NULL; |
37 } | 44 } |
38 | 45 |
39 Status DetectExecutableType(const void* buffer, size_t length, | 46 Status DetectExecutableType(const void* buffer, size_t length, |
40 ExecutableType* type, | 47 ExecutableType* type, |
41 size_t* detected_length) { | 48 size_t* detected_length) { |
42 | 49 |
43 Disassembler* disassembler = DetectDisassembler(buffer, length); | 50 Disassembler* disassembler = DetectDisassembler(buffer, length); |
44 | 51 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 failure_reason_ = reason; | 113 failure_reason_ = reason; |
107 return false; | 114 return false; |
108 } | 115 } |
109 | 116 |
110 void Disassembler::ReduceLength(size_t reduced_length) { | 117 void Disassembler::ReduceLength(size_t reduced_length) { |
111 if (reduced_length < length_) | 118 if (reduced_length < length_) |
112 length_ = reduced_length; | 119 length_ = reduced_length; |
113 } | 120 } |
114 | 121 |
115 } // namespace courgette | 122 } // namespace courgette |
OLD | NEW |