diff options
| author | 2017-05-08 16:02:53 -0400 | |
|---|---|---|
| committer | 2017-05-08 16:02:53 -0400 | |
| commit | 7325413cd8b4f02719ca0f87c8a70d4713333a98 (patch) | |
| tree | 2bed3e545cb8b660d695763ce27dc3069847d7b1 /src/common | |
| parent | Merge pull request #2682 from nicoboss/filter (diff) | |
| parent | Dyncom: Remove disassembler code (diff) | |
| download | yuzu-7325413cd8b4f02719ca0f87c8a70d4713333a98.tar.gz yuzu-7325413cd8b4f02719ca0f87c8a70d4713333a98.tar.xz yuzu-7325413cd8b4f02719ca0f87c8a70d4713333a98.zip | |
Merge pull request #2689 from yuriks/remove-disassembler
Remove built-in disassembler and related code
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/symbols.cpp | 46 | ||||
| -rw-r--r-- | src/common/symbols.h | 30 |
3 files changed, 0 insertions, 78 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 13277a5c2..4b30185f1 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt | |||
| @@ -38,7 +38,6 @@ set(SRCS | |||
| 38 | param_package.cpp | 38 | param_package.cpp |
| 39 | scm_rev.cpp | 39 | scm_rev.cpp |
| 40 | string_util.cpp | 40 | string_util.cpp |
| 41 | symbols.cpp | ||
| 42 | thread.cpp | 41 | thread.cpp |
| 43 | timer.cpp | 42 | timer.cpp |
| 44 | ) | 43 | ) |
| @@ -74,7 +73,6 @@ set(HEADERS | |||
| 74 | scope_exit.h | 73 | scope_exit.h |
| 75 | string_util.h | 74 | string_util.h |
| 76 | swap.h | 75 | swap.h |
| 77 | symbols.h | ||
| 78 | synchronized_wrapper.h | 76 | synchronized_wrapper.h |
| 79 | thread.h | 77 | thread.h |
| 80 | thread_queue_list.h | 78 | thread_queue_list.h |
diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp deleted file mode 100644 index c4d16af85..000000000 --- a/src/common/symbols.cpp +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/symbols.h" | ||
| 6 | |||
| 7 | TSymbolsMap g_symbols; | ||
| 8 | |||
| 9 | namespace Symbols { | ||
| 10 | bool HasSymbol(u32 address) { | ||
| 11 | return g_symbols.find(address) != g_symbols.end(); | ||
| 12 | } | ||
| 13 | |||
| 14 | void Add(u32 address, const std::string& name, u32 size, u32 type) { | ||
| 15 | if (!HasSymbol(address)) { | ||
| 16 | TSymbol symbol; | ||
| 17 | symbol.address = address; | ||
| 18 | symbol.name = name; | ||
| 19 | symbol.size = size; | ||
| 20 | symbol.type = type; | ||
| 21 | |||
| 22 | g_symbols.emplace(address, symbol); | ||
| 23 | } | ||
| 24 | } | ||
| 25 | |||
| 26 | TSymbol GetSymbol(u32 address) { | ||
| 27 | const auto iter = g_symbols.find(address); | ||
| 28 | |||
| 29 | if (iter != g_symbols.end()) | ||
| 30 | return iter->second; | ||
| 31 | |||
| 32 | return {}; | ||
| 33 | } | ||
| 34 | |||
| 35 | const std::string GetName(u32 address) { | ||
| 36 | return GetSymbol(address).name; | ||
| 37 | } | ||
| 38 | |||
| 39 | void Remove(u32 address) { | ||
| 40 | g_symbols.erase(address); | ||
| 41 | } | ||
| 42 | |||
| 43 | void Clear() { | ||
| 44 | g_symbols.clear(); | ||
| 45 | } | ||
| 46 | } | ||
diff --git a/src/common/symbols.h b/src/common/symbols.h deleted file mode 100644 index f5a48e05a..000000000 --- a/src/common/symbols.h +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <map> | ||
| 8 | #include <string> | ||
| 9 | #include <utility> | ||
| 10 | #include "common/common_types.h" | ||
| 11 | |||
| 12 | struct TSymbol { | ||
| 13 | u32 address = 0; | ||
| 14 | std::string name; | ||
| 15 | u32 size = 0; | ||
| 16 | u32 type = 0; | ||
| 17 | }; | ||
| 18 | |||
| 19 | typedef std::map<u32, TSymbol> TSymbolsMap; | ||
| 20 | typedef std::pair<u32, TSymbol> TSymbolsPair; | ||
| 21 | |||
| 22 | namespace Symbols { | ||
| 23 | bool HasSymbol(u32 address); | ||
| 24 | |||
| 25 | void Add(u32 address, const std::string& name, u32 size, u32 type); | ||
| 26 | TSymbol GetSymbol(u32 address); | ||
| 27 | const std::string GetName(u32 address); | ||
| 28 | void Remove(u32 address); | ||
| 29 | void Clear(); | ||
| 30 | } | ||