diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-20 17:21:23 +0200 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-09-21 04:15:47 +0200 |
commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/core/arm/disassembler | |
parent | Manually tweak source formatting and then re-run clang-format (diff) | |
download | yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.bz2 yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.lz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.zst yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 4 | ||||
-rw-r--r-- | src/core/arm/disassembler/arm_disasm.h | 1 | ||||
-rw-r--r-- | src/core/arm/disassembler/load_symbol_map.cpp | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index b3b9971e8..068f395ac 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -1,12 +1,10 @@ // Copyright 2006 The Android Open Source Project +#include "core/arm/disassembler/arm_disasm.h" #include <string> #include <unordered_set> - #include "common/common_types.h" #include "common/string_util.h" - -#include "core/arm/disassembler/arm_disasm.h" #include "core/arm/skyeye_common/armsupp.h" static const char* cond_names[] = {"eq", "ne", "cs", "cc", "mi", "pl", "vs", "vc", diff --git a/src/core/arm/disassembler/arm_disasm.h b/src/core/arm/disassembler/arm_disasm.h index 031f973d6..300e228ed 100644 --- a/src/core/arm/disassembler/arm_disasm.h +++ b/src/core/arm/disassembler/arm_disasm.h @@ -3,7 +3,6 @@ #pragma once #include <string> - #include "common/common_types.h" // Note: this list of opcodes must match the list used to initialize diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp index 58e8e6fa1..e602d4511 100644 --- a/src/core/arm/disassembler/load_symbol_map.cpp +++ b/src/core/arm/disassembler/load_symbol_map.cpp @@ -2,15 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "core/arm/disassembler/load_symbol_map.h" #include <sstream> #include <string> #include <vector> - #include "common/file_util.h" #include "common/symbols.h" -#include "core/arm/disassembler/load_symbol_map.h" - /* * Loads a symbol map file for use with the disassembler * @param filename String filename path of symbol map file |