diff options
Diffstat (limited to 'src/core/arm/disassembler')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/disassembler/load_symbol_map.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 068f395ac..05d6ed1fb 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | // Copyright 2006 The Android Open Source Project | 1 | // Copyright 2006 The Android Open Source Project |
| 2 | 2 | ||
| 3 | #include "core/arm/disassembler/arm_disasm.h" | ||
| 4 | #include <string> | 3 | #include <string> |
| 5 | #include <unordered_set> | 4 | #include <unordered_set> |
| 6 | #include "common/common_types.h" | 5 | #include "common/common_types.h" |
| 7 | #include "common/string_util.h" | 6 | #include "common/string_util.h" |
| 7 | #include "core/arm/disassembler/arm_disasm.h" | ||
| 8 | #include "core/arm/skyeye_common/armsupp.h" | 8 | #include "core/arm/skyeye_common/armsupp.h" |
| 9 | 9 | ||
| 10 | static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", | 10 | static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", |
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp index e602d4511..6863c103a 100644 --- a/src/core/arm/disassembler/load_symbol_map.cpp +++ b/src/core/arm/disassembler/load_symbol_map.cpp | |||
| @@ -2,12 +2,12 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/arm/disassembler/load_symbol_map.h" | ||
| 6 | #include <sstream> | 5 | #include <sstream> |
| 7 | #include <string> | 6 | #include <string> |
| 8 | #include <vector> | 7 | #include <vector> |
| 9 | #include "common/file_util.h" | 8 | #include "common/file_util.h" |
| 10 | #include "common/symbols.h" | 9 | #include "common/symbols.h" |
| 10 | #include "core/arm/disassembler/load_symbol_map.h" | ||
| 11 | 11 | ||
| 12 | /* | 12 | /* |
| 13 | * Loads a symbol map file for use with the disassembler | 13 | * Loads a symbol map file for use with the disassembler |